drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,762 Commits 1 Branch 0 Tags
Commit Graph

251762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shibin George
2c565826ba Merge \"Resolve deadlock between ActivityManagerService and PowerManagerService\" 
am: 06561db207

Change-Id: I7f78cf1ef0c490aceb527dbc82228d00fae2f7e4
 2016-07-07 15:31:16 +00: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
riddle_hsu
b417585b29 Merge \"MediaSession: Use mHandler for sending a pending intent\" 
am: fcae61308c

Change-Id: I60ab3a4a19426b7912658dfa6b7ebd20863adf72
 2016-07-06 08:10:06 +00:00
Treehugger Robot
fcae61308c Merge "MediaSession: Use mHandler for sending a pending intent" 2016-07-06 07:58:53 +00:00
Jae Seo
5f5bd8848c resolve merge conflicts of 5b6c034 to stage-aosp-master 
Change-Id: I664240e9a9b2693f912b5b2a8a1731d08f109bfe
 2016-07-06 00:45:15 -07: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
9ede567f7c Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968 
Version with test-current.txt

Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
 2016-07-05 08:59:10 +00:00
Przemyslaw Szczepaniak
ce482360b9 Merge \"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\" 
am: 326e55a3e2

Change-Id: I404c9665d23664f137462c246ebc724128035555
 2016-07-05 08:54:24 +00:00
Przemyslaw Szczepaniak
326e55a3e2 Merge "Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968" 2016-07-05 08:42:05 +00:00
Przemyslaw Szczepaniak
43714397df Merge \"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\" 
am: cf5b00e6bc

Change-Id: Ib9462093cf0a6794950d3260b53754cb4c15389e
 2016-07-04 16:33:53 +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
TreeHugger Robot
7061535ce6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:54:45 +00:00
TreeHugger Robot
5b5853fd3f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:54:28 +00:00
TreeHugger Robot
8cdc731029 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:54:12 +00:00
TreeHugger Robot
aac5c0e427 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:56 +00:00
TreeHugger Robot
79c9b301ee Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:41 +00:00
TreeHugger Robot
2250c7ccaa Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:36 +00:00
TreeHugger Robot
f20ff3a07e Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:21 +00:00
TreeHugger Robot
e3f8e76f78 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:05 +00:00
TreeHugger Robot
873e9e16ab Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:52:50 +00:00
TreeHugger Robot
da696a6d9c Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:52:35 +00:00
TreeHugger Robot
689366fe33 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:52:20 +00:00
TreeHugger Robot
9d3c51d66f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:52:05 +00:00
TreeHugger Robot
baedc65a8b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:51:50 +00:00
TreeHugger Robot
914376787b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:49:41 +00:00
Bill Yi
9a2f574fce Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Iac4bc0fff7337c0971222e59b1f01e4a7ff3a1c5
 2016-06-30 19:59:37 -07:00
Bill Yi
a1036aed71 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I75df6be0cf865770568238976172e093082dca3d
 2016-06-30 19:53:56 -07:00
Bill Yi
0789113f7f Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ie154b48d77d2bc34ae1e71e1c3813c3ed2959eeb
 2016-06-30 18:41:48 -07:00
Bill Yi
008744326d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ia84a48847f77b72112f827ed67332fb1e293eea8
 2016-06-30 18:39:36 -07:00
Bill Yi
71a46a43bf Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I8a6fa77b6a2227f5a33435fcd940909f52a84db3
 2016-06-30 18:37:21 -07:00
Bill Yi
a0e7788607 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I9d76dfe843b0824bfe6dcc403aeb71cd892a6d0d
 2016-06-30 18:19:39 -07:00
Bill Yi
2f14a1a246 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Id899736cd68eb85928a9dd4552d7373096d14e08
 2016-06-30 18:17:21 -07:00
Bill Yi
4532312678 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ia8532224b0cc3135e4e848087b6de17a9b809a4d
 2016-06-30 18:15:03 -07:00
Bill Yi
c0fd52440a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I94c1eba5ff046d77f37195311a537cf5b4d5db51
 2016-06-30 18:09:03 -07:00
Bill Yi
c692e5ee8d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I58c6883a1d26934d14b4f6330dd2adb530193dfd
 2016-06-30 18:04:47 -07:00
Bill Yi
345af54215 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Id3fb47cbfa7ff4482e09775ce67d949b3ab3ce8f
 2016-06-30 18:02:15 -07:00
Bill Yi
a415a3d321 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Iece1d9a50c8a3079af49f8fd79fa08ed63b3f8cd
 2016-06-30 17:57:17 -07:00
Bill Yi
4d822824c7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I252292d5c72798d7b96083720c10297f187514ef
 2016-06-30 17:54:54 -07:00
Bill Yi
2eb31228c0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I15e533393eb47890b62e320ccc9b1aa234a6aa21
 2016-06-30 17:52:29 -07:00
Bill Yi
586b71f608 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I98fa78ae9f908c5a7222b34da22cd0c32cbe5bd0
 2016-06-30 17:48:09 -07:00
Tobias Thierer
f6bcab7f97 Merge \"Changes for upgrade to OkHttp 2.7.5\" 
am: a31247bd8d

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280
 2016-06-30 12:49:47 +00: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
Dan Sandler
45294a6859 Purr. 
am: 610f6ede25

Change-Id: I0dc3c9da110b8a92ecde6dbc28eb572a148ad6f5
 2016-06-28 07:07:35 +00:00
Dan Sandler
3fae8ae0c6 One final tweak to the platlogo. 
am: 4b7e415803

Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae
 2016-06-28 07:07:31 +00:00
Dan Sandler
ed48cbc8fc Fix SuperNotCalledException. 
am: 04f8cc2bb3

Change-Id: Ic981a15b565092ea13a618c7ac0ed9d000854362
 2016-06-28 07:07:28 +00:00