214707 Commits

Author SHA1 Message Date
Dmitriy Filchenko
342c7dcd02 Remove calls to set_process_name.
BUG:29824203

Change-Id: I67a1eb350cf9ea28c554166986df8fc251b666eb
2016-07-12 15:44:55 -07:00
Treehugger Robot
06561db207 Merge "Resolve deadlock between ActivityManagerService and PowerManagerService" 2016-07-07 15:19:01 +00:00
Shibin George
43f5de0125 Resolve deadlock between ActivityManagerService and PowerManagerService
ActivityManagerService lock and PowerManagerService.mLock can
be acquired in different threads in different orders.
registerReceiver() here tries to acquire ActivityManagerService
internally while holding mLock. A particular call from
WindowManagerService acquires these locks in reverse order.
This deadlock can be resolved by moving registerReceiver()
to another thread.

https://code.google.com/p/android/issues/detail?id=215254

Change-Id: I12cd610e61f212a3fb5e441f2c7a557c90afbda4
Signed-off-by: Shibin George <shibing@codeaurora.org>
2016-07-07 19:45:35 +05:30
Treehugger Robot
fcae61308c Merge "MediaSession: Use mHandler for sending a pending intent" 2016-07-06 07:58:53 +00:00
Jae Seo
5b6c03415c Merge "Fix deadlock in MediaSessionService during getCurrentUser()" 2016-07-06 07:15:54 +00:00
Shibin George
c4f28a4196 Fix deadlock in MediaSessionService during getCurrentUser()
SystemServiceMAnager.stopUser() acquires ActivityManagerService
lock first and then acquires MediaSessionService.mLock during
onStopUser(). MediaSessionService.onSwitchUser(), on the other
hand, acquires mLock first and ActivityManagerService lock next.
This is a potential deadlock situation which can be resolved by
moving getCurrentUser() out of synchronized block. This will
release mLock sooner and avoid the deadlock.

https://code.google.com/p/android/issues/detail?id=214469

Change-Id: Ieb4520d60af6ca38496ca933da0cd9ae096a9408
Signed-off-by: Shibin George <shibing@codeaurora.org>
2016-07-06 05:00:43 +00:00
Przemyslaw Szczepaniak
326e55a3e2 Merge "Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968" 2016-07-05 08:42:05 +00:00
Przemyslaw Szczepaniak
cf5b00e6bc Merge "Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b" 2016-07-04 16:26:38 +00:00
Przemyslaw Szczepaniak
bab82f1df8 Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b
Bug: 27464570
Change-Id: I761cab7198f2608b8e76e9a5c775e3bcec44d781
2016-07-04 16:35:28 +01:00
Tobias Thierer
a31247bd8d Merge "Changes for upgrade to OkHttp 2.7.5" 2016-06-30 12:35:03 +00:00
Tobias Thierer
851d806dbd Changes for upgrade to OkHttp 2.7.5
- Use com.android.okhttp.Dns in place of com.android.okhttp.internal.Network
 - Specify TimeUnit.MILLISECONDS for timeouts which 2.7.5 allows and
   brings us closer to 3+

Change-Id: I95b5d72a94ebe1389f7c2e8d95903aa1aadd944b
2016-06-29 17:41:32 +01:00
Przemyslaw Szczepaniak
f0db6e8d94 Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968
Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
2016-06-29 17:41:01 +01:00
Yi Kong
f388075f8f Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" 2016-06-24 16:47:03 +00:00
Przemyslaw Szczepaniak
36ce097dbb Merge "Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a" 2016-06-24 11:16:20 +00:00
Przemyslaw Szczepaniak
18d9fb485c Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
This change reverts previous fix for b/27582395 and makes
AbstractStringBuffer an Appendable. 

