OSDN Git Service
Mark Lu [Mon, 11 Jul 2016 20:20:39 +0000 (20:20 +0000)]
Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
am:
162a6fad72
Change-Id: Ifb20f4b32ec6a6972a5ee1f832d91e1c169bb543
Mark Lu [Mon, 11 Jul 2016 20:20:31 +0000 (20:20 +0000)]
Merge \"docs: Fixed logic for determining image sample size\" into nyc-dev
am:
025ad10a9b
Change-Id: I702b5854378636490c819d26b5d6cf5325b9c076
Mark Lu [Mon, 11 Jul 2016 20:20:26 +0000 (20:20 +0000)]
Merge \"docs: fix syntax error in \"Saving Files\" document\" into nyc-dev
am:
58be01168a
Change-Id: I84f2fb1765b6797c9e8bb5d149f5d00c87e77c42
Mark Lu [Mon, 11 Jul 2016 20:20:21 +0000 (20:20 +0000)]
Merge \"docs: Updated link to UI Automator reference in \"Testing UI\" doc\" into nyc-dev
am:
9c0b602beb
Change-Id: If0ba003bca5c37aa46ab2033edf952b6a76603ad
Mark Lu [Mon, 11 Jul 2016 20:20:17 +0000 (20:20 +0000)]
Merge \"docs: remove out-of-date performance info\" into nyc-dev
am:
62f199ed9f
Change-Id: Ic65fa736b9711f6c8b9f335a09dd23f3a97a4eec
Mark Lu [Mon, 11 Jul 2016 20:13:46 +0000 (20:13 +0000)]
Merge "docs: fixed broken link in UsbManager javadocs" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:13:34 +0000 (20:13 +0000)]
Merge "docs: Fixed logic for determining image sample size" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:13:02 +0000 (20:13 +0000)]
Merge "docs: fix syntax error in "Saving Files" document" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:12:59 +0000 (20:12 +0000)]
Merge "docs: Updated link to UI Automator reference in "Testing UI" doc" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:12:32 +0000 (20:12 +0000)]
Merge "docs: remove out-of-date performance info" into nyc-dev
Billy Lamberta [Mon, 11 Jul 2016 19:53:55 +0000 (19:53 +0000)]
Merge \\\"docs: work - fix app restriction string values\\\" into mnc-io-docs am:
de37b1b270 am:
4b353b2a78
am:
0e6f2097d3
Change-Id: I96039d0f23c1f1da6d210fc411c679f16a42063f
Billy Lamberta [Mon, 11 Jul 2016 19:43:56 +0000 (19:43 +0000)]
Merge \\"docs: work - fix app restriction string values\\" into mnc-io-docs am:
de37b1b270
am:
4b353b2a78
Change-Id: I003422f613a5fe459c1ddf8f9453663f3145a8db
sreevanis [Mon, 11 Jul 2016 19:43:56 +0000 (19:43 +0000)]
Added new partner logos to Auto index page. am:
94b61a29f5 am:
9c513f47c8
am:
b222c3127d
Change-Id: I8b2ce8062a021a621244cbd9c4b80f10a8f82160
Billy Lamberta [Mon, 11 Jul 2016 19:12:42 +0000 (19:12 +0000)]
Merge \"docs: work - fix app restriction string values\" into mnc-io-docs
am:
de37b1b270
Change-Id: Ib99f87a7e4226462a936f87610e968562e3b0da6
sreevanis [Mon, 11 Jul 2016 19:06:51 +0000 (19:06 +0000)]
Added new partner logos to Auto index page. am:
94b61a29f5
am:
9c513f47c8
Change-Id: I3b218a0b80fb426ac3d567e7c87a6186529c4986
Billy Lamberta [Mon, 11 Jul 2016 18:21:25 +0000 (18:21 +0000)]
Merge "docs: work - fix app restriction string values" into mnc-io-docs
sreevanis [Mon, 11 Jul 2016 18:18:48 +0000 (18:18 +0000)]
Added new partner logos to Auto index page.
am:
94b61a29f5
Change-Id: Ifc650de7ba4e5871b2fb7d38e9a7f4a0b2cc4e2c
Todd Kennedy [Mon, 11 Jul 2016 14:51:48 +0000 (14:51 +0000)]
Merge \\"Solve the infinite loop on clearExternalStorageDataSync\\" am:
9a3fbe1162
am:
2747eb7e94
Change-Id: I56e12f9609c5b511c65a6e6b32dbc7ab1d80958a
Tetsutoki Shiozawa [Mon, 11 Jul 2016 14:42:57 +0000 (14:42 +0000)]
Merge \"Solve the infinite loop on clearExternalStorageDataSync\"
am:
9a3fbe1162
Change-Id: I5cfb3374a162863adc305f041eaca08d6efa2d3e
Todd Kennedy [Mon, 11 Jul 2016 14:32:02 +0000 (14:32 +0000)]
Merge "Solve the infinite loop on clearExternalStorageDataSync"
Shubham Ajmera [Mon, 11 Jul 2016 10:23:36 +0000 (10:23 +0000)]
Merge \\"Track libcore change
dd5097d93d2f2c211fc79cde4d5f09db48e8808a\\" am:
18941cb53f
am:
fbe280e345
Change-Id: I654540abfc3a691b1f2caa0921203e952bbaf53d
Shubham Ajmera [Mon, 11 Jul 2016 10:16:34 +0000 (10:16 +0000)]
Merge \"Track libcore change
dd5097d93d2f2c211fc79cde4d5f09db48e8808a\"
am:
18941cb53f
Change-Id: I40ce35ca5e8901f3e8b1e06258c7a5649084d51e
Shubham Ajmera [Mon, 11 Jul 2016 10:16:20 +0000 (10:16 +0000)]
Track libcore change
dd5097d93d2f2c211fc79cde4d5f09db48e8808a
am:
a0d7917c36
Change-Id: I728386e4a8a2c97c5cc8e2d3c1cac46c046057db
Shubham Ajmera [Mon, 11 Jul 2016 10:08:40 +0000 (10:08 +0000)]
Shubham Ajmera [Mon, 11 Jul 2016 09:59:12 +0000 (10:59 +0100)]
Track libcore change
dd5097d93d2f2c211fc79cde4d5f09db48e8808a
(cherry-picked from commit
30cbe3b264c23fd2dcf3a7bb8bb926a46578b35c)
Change-Id: I1264733705d58243e0ff4d001f3802ad48de0b09
sreevanis [Thu, 26 May 2016 21:34:12 +0000 (14:34 -0700)]
Added new partner logos to Auto index page.
lincoln.png, renault.png, rsm.png, tata.png, mbenz.png, opel.png
Bug:
28123362
Change-Id: I87c5a3fd5a614dbce79c889cf4e4e14e25e54dae
Wonil Kim [Mon, 11 Jul 2016 00:36:14 +0000 (00:36 +0000)]
Merge \"Fix simple typo in System Permissions guide\" into nyc-dev
am:
a2f3c8fb0b
Change-Id: I40f81be795e2bc42ae8a71c4fed559512b8be253
Wonil Kim [Mon, 11 Jul 2016 00:20:44 +0000 (00:20 +0000)]
Merge "Fix simple typo in System Permissions guide" into nyc-dev
Mark Salyzyn [Fri, 8 Jul 2016 21:37:36 +0000 (21:37 +0000)]
Settings: add logpersist kernel only selection (strings)
am:
1e6dab2b91
Change-Id: If1f3da789eab3c36a622a26f06df6dc74f222bb5
Mark Salyzyn [Thu, 7 Jul 2016 18:30:32 +0000 (11:30 -0700)]
Settings: add logpersist kernel only selection (strings)
Bug:
28936216
Bug:
29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
Jean-Michel Trivi [Fri, 8 Jul 2016 19:45:54 +0000 (19:45 +0000)]
Merge \"More javadoc for audio recording activity API\" into nyc-dev
am:
8d5fd92314
Change-Id: I58f991a41a6d17ca8e854109dad6ab41b14bc65a
Jean-Michel Trivi [Fri, 8 Jul 2016 19:36:32 +0000 (19:36 +0000)]
Merge "More javadoc for audio recording activity API" into nyc-dev
Eric Laurent [Thu, 7 Jul 2016 20:46:20 +0000 (20:46 +0000)]
Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev
am:
a2266f7a0f
Change-Id: I6ae2457bd8bd9f53b35373fb1be7eb66f80f1510
Eric Laurent [Thu, 7 Jul 2016 20:36:59 +0000 (20:36 +0000)]
Merge "SoundPool: fix enforced camera shutter sound" into nyc-dev
smain@google.com [Thu, 7 Jul 2016 19:26:19 +0000 (19:26 +0000)]
add redirect for URL hard-coded into the default proguard config file, and update related redirects for the entire /guide/developing/ path.
am:
3bd0cec491
Change-Id: Id379926353bdfc47c0b59c0b19f794ad0e7715f3
smain@google.com [Thu, 7 Jul 2016 19:13:36 +0000 (12:13 -0700)]
add redirect for URL hard-coded into the default proguard config file,
and update related redirects for the entire /guide/developing/ path.
Change-Id: Ie23791e3765ff821d9abba220ebdde782d6439ed
Eric Laurent [Thu, 7 Jul 2016 18:35:13 +0000 (11:35 -0700)]
SoundPool: fix enforced camera shutter sound
Make sure that camera shutter sound is played in
total silence DND mode when enforced by country
regulation.
Bug:
29973005
Change-Id: I208f7ae5b07777eac48597f68feae6358999b2c3
Kevin Hufnagle [Thu, 7 Jul 2016 18:32:16 +0000 (18:32 +0000)]
Merge \\\"docs: Edited \\\"Promote with Ads\\\" page; created \\\"Nearby\\\" feature page.\\\" into mnc-io-docs am:
31302819c1 am:
5301f68827
am:
557b747fb4
Change-Id: I873f467fec50364f7e12db782dd4ed176a2a6822
Kevin Hufnagle [Thu, 7 Jul 2016 18:32:09 +0000 (18:32 +0000)]
Merge \\\"docs: Updated \\\"payments\\\" page; created new \\\"drive conversions\\\" page.\\\" into mnc-io-docs am:
a021c2d3e6 am:
11935fbcc9
am:
02fcab7f43
Change-Id: I92905b38e44a5c049705bf3bfb341803d56540ab
Joe Fernandez [Thu, 7 Jul 2016 18:21:05 +0000 (18:21 +0000)]
Merge \\"docs: Edited \\"Promote with Ads\\" page; created \\"Nearby\\" feature page.\\" into mnc-io-docs am:
31302819c1
am:
5301f68827
Change-Id: Ic59d70a5ce5693ed0facdc07e37dd23a7cfae061
Joe Fernandez [Thu, 7 Jul 2016 18:20:58 +0000 (18:20 +0000)]
Merge \\"docs: Updated \\"payments\\" page; created new \\"drive conversions\\" page.\\" into mnc-io-docs am:
a021c2d3e6
am:
11935fbcc9
Change-Id: I44cac66629a2c642ab86331bdda1bb1943df56a0
Kevin Hufnagle [Thu, 7 Jul 2016 18:14:09 +0000 (18:14 +0000)]
Merge \"docs: Edited \"Promote with Ads\" page; created \"Nearby\" feature page.\" into mnc-io-docs
am:
31302819c1
Change-Id: I971086d0b8bb3268fdd62f41567654857b92dba8
Kevin Hufnagle [Thu, 7 Jul 2016 18:14:06 +0000 (18:14 +0000)]
Merge \"docs: Updated \"payments\" page; created new \"drive conversions\" page.\" into mnc-io-docs
am:
a021c2d3e6
Change-Id: Idaed3f61c560217b31cc8a0e81d7a7ed761ee977
Joe Fernandez [Thu, 7 Jul 2016 18:09:40 +0000 (18:09 +0000)]
Merge "docs: Edited "Promote with Ads" page; created "Nearby" feature page." into mnc-io-docs
Joe Fernandez [Thu, 7 Jul 2016 18:06:34 +0000 (18:06 +0000)]
Merge "docs: Updated "payments" page; created new "drive conversions" page." into mnc-io-docs
Billy Lamberta [Thu, 7 Jul 2016 17:54:30 +0000 (10:54 -0700)]
docs: work - fix app restriction string values
Change managed configurations to use strings reference in XML
instead of an explict string.
bug:
24509303
Change-Id: I9d14dfb00ce608e09b3a82a86474ff8cba0b86d2
Hemal Patel [Thu, 7 Jul 2016 16:23:19 +0000 (16:23 +0000)]
Merge \\\"Docs: Fixed wrong return type of a method\\\" into mnc-io-docs am:
13ce5dca58 am:
e02e644b92
am:
518f5a4e09
Change-Id: I0dd2911c4456750b2f718cab37de1bf6056275a4
Hemal Patel [Thu, 7 Jul 2016 16:15:48 +0000 (16:15 +0000)]
Merge \\"Docs: Fixed wrong return type of a method\\" into mnc-io-docs am:
13ce5dca58
am:
e02e644b92
Change-Id: I9f872d3456381b437271ab949804ffbae0e6a5a2
Hemal Patel [Thu, 7 Jul 2016 16:07:59 +0000 (16:07 +0000)]
Merge \"Docs: Fixed wrong return type of a method\" into mnc-io-docs
am:
13ce5dca58
Change-Id: Iece5dfd7fcf3bd0113e3e5fb84a0eac7ad361ae0
Hemal Patel [Thu, 7 Jul 2016 15:57:01 +0000 (15:57 +0000)]
Merge "Docs: Fixed wrong return type of a method" into mnc-io-docs
Shibin George [Thu, 7 Jul 2016 15:36:46 +0000 (15:36 +0000)]
Merge \\"Resolve deadlock between ActivityManagerService and PowerManagerService\\" am:
06561db207
am:
2c565826ba
Change-Id: I875f9f1ed5f6ab82c85ab35e7a24737d08aa3365
Shibin George [Thu, 7 Jul 2016 15:31:16 +0000 (15:31 +0000)]
Merge \"Resolve deadlock between ActivityManagerService and PowerManagerService\"
am:
06561db207
Change-Id: I7f78cf1ef0c490aceb527dbc82228d00fae2f7e4
Treehugger Robot [Thu, 7 Jul 2016 15:19:01 +0000 (15:19 +0000)]
Merge "Resolve deadlock between ActivityManagerService and PowerManagerService"
Shibin George [Tue, 5 Jul 2016 20:42:10 +0000 (02:12 +0530)]
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>
fionaxu [Thu, 7 Jul 2016 02:01:55 +0000 (02:01 +0000)]
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
Change-Id: Ie8cab000503035a1b9e620912356df74e20f4c37
fionaxu [Thu, 7 Jul 2016 01:55:16 +0000 (01:55 +0000)]
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
Change-Id: I8de53f5fa9e45bb5b39eb9d2cd3901f49850e93f
fionaxu [Thu, 7 Jul 2016 01:47:45 +0000 (01:47 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa am:
f6923d2993
am:
50904bedb5
Change-Id: I733cc2b3421780398a2a764748c9d9155c39327b
fionaxu [Thu, 7 Jul 2016 01:39:09 +0000 (01:39 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours am:
d061c3abfa
am:
f6923d2993
Change-Id: If22f635f2e4cf0a3ce79ef6916abe3cb60c6b419
fionaxu [Thu, 7 Jul 2016 01:32:07 +0000 (01:32 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472 am:
b4849f8d74 -s ours
am:
d061c3abfa
Change-Id: Ia6af0a650e4fe0afdcf56ecee7473be2cdef7b32
fionaxu [Thu, 7 Jul 2016 01:20:29 +0000 (01:20 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf am:
92b8cbd472
am:
b4849f8d74 -s ours
Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a
fionaxu [Thu, 7 Jul 2016 01:13:47 +0000 (01:13 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf
am:
92b8cbd472
Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714
Jean-Michel Trivi [Wed, 6 Jul 2016 21:34:52 +0000 (14:34 -0700)]
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
fionaxu [Thu, 7 Jul 2016 01:07:43 +0000 (01:07 +0000)]
DO NOT MERGE revert system api loadSafeLabel
am:
863ac471cf
Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7
fionaxu [Thu, 30 Jun 2016 22:59:55 +0000 (15:59 -0700)]
DO NOT MERGE revert system api loadSafeLabel
Bug:
28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
fionaxu [Wed, 6 Jul 2016 23:50:10 +0000 (23:50 +0000)]
Merge \\\\\"DO NOT MERGE revert system api loadSafeLabel\\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c am:
e5643a13c4 -s ours
am:
ea5f6a74c0
Change-Id: Iab0c0cb2bf1a83ac5f7cb94e4763757078aa6740
Chen Xu [Wed, 6 Jul 2016 23:42:41 +0000 (23:42 +0000)]
Merge \\\\"DO NOT MERGE revert system api loadSafeLabel\\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893 am:
69a071e55c
am:
e5643a13c4 -s ours
Change-Id: I68bfaeedf5290ea792aa0570e68e24d0d6dada11
fionaxu [Wed, 6 Jul 2016 23:36:00 +0000 (23:36 +0000)]
Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am:
d2e2288fe3 am:
59fc768893
am:
69a071e55c
Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797
Chen Xu [Wed, 6 Jul 2016 23:29:51 +0000 (23:29 +0000)]
Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am:
d2e2288fe3
am:
59fc768893
Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2
fionaxu [Wed, 6 Jul 2016 23:24:04 +0000 (23:24 +0000)]
Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
am:
d2e2288fe3
Change-Id: If7bb704d5d6ae942b7ceac3e9f22acf4cf3a7b4b
Chen Xu [Wed, 6 Jul 2016 23:16:53 +0000 (23:16 +0000)]
Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev
smain@google.com [Wed, 6 Jul 2016 22:57:10 +0000 (22:57 +0000)]
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
Change-Id: Id932ce48bb4274096b0c3f367ea0f9d0c7cabef5
Scott Main [Wed, 6 Jul 2016 22:48:01 +0000 (22:48 +0000)]
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
Svet Ganov [Wed, 6 Jul 2016 22:17:03 +0000 (22:17 +0000)]
Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am:
dcf2e205bf
Change-Id: If7706e1286847e02df34b6fce48c8de99b726d7d
Svetoslav Ganov [Wed, 6 Jul 2016 22:10:08 +0000 (22:10 +0000)]
Merge "Use proper lock when accessing the generation registry" into nyc-dev
Lorenzo Colitti [Wed, 6 Jul 2016 20:45:09 +0000 (20:45 +0000)]
Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev
am:
33cdc4d136
Change-Id: I0ad7b79f1af992dd556de5e17a6a1aae9c46e423
Pankaj Kanwar [Wed, 6 Jul 2016 20:35:22 +0000 (20:35 +0000)]
Merge "Make registerDefaultNetwork work on metered networks." into nyc-dev
Svet Ganov [Wed, 6 Jul 2016 19:16:53 +0000 (12:16 -0700)]
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
Bill Yi [Wed, 6 Jul 2016 18:22:28 +0000 (18:22 +0000)]
Import translations. DO NOT MERGE
am:
4c78b8e544 -s ours
Change-Id: I6f600c77710ed8cbc40cc3c1a235b5917eb06134
riddle_hsu [Wed, 6 Jul 2016 08:18:16 +0000 (08:18 +0000)]
Merge \\"MediaSession: Use mHandler for sending a pending intent\\" am:
fcae61308c
am:
b417585b29
Change-Id: I293c98a5a27db0afb537f15ee8ebe7f0755bab1e
riddle_hsu [Wed, 6 Jul 2016 08:10:06 +0000 (08:10 +0000)]
Merge \"MediaSession: Use mHandler for sending a pending intent\"
am:
fcae61308c
Change-Id: I60ab3a4a19426b7912658dfa6b7ebd20863adf72
Treehugger Robot [Wed, 6 Jul 2016 07:58:53 +0000 (07:58 +0000)]
Merge "MediaSession: Use mHandler for sending a pending intent"
Jae Seo [Wed, 6 Jul 2016 07:55:48 +0000 (07:55 +0000)]
resolve merge conflicts of
5b6c034 to stage-aosp-master
am:
5f5bd8848c
Change-Id: I4a2c518ff61f00d09efb92bd7da2e9bc477421f3
Jae Seo [Wed, 6 Jul 2016 07:45:15 +0000 (00:45 -0700)]
resolve merge conflicts of
5b6c034 to stage-aosp-master
Change-Id: I664240e9a9b2693f912b5b2a8a1731d08f109bfe
Jae Seo [Wed, 6 Jul 2016 07:15:54 +0000 (07:15 +0000)]
Merge "Fix deadlock in MediaSessionService during getCurrentUser()"
Shibin George [Tue, 28 Jun 2016 10:26:50 +0000 (15:56 +0530)]
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>
Bill Yi [Tue, 5 Jul 2016 21:07:10 +0000 (14:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf9776c5e49200e5880dd16b81e43ae095471caa
Auto-generated-cl: translation import
Przemyslaw Szczepaniak [Tue, 5 Jul 2016 09:09:09 +0000 (09:09 +0000)]
Track libcore change
c49fd8d2b8449193fbb53750e7f6a22cacc2f968
am:
9ede567f7c
Change-Id: I8b12fdde8489c2c3882b5da08801599241a54048
Przemyslaw Szczepaniak [Tue, 5 Jul 2016 09:01:09 +0000 (09:01 +0000)]
Merge \\"Track libcore change
c49fd8d2b8449193fbb53750e7f6a22cacc2f968\\" am:
326e55a3e2
am:
ce482360b9
Change-Id: I642efaa06e6b21791ba38944eee2078ba452683f
Przemyslaw Szczepaniak [Tue, 5 Jul 2016 08:40:27 +0000 (09:40 +0100)]
Track libcore change
c49fd8d2b8449193fbb53750e7f6a22cacc2f968
Version with test-current.txt
Bug:
28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
Przemyslaw Szczepaniak [Tue, 5 Jul 2016 08:54:24 +0000 (08:54 +0000)]
Merge \"Track libcore change
c49fd8d2b8449193fbb53750e7f6a22cacc2f968\"
am:
326e55a3e2
Change-Id: I404c9665d23664f137462c246ebc724128035555
Przemyslaw Szczepaniak [Tue, 5 Jul 2016 08:42:05 +0000 (08:42 +0000)]
Przemyslaw Szczepaniak [Mon, 4 Jul 2016 16:40:24 +0000 (16:40 +0000)]
Merge \\"Track libcore change
4eed609c71648c069d8e83ec7001da29044d416b\\" am:
cf5b00e6bc
am:
43714397df
Change-Id: I4b546015058d9ca959dadfbaf6f510182c2a47ca
Przemyslaw Szczepaniak [Mon, 4 Jul 2016 16:33:53 +0000 (16:33 +0000)]
Merge \"Track libcore change
4eed609c71648c069d8e83ec7001da29044d416b\"
am:
cf5b00e6bc
Change-Id: Ib9462093cf0a6794950d3260b53754cb4c15389e
Przemyslaw Szczepaniak [Mon, 4 Jul 2016 16:26:37 +0000 (16:26 +0000)]
Przemyslaw Szczepaniak [Mon, 4 Jul 2016 15:35:28 +0000 (16:35 +0100)]
Track libcore change
4eed609c71648c069d8e83ec7001da29044d416b
Bug:
27464570
Change-Id: I761cab7198f2608b8e76e9a5c775e3bcec44d781
Wonil Kim [Sat, 2 Jul 2016 03:06:57 +0000 (12:06 +0900)]
Fix simple typo in System Permissions guide
TYou to You
BUG:
29946799
Change-Id: I9796a91109d5f0d756f5273ebc56c44ff4cf25f6
David Friedman [Sat, 2 Jul 2016 00:28:02 +0000 (00:28 +0000)]
Merge \"Docs: Performance final changes\" into nyc-dev
am:
7e8d17d73e
Change-Id: I8ec5ee9f8be330a74383864ebcda24906caa32c0
Joe Fernandez [Sat, 2 Jul 2016 00:15:20 +0000 (00:15 +0000)]
Merge "Docs: Performance final changes" into nyc-dev
David Friedman [Sat, 2 Jul 2016 00:11:02 +0000 (17:11 -0700)]
Docs: Performance final changes
Change-Id: I50e7a2e7b455ca3032da339e48a217ce713d1c40
Eric Schmidt [Fri, 1 Jul 2016 23:26:09 +0000 (23:26 +0000)]
Merge \"docs: performance: Reduce APK Sizes\" into nyc-dev
am:
d08b0e9969
Change-Id: Ie33ad35e140997c5ce01fd275c6d41512e8dc5eb
OSDN Git Service
