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
fionaxu
eea1ae16d5
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa am: f6923d2993 am: 50904bedb5 am: aad33e6905 -s ours
...
am: c8a7fd0502
2016-07-07 02:01:55 +00:00
fionaxu
c8a7fd0502
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa am: f6923d2993 am: 50904bedb5
...
am: aad33e6905
2016-07-07 01:55:16 +00:00
fionaxu
aad33e6905
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa am: f6923d2993
...
am: 50904bedb5
2016-07-07 01:47:45 +00:00
fionaxu
50904bedb5
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours am: d061c3abfa
...
am: f6923d2993
2016-07-07 01:39:09 +00:00
fionaxu
f6923d2993
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74 -s ours
...
am: d061c3abfa
2016-07-07 01:32:07 +00:00
fionaxu
d061c3abfa
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472
...
am: b4849f8d74
2016-07-07 01:20:29 +00:00
fionaxu
b4849f8d74
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf
...
am: 92b8cbd472
2016-07-07 01:13:47 +00:00
Jean-Michel Trivi
7872affa96
More javadoc for audio recording activity API
...
Better overview of feature inside AudioRecordingConfiguration
class description.
Addition of @see links in AudioManager query and callback methods.
Bug 27929523
Change-Id: I9159ffd40d68f7c65f59570119821087643f9030
2016-07-06 18:12:01 -07:00
fionaxu
92b8cbd472
DO NOT MERGE revert system api loadSafeLabel
...
am: 863ac471cf
2016-07-07 01:07:43 +00:00
fionaxu
863ac471cf
DO NOT MERGE revert system api loadSafeLabel
...
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
2016-07-06 17:05:32 -07:00
fionaxu
fb55beefc8
Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c am: e5643a13c4 -s ours
...
am: ea5f6a74c0
2016-07-06 23:50:10 +00:00
Chen Xu
ea5f6a74c0
Merge \\\\"DO NOT MERGE revert system api loadSafeLabel\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c
...
am: e5643a13c4
2016-07-06 23:42:41 +00:00
fionaxu
e5643a13c4
Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893
...
am: 69a071e55c
2016-07-06 23:36:00 +00:00
Chen Xu
69a071e55c
Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am: d2e2288fe3
...
am: 59fc768893
2016-07-06 23:29:51 +00:00
fionaxu
59fc768893
Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
...
am: d2e2288fe3
2016-07-06 23:24:04 +00:00
Chen Xu
d2e2288fe3
Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev
2016-07-06 23:16:55 +00:00
smain@google.com
68d98965c5
Merge \"remove \"referenceonly\" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates.\" into nyc-dev
...
am: 83f71845af
2016-07-06 22:57:10 +00:00
Scott Main
83f71845af
Merge "remove "referenceonly" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates." into nyc-dev
2016-07-06 22:48:02 +00:00
Svet Ganov
8503bf31bf
Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
...
am: dcf2e205bf
2016-07-06 22:17:03 +00:00
Svetoslav Ganov
dcf2e205bf
Merge "Use proper lock when accessing the generation registry" into nyc-dev
2016-07-06 22:10:09 +00:00
Lorenzo Colitti
21e9073ba2
Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev
...
am: 33cdc4d136
2016-07-06 20:45:09 +00:00
Pankaj Kanwar
33cdc4d136
Merge "Make registerDefaultNetwork work on metered networks." into nyc-dev
2016-07-06 20:35:23 +00:00
Svet Ganov
51b839544b
Use proper lock when accessing the generation registry
...
We use 'this' for synchronization in NameValueCache but some code
that accesses the generation registry uses 'this' in a different
context ending up syncing on the wrong instance. This is why
sync on this is just a bad idea.
bug:29956424
Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee
2016-07-06 19:52:36 +00:00
Bill Yi
7836a20c7e
Import translations. DO NOT MERGE
...
am: 4c78b8e544
2016-07-06 18:22:28 +00:00
riddle_hsu
e76561980e
Merge \\"MediaSession: Use mHandler for sending a pending intent\\" am: fcae61308c
...
am: b417585b29
2016-07-06 08:18:16 +00:00
riddle_hsu
b417585b29
Merge \"MediaSession: Use mHandler for sending a pending intent\"
...
am: fcae61308c
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
8575120faa
resolve merge conflicts of 5b6c034 to stage-aosp-master
...
am: 5f5bd8848c
2016-07-06 07:55:48 +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
Bill Yi
4c78b8e544
Import translations. DO NOT MERGE
...
Change-Id: Idf9776c5e49200e5880dd16b81e43ae095471caa
Auto-generated-cl: translation import
2016-07-05 14:07:10 -07:00
Przemyslaw Szczepaniak
61bb0a9ef4
Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968
...
am: 9ede567f7c
2016-07-05 09:09:09 +00:00
Przemyslaw Szczepaniak
8fbba5047f
Merge \\"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\\" am: 326e55a3e2
...
am: ce482360b9
2016-07-05 09:01:09 +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
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
b0d49c7cbb
Merge \\"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\\" am: cf5b00e6bc
...
am: 43714397df
2016-07-04 16:40:24 +00:00
Przemyslaw Szczepaniak
43714397df
Merge \"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\"
...
am: cf5b00e6bc
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
David Friedman
10cb63fe41
Doc: Minor fixes following launch of Performance section on DAC.
...
Fixes the metaDescription, which had contained dummy text. Change pushed ahead as hotfix.
Also fixes a couple of image URLs, which hadn't reflected the move to under topic/
Change-Id: I9fd776f409934cd5d02e5abba8289f7a79d2ed22
2016-07-02 08:04:20 -07:00
Wonil Kim
6a4d333260
Fix simple typo in System Permissions guide
...
TYou to You
BUG: 29946799
Change-Id: I9796a91109d5f0d756f5273ebc56c44ff4cf25f6
2016-07-02 12:06:57 +09:00
David Friedman
7a9dde8ea9
Merge \"Docs: Performance final changes\" into nyc-dev
...
am: 7e8d17d73e
2016-07-02 00:28:02 +00:00
Joe Fernandez
7e8d17d73e
Merge "Docs: Performance final changes" into nyc-dev
2016-07-02 00:15:21 +00:00
David Friedman
06dfd514c0
Docs: Performance final changes
...
Change-Id: I50e7a2e7b455ca3032da339e48a217ce713d1c40
2016-07-01 17:12:55 -07:00
Eric Schmidt
45c28df984
Merge \"docs: performance: Reduce APK Sizes\" into nyc-dev
...
am: d08b0e9969
2016-07-01 23:26:09 +00:00
Joe Fernandez
d08b0e9969
Merge "docs: performance: Reduce APK Sizes" into nyc-dev
2016-07-01 23:21:36 +00:00
David Friedman
fc93117bdf
Merge \"Docs: Job-scheduling doc for new DAC Performance section.\" into nyc-dev
...
am: 1f64ea546b
2016-07-01 23:13:03 +00:00