Bug: 28666126
Bug: 27582395 
Change-Id: I4b1b554fb47f45459eec24801af4ec798fc3039b
2016-06-24 10:53:06 +00:00
Treehugger Robot
4eea3a7f88 Merge "Fix deadlock b/w ActivityManagerService and MediaSessionService" 2016-06-23 00:13:45 +00:00
Yi Kong
fdbf33126e Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259
Bug: 29067535
Change-Id: Ib0049db9ad5f6dfcdb04598ba288a1d94c32a31c
2016-06-22 14:17:55 +01:00
Marie Janssen
6ba39e5642 Merge "Fix links to Bluetooth Guide" 2016-06-21 21:26:00 +00:00
Sanket Agarwal
3d20e6f90f Merge "Bluetooth: Send GET request as single packet" 2016-06-21 20:37:36 +00:00
Shibin George
19e84047ab Fix deadlock b/w ActivityManagerService and MediaSessionService
While handling adjustVolume and finishReceiver at the same time,
system_server gets into deadlock situation where
ActivityManagerService lock and MediaSessionService lock are
getting acquired in reverse order. To fix this,
adjustSuggestedStreamVolume() is shifted to MediaSessionService's
Handler thread.

https://code.google.com/p/android/issues/detail?id=213014

Change-Id: I3125c890546c8ab7c4df530bb68ba87cd688f8ce
2016-06-21 04:45:25 +00:00
Treehugger Robot
cf81fdb37b Merge "DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages" 2016-06-20 18:44:17 +00:00
Marie Janssen
382871b03f Fix links to Bluetooth Guide
Change-Id: I5798c3d71c7cc9c509e0f7b04fa140168b0fdc11
2016-06-20 10:26:31 -07:00
John Reck
4e6a73c16a Merge "Performance Optimization: Align texture dirty rect" 2016-06-16 21:35:12 +00:00
John Stultz
efeda4694b DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages
My logcat is packed with these dispatcher vsync pulse messages
that really don't seem to be describing an error case (though
maybe I'm wrong?).

So quiet it down a bit and set the loglevel to verbose.

Change-Id: Ic4359f64f9cecfc1ffe49275f5f63327ba1b6f1d
Signed-off-by: John Stutlz <john.stultz@linaro.org>
2016-06-16 10:24:43 -07:00
Yi Kong
1850851670 Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" 2016-06-16 16:16:00 +00:00
Treehugger Robot
20d55a7779 Merge "Remove unused link to libcutils" 2016-06-16 15:56:50 +00:00
Yi Kong
af823e0ebf Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
2016-06-16 14:29:41 +01:00
Joachim Sauer
4861329f57 Merge "API updated for ICU4J 57.1" 2016-06-16 12:38:30 +00:00
Przemyslaw Szczepaniak
47ef3bf172 Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c" 2016-06-16 12:26:51 +00:00
Przemyslaw Szczepaniak
a82f0622f1 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Bug: 28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20
2016-06-16 13:07:31 +01:00
Dan Willemsen
9b3bc98425 Remove unused link to libcutils
This library is built against the NDK, so it shouldn't be linking to
platform libraries. It should also be pulling <android/log.h> from the
NDK headers, so remove the system/core/include include directory.

Change-Id: Ie9d6514f43492401697907aee4df56bdbf4e1926
2016-06-15 21:14:28 -07:00
AnubhavGupta
eed32008a8 Bluetooth: Send GET request as single packet
- If obex based profile explicitly sets GET with final flag, then
  GET should always be sent as single packet request with final flag
  set.

Change-Id: I82ff8295a239c4dbbfb4b3abfd358021820283cc
2016-06-15 23:06:31 +00:00
David Gross
e8909dc0f4 Merge "Delete simple reduction implementation." 2016-06-15 18:44:04 +00:00
ywen
229cad0ab2 Performance Optimization: Align texture dirty rect
Align x offset and width to 32, y offset and height to 4.
It improves the font texture upload performance.

