OSDN Git Service
Chong Zhang [Mon, 22 Aug 2016 20:53:24 +0000 (13:53 -0700)]
Move okToShowLocked out of ActivityStack
This has nothing to do with stacks, it only depends on activity
flags and current user.
Also use ActivityRecord.okToShowLocked in more places as this
takes into account that the user profile is stopping.
Change-Id: Ieb9aa6b02482f10064390628798375445036489d
Sudheer Shanka [Fri, 19 Aug 2016 18:24:22 +0000 (18:24 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9 am:
58def3804c -s ours am:
e49de5e073 am:
de13c7a45b
am:
a9a7fb33c6 -s ours
Change-Id: I5813728da965949b1e7bd9553a2bb8a598ab0dcc
Amith Yamasani [Fri, 19 Aug 2016 18:24:19 +0000 (18:24 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365 am:
5841c492a7 -s ours am:
f705730667 am:
b07b5f745a
am:
5a27f4bcd2 -s ours
Change-Id: I5f22f4f446ad7643b8de1980461e95c10664b52a
Sudheer Shanka [Fri, 19 Aug 2016 18:17:36 +0000 (18:17 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9 am:
58def3804c -s ours am:
e49de5e073
am:
de13c7a45b
Change-Id: Ida35ef7c72e9f6717984c41bb4546e9981a0f598
Amith Yamasani [Fri, 19 Aug 2016 18:17:33 +0000 (18:17 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365 am:
5841c492a7 -s ours am:
f705730667
am:
b07b5f745a
Change-Id: I594d38d8ccc37beefc533c18e3eccf76eb3b3669
Sudheer Shanka [Fri, 19 Aug 2016 18:09:57 +0000 (18:09 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9 am:
58def3804c -s ours
am:
e49de5e073
Change-Id: I2213eaf49053cc4ac01746411fc7a35c6b0477b4
Amith Yamasani [Fri, 19 Aug 2016 18:09:53 +0000 (18:09 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365 am:
5841c492a7 -s ours
am:
f705730667
Change-Id: Ic8bc51f29553e19aabd44f8123d6434ed36d15a2
Sudheer Shanka [Fri, 19 Aug 2016 18:02:26 +0000 (18:02 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9
am:
58def3804c -s ours
Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d
Amith Yamasani [Fri, 19 Aug 2016 18:02:22 +0000 (18:02 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365
am:
5841c492a7 -s ours
Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551
Android Build Merger (Role) [Fri, 19 Aug 2016 17:55:47 +0000 (17:55 +0000)]
Merge "Merge "[NAN] Update finalize to check and warn user if resources not freed" into mm-wireless-dev am:
907ce63ed1"
Etan Cohen [Fri, 19 Aug 2016 17:54:35 +0000 (17:54 +0000)]
Merge "[NAN] Update finalize to check and warn user if resources not freed" into mm-wireless-dev
am:
907ce63ed1
Change-Id: Id45d1727dcfdf234e6345f546144c26408ae5fe6
Sudheer Shanka [Fri, 19 Aug 2016 17:54:21 +0000 (17:54 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5
am:
08eb52f9f9
Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
Amith Yamasani [Fri, 19 Aug 2016 17:54:19 +0000 (17:54 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27
am:
39c7879365
Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
Sudheer Shanka [Fri, 19 Aug 2016 17:53:54 +0000 (17:53 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am:
badc5cd942 am:
8b948eee03
am:
584f703907 -s ours
Change-Id: I1f0236689af17520574616bd59017cb7bed7a367
Amith Yamasani [Fri, 19 Aug 2016 17:53:48 +0000 (17:53 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
55eacb9441 am:
b7380a1c0c
am:
0bd456467f -s ours
Change-Id: If7c7b4e6932a401eba750d7d626d01c54537f8f6
Sudheer Shanka [Fri, 19 Aug 2016 17:44:53 +0000 (17:44 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am:
badc5cd942
am:
8b948eee03
Change-Id: I21bc52830b06f83d2295452863fdcc91ab41986f
Amith Yamasani [Fri, 19 Aug 2016 17:44:46 +0000 (17:44 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
55eacb9441
am:
b7380a1c0c
Change-Id: I3ec336f6d7a58b6e87c6b99693e8f1ec2a3ad075
Sudheer Shanka [Fri, 19 Aug 2016 17:32:47 +0000 (17:32 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb
am:
7e890c8eb5
Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
Amith Yamasani [Fri, 19 Aug 2016 17:32:44 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4
am:
29ae7b1a27
Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
Sudheer Shanka [Fri, 19 Aug 2016 17:31:47 +0000 (17:31 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
am:
badc5cd942
Change-Id: I3c783e856777500d86cc5ae162ab82a727e42967
Amith Yamasani [Fri, 19 Aug 2016 17:31:40 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
55eacb9441
Change-Id: Id1ee0a3dd76a7bb549838e9d74b9927956b96570
Adam Lesinski [Fri, 19 Aug 2016 17:31:31 +0000 (17:31 +0000)]
Merge "AAPT2: Add tool to fix positional argument issues"
Sudheer Shanka [Fri, 19 Aug 2016 17:22:29 +0000 (17:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am:
b51e98becb
Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
Etan Cohen [Fri, 19 Aug 2016 17:22:26 +0000 (17:22 +0000)]
Merge "[NAN] Update finalize to check and warn user if resources not freed" into mm-wireless-dev
Amith Yamasani [Fri, 19 Aug 2016 17:22:25 +0000 (17:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
d1eeb5b7b4
Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
Sudheer Shanka [Fri, 19 Aug 2016 17:06:53 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:47 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
André Lago [Fri, 19 Aug 2016 17:02:02 +0000 (17:02 +0000)]
Merge "[SettingsProvider] Fix user id for ringtone cache"
André Lago [Fri, 19 Aug 2016 17:02:02 +0000 (17:02 +0000)]
Merge changes from topic 'Different sound settings for work profile'
* changes:
[media] Separate ringtones for managed profiles
[Settings] Added setting SYNC_PARENT_SOUNDS
Etan Cohen [Fri, 19 Aug 2016 16:58:00 +0000 (16:58 +0000)]
[NAN] Do not expose WifiManager.isNanSupported as new API
am:
a3264c4e3d
Change-Id: Ifd6a9bb6a129e441b033f3e392c88162ed029493
TreeHugger Robot [Fri, 19 Aug 2016 16:54:51 +0000 (16:54 +0000)]
Merge "Refactored MediaInserterTest to use Mockito instead of EasyMock."
Bill Yi [Fri, 19 Aug 2016 16:20:25 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Andreas Huber [Fri, 19 Aug 2016 15:53:11 +0000 (15:53 +0000)]
Merge "Support one-way methods in java support for hardware binder."
Android Build Merger (Role) [Fri, 19 Aug 2016 15:48:09 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE am:
02799d57d7 -s ours am:
11d3b2db21 -s ours am:
d789b8aac0 -s ours"
Android Build Merger (Role) [Fri, 19 Aug 2016 15:47:52 +0000 (15:47 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4122130005 -s ours am:
c9731879e5 -s ours"
Bill Yi [Fri, 19 Aug 2016 15:47:09 +0000 (15:47 +0000)]
Import translations. DO NOT MERGE am:
02799d57d7 -s ours am:
11d3b2db21 -s ours
am:
d789b8aac0 -s ours
Change-Id: I45466d785a4a7024d76af68bb013e199c2eb5f16
Bill Yi [Fri, 19 Aug 2016 15:47:05 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4122130005 -s ours
am:
c9731879e5 -s ours
Change-Id: I1a8639300f517c0c26c411221532d26f406c99c7
Makoto Onuki [Fri, 19 Aug 2016 15:45:50 +0000 (15:45 +0000)]
Merge "Add more utility methods for CTS"
Bill Yi [Fri, 19 Aug 2016 15:42:53 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
4ecc9d2db4 -s ours
am:
e35215cec7 -s ours
Change-Id: I76e05f0850240a1b39ade0ad8c9e20dd60a51f64
Bill Yi [Fri, 19 Aug 2016 15:42:48 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4122130005 -s ours
am:
d1ec21e26a -s ours
Change-Id: I5c472506d02ff9a808c0c0d0ba7a77910d7bebab
Bill Yi [Fri, 19 Aug 2016 15:42:45 +0000 (15:42 +0000)]
Import translations. DO NOT MERGE am:
02799d57d7 -s ours
am:
11d3b2db21 -s ours
Change-Id: Ia8345aa02bb8f30d93c81878dff1a2a08bc86cf2
Bill Yi [Fri, 19 Aug 2016 15:42:40 +0000 (15:42 +0000)]
Import translations. DO NOT MERGE am:
3f12495742 -s ours
am:
d75716b04f -s ours
Change-Id: I1323d19fb089c3d351cfb724378ff4d803894035
Bill Yi [Fri, 19 Aug 2016 15:35:12 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
4122130005 -s ours
Change-Id: I2688851beb78619270d8cb6dc077992b9cec037d
Bill Yi [Fri, 19 Aug 2016 15:35:08 +0000 (15:35 +0000)]
Import translations. DO NOT MERGE
am:
3f12495742 -s ours
Change-Id: If2153aa4692097ba2cdee319e3d77d1043dfe7c9
Bill Yi [Fri, 19 Aug 2016 15:34:56 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4ecc9d2db4 -s ours
Change-Id: I17a1beb48aad1e8744ecfab50791267ee972b971
Bill Yi [Fri, 19 Aug 2016 15:34:55 +0000 (15:34 +0000)]
Import translations. DO NOT MERGE
am:
02799d57d7 -s ours
Change-Id: I83188fb11d9ca24d92049d8e4ba33b8d2e08a4d0
TreeHugger Robot [Fri, 19 Aug 2016 15:28:59 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 19 Aug 2016 15:28:48 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 19 Aug 2016 15:28:28 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 19 Aug 2016 15:27:55 +0000 (15:27 +0000)]
Merge "Import translations. DO NOT MERGE"
Tyler Gunn [Fri, 19 Aug 2016 14:45:28 +0000 (14:45 +0000)]
Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev am:
9df655a443 am:
542511a577
am:
939ea39a45
Change-Id: I010b65257ce665c192fa5e0b7719f3dec02f3814
Tyler Gunn [Fri, 19 Aug 2016 14:44:55 +0000 (14:44 +0000)]
Add connection events for indicated when a connection is remotely held. am:
b5ed860de7 am:
536e3805bb
am:
e0694b173e
Change-Id: I01a201684206eb68651f139855f3c07e0eb7ea17
Tyler Gunn [Fri, 19 Aug 2016 14:38:25 +0000 (14:38 +0000)]
Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev am:
9df655a443
am:
542511a577
Change-Id: I80a5d6889a844d69efc3bd58494bd127e65a8fc8
Tyler Gunn [Fri, 19 Aug 2016 14:37:50 +0000 (14:37 +0000)]
Add connection events for indicated when a connection is remotely held. am:
b5ed860de7
am:
536e3805bb
Change-Id: I0a70cc83d5c59b8099555bca8babe26163e8da08
Tyler Gunn [Fri, 19 Aug 2016 14:32:21 +0000 (14:32 +0000)]
Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev
am:
9df655a443
Change-Id: Iaa5962749f2c3695c145af84c52a0389a8a0f906
Tyler Gunn [Fri, 19 Aug 2016 14:32:16 +0000 (14:32 +0000)]
Add connection events for indicated when a connection is remotely held.
am:
b5ed860de7
Change-Id: I0ff4ec175ae9c316ba9a31ad225a84248301f252
Tyler Gunn [Fri, 19 Aug 2016 14:28:06 +0000 (14:28 +0000)]
Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev
Bill Yi [Fri, 19 Aug 2016 14:09:51 +0000 (07:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1eecd96e402c310f88872f87db259ebf181c3014
Auto-generated-cl: translation import
Scott Main [Fri, 19 Aug 2016 14:07:48 +0000 (14:07 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9 am:
97d6427ab0 am:
c4fb0012e1 am:
be3e7cf89e
am:
96525800e2
Change-Id: I8c347457347dde274aadca8f7c6547ecaaf67929
smain@google.com [Fri, 19 Aug 2016 14:07:44 +0000 (14:07 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9 am:
3872e56f69 am:
97fd094458 am:
af76b974ae
am:
ea2d20aa8a
Change-Id: I39351fa65f4b7846cd5d672f8568f98684663a92
Narayan Kamath [Fri, 19 Aug 2016 14:07:39 +0000 (14:07 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
b8f0cd0248 am:
e3cb8a7db9 am:
957e52bc40
am:
e388ec67a7
Change-Id: I6a9c19ce2724745120b007d48603f326be4bd546
Narayan Kamath [Fri, 19 Aug 2016 14:07:34 +0000 (14:07 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
99f960f7da am:
b060316945 am:
352f745c5d
am:
597c78bae4
Change-Id: I331e5cae48fb23178b83032884bc5dfdf059e35b
Scott Main [Fri, 19 Aug 2016 13:58:59 +0000 (13:58 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9 am:
97d6427ab0 am:
c4fb0012e1
am:
be3e7cf89e
Change-Id: I9ea973e58a3111133c0fd83890c3403a0847c9d6
smain@google.com [Fri, 19 Aug 2016 13:58:53 +0000 (13:58 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9 am:
3872e56f69 am:
97fd094458
am:
af76b974ae
Change-Id: I495795d568807251efec04097fcf00264bb6707c
Narayan Kamath [Fri, 19 Aug 2016 13:58:48 +0000 (13:58 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
b8f0cd0248 am:
e3cb8a7db9
am:
957e52bc40
Change-Id: If8772884a3109491036fc1858dc3d0a667197e2f
Narayan Kamath [Fri, 19 Aug 2016 13:58:44 +0000 (13:58 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
99f960f7da am:
b060316945
am:
352f745c5d
Change-Id: Ifff280557880ed487bfaddd3c570af95288d580c
Christopher Tate [Fri, 19 Aug 2016 13:48:00 +0000 (13:48 +0000)]
Merge "Isolated processes don't get precached system service binders" into nyc-mr1-dev am:
1b58e1c821 am:
342b16c6db
am:
8adb9c28e6
Change-Id: I66cac43c43114596302923e927633e36ce21a0be
Christopher Tate [Fri, 19 Aug 2016 13:47:55 +0000 (13:47 +0000)]
Isolated processes don't get precached system service binders am:
2c61c57ac5 am:
bf3d892df2
am:
35f883d9cf
Change-Id: I06726ff14caa8628ab37f40d1fb90e21506c23db
Svetoslav Ganov [Fri, 19 Aug 2016 13:42:23 +0000 (13:42 +0000)]
Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev am:
9a6008a334 am:
de63b40374
am:
42adf24656
Change-Id: Ie8f03b5cf8d1014058f43f6d03bbb6bdcd153534
Scott Main [Fri, 19 Aug 2016 13:42:14 +0000 (13:42 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9 am:
97d6427ab0
am:
c4fb0012e1
Change-Id: I2c313260cb95acc8ef7fc1a416ede9faaf29a938
smain@google.com [Fri, 19 Aug 2016 13:42:12 +0000 (13:42 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9 am:
3872e56f69
am:
97fd094458
Change-Id: I55bd31ed3d9b4ce98058ef2478a38cf511b5b85d
Narayan Kamath [Fri, 19 Aug 2016 13:42:09 +0000 (13:42 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
b8f0cd0248
am:
e3cb8a7db9
Change-Id: Iadb326b237e0ff2e23805d46b0331266d81f52f5
Narayan Kamath [Fri, 19 Aug 2016 13:42:07 +0000 (13:42 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
99f960f7da
am:
b060316945
Change-Id: I44662f76bc72770c7c52800933e4423811c76aa9
Svet Ganov [Fri, 19 Aug 2016 13:41:49 +0000 (13:41 +0000)]
Add resource based mechanism to grant default permissions am:
59020bffb7 am:
34d85c6087
am:
e3697a3569
Change-Id: Idf2e194e617d44b8dc5cced9162e98e8d48977c4
Todd Kennedy [Fri, 19 Aug 2016 13:41:13 +0000 (13:41 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev am:
42b14329f5 am:
d8f1599a6a
am:
1fdee13f63
Change-Id: I631985d20485c15ed6b5f146c06fe3742ca71948
Todd Kennedy [Fri, 19 Aug 2016 13:39:37 +0000 (13:39 +0000)]
Release mPackages lock earlier am:
a8d4f48997 am:
d8443b77cc
am:
5bcee670bc
Change-Id: I539468d9e4b478742e7274db903ce6cde8ad7984
Christopher Tate [Fri, 19 Aug 2016 13:34:12 +0000 (13:34 +0000)]
Merge "Isolated processes don't get precached system service binders" into nyc-mr1-dev am:
1b58e1c821
am:
342b16c6db
Change-Id: Id65c140614ca82c97c0268f26e84faf508a4eb3f
Christopher Tate [Fri, 19 Aug 2016 13:34:08 +0000 (13:34 +0000)]
Isolated processes don't get precached system service binders am:
2c61c57ac5
am:
bf3d892df2
Change-Id: I4d7c7376bb28c28ecbc15845179a546c5b1ddd93
Scott Main [Fri, 19 Aug 2016 13:29:14 +0000 (13:29 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9
am:
97d6427ab0
Change-Id: Ic8a4e3c86fed503333e6f46d62ad4fd492430547
smain@google.com [Fri, 19 Aug 2016 13:29:12 +0000 (13:29 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9
am:
3872e56f69
Change-Id: I19e1cb6e9f79edb9755afb66cce4a67db9428f7f
Narayan Kamath [Fri, 19 Aug 2016 13:29:10 +0000 (13:29 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
b8f0cd0248
Change-Id: I49cd6679da56f5f853c17c741064db88431ded8c
Narayan Kamath [Fri, 19 Aug 2016 13:29:07 +0000 (13:29 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
99f960f7da
Change-Id: I471c81919cce6725433895c3d20ca22a8e827b98
Svetoslav Ganov [Fri, 19 Aug 2016 13:28:48 +0000 (13:28 +0000)]
Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev am:
9a6008a334
am:
de63b40374
Change-Id: Ib9fe0ee2efdb9271e7a3a7d551d1e141438f192b
Svet Ganov [Fri, 19 Aug 2016 13:28:13 +0000 (13:28 +0000)]
Add resource based mechanism to grant default permissions am:
59020bffb7
am:
34d85c6087
Change-Id: I1352cc49818be356321970533613741e1c3083b1
Todd Kennedy [Fri, 19 Aug 2016 13:27:42 +0000 (13:27 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev am:
42b14329f5
am:
d8f1599a6a
Change-Id: I9258c68915922344d5067ca1131441d19511c51a
Todd Kennedy [Fri, 19 Aug 2016 13:26:43 +0000 (13:26 +0000)]
Release mPackages lock earlier am:
a8d4f48997
am:
d8443b77cc
Change-Id: I26a23f47407dcb4d50fbfd9b70c1c023c36862a6
Christopher Tate [Fri, 19 Aug 2016 13:18:07 +0000 (13:18 +0000)]
Merge "Isolated processes don't get precached system service binders" into nyc-mr1-dev
am:
1b58e1c821
Change-Id: If350a2fe5b82301f33c5bf16ccd55f3e487c38f7
Christopher Tate [Fri, 19 Aug 2016 13:18:03 +0000 (13:18 +0000)]
Isolated processes don't get precached system service binders
am:
2c61c57ac5
Change-Id: I1902e0b4401d78a5870c36ba48086819910d55ff
Svetoslav Ganov [Fri, 19 Aug 2016 13:17:59 +0000 (13:17 +0000)]
Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev
am:
9a6008a334
Change-Id: I6391719f2c978d508c8cd5e29c1d2c9cb173f3d7
Svet Ganov [Fri, 19 Aug 2016 13:17:57 +0000 (13:17 +0000)]
Add resource based mechanism to grant default permissions
am:
59020bffb7
Change-Id: I34d675b7f2ef4fb439bb582c6b36cb00de16acd8
Todd Kennedy [Fri, 19 Aug 2016 13:17:54 +0000 (13:17 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev
am:
42b14329f5
Change-Id: I7b6b45115d3ccdf4646395a59c6c572c22b70103
Todd Kennedy [Fri, 19 Aug 2016 13:17:51 +0000 (13:17 +0000)]
Release mPackages lock earlier
am:
a8d4f48997
Change-Id: I4c6a560fed34887eb67db728b4497b28931ae905
Bill Yi [Fri, 19 Aug 2016 11:31:46 +0000 (04:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I89cc90bed937b12a939bd4c43f0a6ee834ce088a
Auto-generated-cl: translation import
Bill Yi [Fri, 19 Aug 2016 10:45:27 +0000 (03:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1a58040e6aec825355c6d7e6be1444c88fa2bbb9
Auto-generated-cl: translation import
Rubin Xu [Fri, 19 Aug 2016 10:20:34 +0000 (11:20 +0100)]
Add missing clearCallingIdentity
Bug:
30728557
Change-Id: Ie978b63cd60ae419d5e3171918badad3a89fcca0
Bill Yi [Fri, 19 Aug 2016 10:16:29 +0000 (03:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c20231be7a5400894384c92ad7ae08293f02e24
Auto-generated-cl: translation import
Hyundo Moon [Fri, 19 Aug 2016 09:06:58 +0000 (09:06 +0000)]
Merge "MediaRouter: Make sStatic.mResources store application resources."
Jin Seok Park [Fri, 19 Aug 2016 08:39:39 +0000 (08:39 +0000)]
Merge "ExifInterface: Refactor custom input stream class"
Jin Park [Thu, 18 Aug 2016 09:24:36 +0000 (18:24 +0900)]
ExifInterface: Refactor custom input stream class
ExifInterface uses a class named ByteOrderAwarenessDataInputStream
to handle LITTLE_ENDIAN byte-ordered data. This class can only be
initialized with a byte array, which is inefficient for large RAW
files. This CL adds support for initializing with an input stream.
Bug:
30749097
Change-Id: I4e95fb2157115c571ed24ec3746a3c6db752bbdc
Hyundo Moon [Tue, 16 Aug 2016 06:46:37 +0000 (15:46 +0900)]
MediaRouter: Make sStatic.mResources store application resources.
Previously it stored system resources, and that caused
Resources.NotFoundException in following methods:
- RouteInfo.getName()
- RouteCategory.getName()
- UserRouteInfo.setIconResource(int)
- RouteGroup.setIconResource(int)
Also, this CL makes getName()/setName() methods work properly.
Bug:
30797944
Test: run a simple app that calls above methods.
Change-Id: Ia5db57c3d7b71c91dcfeea0584867ee2d846fef9
OSDN Git Service