Change-Id: I967eeed90658f2ce1eb08cb2740d5dc34c72f40b
2016-06-15 08:32:25 +00:00
David Gross
11ec90971f Delete simple reduction implementation.
Bug: 27298560
Change-Id: I8a89c9df753d12ee8af06008d424e77bb916cd8f
(cherry picked from commit 4a4578530a1a5fb751ea5a7bfbff83f3ab669895)
2016-06-14 14:30:06 -07:00
Fredrik Roubert
0af16f3d36 API updated for ICU4J 57.1
Bug: 27819846
Change-Id: I891853397ac1f4de58fd0687e7cab27bd270ac64
2016-06-14 15:03:51 +02:00
Treehugger Robot
4467c845c0 Merge "Unlock mBluetoothLock.readLock() instead of double-locking it" 2016-06-09 21:10:29 +00:00
Pavlin Radoslavov
b9154bc988 Unlock mBluetoothLock.readLock() instead of double-locking it
Bug: 29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
(cherry picked from commit 7ee53be300573c9bdc71607d32d4a642e4ad3dc8)
2016-06-09 13:10:54 -07:00
Treehugger Robot
98cf9d1a60 Merge "Delay handleEnable() until Bluetooth state is OFF" 2016-06-07 21:14:22 +00:00
Pavlin Radoslavov
a88bb98605 Delay handleEnable() until Bluetooth state is OFF
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.

Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.

Bug: 17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
(cherry picked from commit e47ec14318f64c29bf16b5a6bb662bc19206d6b0)
2016-06-07 20:26:10 +00:00
Eric Laurent
03c209b2a3 Merge "Delete Visualizer before lpJniStorage" 2016-06-07 18:00:28 +00:00
ganxiaolin
7b9f5be914 Delete Visualizer before lpJniStorage
It is related to Change: Id17bea8a6ca7132042b9bfefed398a715c139be7
Fix ANR because of bug of Visualizer.
If lpJniStorage was delete first, callback_data_lock become a invalid value.
At mReceiver.periodicCapture() in CaptureThread, it will lock callback_data_lock.
Thus, CaptureThread will wait a invalid memory forever and visualizer wait CaptureThread exiting and causing ANR.

Signed-off-by: ganxiaolin <ganxiaolin@xiaomi.com>
2016-06-06 11:09:05 +08:00
Treehugger Robot
7211131e23 Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService." 2016-06-03 21:28:34 +00:00
Treehugger Robot
104518e4c4 Merge "While turning OFF do not honor ON requests." 2016-06-03 17:42:38 +00:00
Sanket Agarwal
2d0c96c908 While turning OFF do not honor ON requests.
Native stack does not handle being put from OFF -> ON state without
doing a complete cleanup. Hence instead of going from start -> ON -> OFF
-> cleanup it goes start -> ON -> OFF ->ON -> ... usually leads to race
conditions down the road in native.

This patch is a workaround so that we can throw away the requests if we
are in currently "turning off" phase. The side-effect would be that user
will need to turn it ON again. The race happens when the turn OFF time
is longer but usually it is found to be close to order of seconds hence
the wait should be bounded.

Bug: b/28318203
Change-Id: I14f6633f31311e5b561e1dcbc8a9d6d2a5dd6fdc
2016-06-03 01:04:43 +00:00
songjinshi
0655edd611 Fixes the system server crash issues caused by null pointer in
NetworkPolicyManagerService.

if the multi user occurs switch and remove then to getPackagesForUid 
the return value will got null,because the user remove is not synced
with the getPackagesForUid,so we must check the return value for 
getPackagesForUid to avoid the crash.

https://code.google.com/p/android/issues/detail?id=211972

Change-Id: If921582da86dbe862f2dad337b0a8d1f20593c99
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
2016-06-02 17:56:09 +00:00
Shubham Ajmera
4d14e9d461 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" 2016-06-02 10:35:41 +00:00
Robert Greenwalt
56bd06fc3e Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" 2016-06-01 18:15:16 +00:00
Vasco Brito
c0246a04b6 Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
This reverts commit 9a769a482861496686a4138a0a9b612a08fce8f8, reversing
changes made to 6fb921a61b0ca6bac8002e0fdbeb521453dce408.
2016-06-01 10:50:57 +01:00
Treehugger Robot
9a769a4828 Merge "Add 900 for Russia - Short code used by Sberbank." 2016-05-31 18:06:29 +00:00