OSDN Git Service
Erik Kline [Mon, 13 Feb 2017 12:08:11 +0000 (12:08 +0000)]
Merge "Add test coverage for cleanup bug to be fixed." am:
89e6bf0532 am:
0cca15ff88
am:
3de5971b40
Change-Id: I470c481a0eebc9cadf134c73ece08803927f4ca2
Erik Kline [Mon, 13 Feb 2017 12:02:48 +0000 (12:02 +0000)]
Merge "Add test coverage for cleanup bug to be fixed." am:
89e6bf0532
am:
0cca15ff88
Change-Id: Ib5d1a6d6616b99a9e4f7cf0286ebc0a11d62bff8
Erik Kline [Mon, 13 Feb 2017 11:57:37 +0000 (11:57 +0000)]
Merge "Add test coverage for cleanup bug to be fixed."
am:
89e6bf0532
Change-Id: I33347c8fc2bec5660b8e9c14a316f6d14a6cf8b1
Treehugger Robot [Mon, 13 Feb 2017 11:51:20 +0000 (11:51 +0000)]
Merge "Add test coverage for cleanup bug to be fixed."
Erik Kline [Mon, 13 Feb 2017 08:12:02 +0000 (17:12 +0900)]
Add test coverage for cleanup bug to be fixed.
The test calls that need to pass but do not currently are commented out.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32031803
Bug:
32163131
Change-Id: I68ed476920bef882f353d8e8a54c72120bc27002
Android Build Merger (Role) [Sun, 12 Feb 2017 10:31:41 +0000 (10:31 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763 am:
62314d7dd3 am:
41c9029be0" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Sun, 12 Feb 2017 10:30:58 +0000 (10:30 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763 am:
62314d7dd3
am:
41c9029be0
Change-Id: I491c4ae2b64e2a15a626bc20a8e2083e0bb6a91d
Jeff Sharkey [Sun, 12 Feb 2017 10:30:50 +0000 (10:30 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763 am:
62314d7dd3
am:
8100f549bf
Change-Id: Icb69b7af8a1e7c9c2fb8c2ea47e41932006128d8
Jeff Sharkey [Sun, 12 Feb 2017 10:26:57 +0000 (10:26 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763
am:
62314d7dd3
Change-Id: Iba461adcfafc41128bc4cd33f934830c7a92ae65
Jeff Sharkey [Sun, 12 Feb 2017 10:26:51 +0000 (10:26 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763
am:
62314d7dd3
Change-Id: I1eca65886210f095a29125506422a846ae6567f9
Jeff Sharkey [Sun, 12 Feb 2017 10:22:43 +0000 (10:22 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc
am:
55ef8ba763
Change-Id: Ie2f9e943501b62177b23b701a9eea219a1dc696f
Android Build Merger (Role) [Sun, 12 Feb 2017 10:21:33 +0000 (10:21 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b am:
86f242b071 am:
d491410316" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Sun, 12 Feb 2017 10:20:52 +0000 (10:20 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b am:
86f242b071
am:
d491410316
Change-Id: If549125c9057964da34ab178af08e926962dd1d5
Jeff Sharkey [Sun, 12 Feb 2017 10:20:41 +0000 (10:20 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b am:
86f242b071
am:
5b49be4488
Change-Id: I576f71a635e1d1da44506b4e10ea7d915f5e7ba5
Jeff Sharkey [Sun, 12 Feb 2017 10:18:15 +0000 (10:18 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a
am:
ab296986fc
Change-Id: Idd20eb270f3824840900b60a0b507b3c135ddc9e
Jeff Sharkey [Sun, 12 Feb 2017 10:16:12 +0000 (10:16 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b
am:
86f242b071
Change-Id: Iec17b7e2b1dcc972951e71d3c0d9e12d03440e88
Jeff Sharkey [Sun, 12 Feb 2017 10:16:12 +0000 (10:16 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b
am:
86f242b071
Change-Id: Iaf37416af9d8d3e31b1825719f2f0cc8e860a603
Jeff Sharkey [Sun, 12 Feb 2017 10:14:09 +0000 (10:14 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours
am:
9aca89293a
Change-Id: Ifc71c14cbdfe8e93cb6bca789daa17117b8f214f
Jeff Sharkey [Sun, 12 Feb 2017 10:12:11 +0000 (10:12 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4
am:
c7b754f62b
Change-Id: Icc3179df0206649ca412eb3cb4a8b5a4691718fb
Jeff Sharkey [Sun, 12 Feb 2017 10:10:13 +0000 (10:10 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4
am:
208dcadb4f -s ours
Change-Id: If13e06378379077bbf25e6accc35951c26703a9c
Jeff Sharkey [Sun, 12 Feb 2017 10:08:11 +0000 (10:08 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359
am:
853e178de4
Change-Id: I7adf093b7b09d6cc69e13f17865f754ccf327200
Jeff Sharkey [Sun, 12 Feb 2017 10:06:34 +0000 (10:06 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0
am:
9335807fc4
Change-Id: I66766f7b8feccdf1855b3819ca30cec5b480ef07
Jeff Sharkey [Sun, 12 Feb 2017 10:04:10 +0000 (10:04 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours
am:
deea677359
Change-Id: I579175736bf9c3839492e67d08b8ce765c85c121
Jeff Sharkey [Sun, 12 Feb 2017 10:02:08 +0000 (10:02 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a
am:
00f5232dd0
Change-Id: I535ba4091bcb29fc25fc640f938a483b829e15c2
Jeff Sharkey [Sun, 12 Feb 2017 10:00:37 +0000 (10:00 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1
am:
502ee22a9d -s ours
Change-Id: Ibb1a72ca35121ba586f18852445941b0a0c15724
Jeff Sharkey [Sun, 12 Feb 2017 09:58:13 +0000 (09:58 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours
am:
48f1ddc94a
Change-Id: I1785a0a301e2847946276be682f62ee263b39a3f
Jeff Sharkey [Sun, 12 Feb 2017 09:56:10 +0000 (09:56 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c
am:
75f767afa1
Change-Id: I1393b6bcfa074bef42b7491204df55e39471e689
Jeff Sharkey [Sun, 12 Feb 2017 09:53:38 +0000 (09:53 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9
am:
a0b1198e70 -s ours
Change-Id: Ieefebd7669b892cba9afade572e3f43d56095902
Jeff Sharkey [Sun, 12 Feb 2017 09:51:37 +0000 (09:51 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9
am:
32c71b078c
Change-Id: I1af83dbf9869bd93ecc5c07e1ce6155206f73290
Jeff Sharkey [Sun, 12 Feb 2017 09:48:46 +0000 (09:48 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
6f754e48e9
Change-Id: I2f6dd5ba1e266b3d451533e518ec7f2fe24b262c
Jeff Sharkey [Sun, 12 Feb 2017 09:47:33 +0000 (09:47 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
3f3da42ef9
Change-Id: I222c32931827d906db5fc1e3258f2095e6013481
Paul Stewart [Sat, 11 Feb 2017 02:52:44 +0000 (02:52 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP" am:
e690e0178c am:
549c3fc0da
am:
bdfb1b86d3
Change-Id: I083778d8867e79b1a2c04166811508a6642a9c68
Paul Stewart [Sat, 11 Feb 2017 02:48:31 +0000 (02:48 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP" am:
e690e0178c
am:
549c3fc0da
Change-Id: I35592cd0e25bf459505c0a2008b7fe1f3be6298c
Paul Stewart [Sat, 11 Feb 2017 02:43:38 +0000 (02:43 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP"
am:
e690e0178c
Change-Id: I3f61bdd86c97210acd14b6d2d30e44e26c8b1085
Treehugger Robot [Sat, 11 Feb 2017 02:34:50 +0000 (02:34 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP"
Mark Goldstein [Sat, 11 Feb 2017 01:41:37 +0000 (01:41 +0000)]
Update the exception description for start(). am:
ac06177a13 am:
8b137cc06b
am:
539e1bab4d
Change-Id: I1274412a79c59da1a76f0b54f8633d9a2ec02d34
Mark Goldstein [Sat, 11 Feb 2017 01:38:34 +0000 (01:38 +0000)]
Update the exception description for start(). am:
ac06177a13 am:
8b137cc06b
am:
fd88989486
Change-Id: I9fef1f2ba9ca5db9b46ea67e2507a682b249c595
Mark Goldstein [Sat, 11 Feb 2017 01:34:35 +0000 (01:34 +0000)]
Update the exception description for start(). am:
ac06177a13
am:
8b137cc06b
Change-Id: Id448ab164e1fd0d3f5977c30c5395bcb6e87f90f
Mark Goldstein [Sat, 11 Feb 2017 01:34:30 +0000 (01:34 +0000)]
Update the exception description for start(). am:
ac06177a13
am:
8b137cc06b
Change-Id: I4fcbc9b93ce8e908810d6c8eb4f0dd06c471ed3a
Mark Goldstein [Sat, 11 Feb 2017 01:29:27 +0000 (01:29 +0000)]
Update the exception description for start().
am:
ac06177a13
Change-Id: I124d99971918daa7768d79daa01ecbbb86f60199
Jesse Hall [Fri, 10 Feb 2017 23:53:27 +0000 (15:53 -0800)]
resolve merge conflicts of
b3a1417663d6 to nyc-mr2-dev-plus-aosp
Test: mmma frameworks/base
Change-Id: I2e1e04f55d05fd8aa33da304bdb951713b37793c
Paul Stewart [Wed, 25 Jan 2017 22:12:14 +0000 (14:12 -0800)]
Allow EAP-SIM authentication methods under PEAP
Extend the PEAP outer method to contain EAP-SIM innner methods
so these transactions can be encrypted.
Cherry-pick of
68c63024c2ace87921c1e84a99d18dae6001c74c
Bug:
34835771
Test: Unit tests
Change-Id: I4931ed43e396c93bad0bfce1750291982f8cd146
Paul Lawrence [Fri, 10 Feb 2017 21:28:56 +0000 (21:28 +0000)]
Merge "Expand seccomp whitelist" am:
c6c11723cb am:
3b9c0fadda
am:
507c3fb099
Change-Id: Idcdec4c87b2ad5f91cbe05874ea532139fe38d42
Paul Lawrence [Fri, 10 Feb 2017 21:22:25 +0000 (21:22 +0000)]
Merge "Expand seccomp whitelist" am:
c6c11723cb
am:
3b9c0fadda
Change-Id: I50851e4d3c92d53562e593be0b82c09709262d4a
Mark Goldstein [Fri, 10 Feb 2017 17:54:08 +0000 (09:54 -0800)]
Update the exception description for start().
Bug:
31592353
Change-Id: Ic325a8004a87b71c0b43d02db58d4717b4b3831d
Paul Lawrence [Fri, 10 Feb 2017 21:17:14 +0000 (21:17 +0000)]
Merge "Expand seccomp whitelist"
am:
c6c11723cb
Change-Id: I73a7ede13a35354a08e1bc3301f624295373cd52
Treehugger Robot [Fri, 10 Feb 2017 21:08:05 +0000 (21:08 +0000)]
Merge "Expand seccomp whitelist"
Jesse Hall [Thu, 9 Feb 2017 22:43:14 +0000 (14:43 -0800)]
Zygote: Restore GL preload
Preloading GLES drivers in Zygote was removed previously since it is
incompatible with updatable drivers. That caused some app startup
latency and system memory use regressions. This change re-adds GLES
driver preloading, but only on devices that don't support driver
updates.
Bug:
34611670
Bug:
35052548
Test: boot angler, systrace of Calculator app startup
Change-Id: Ibdc6b3c0ba4473574722641d4bfad4b375f908a3
(cherry picked from commit
ba0370eef3d17baa70d43723e96eb135c8e4ed58)
Yifan Hong [Fri, 10 Feb 2017 18:53:07 +0000 (18:53 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF." am:
01f374c635 am:
71e77c865b
am:
2e943c5379
Change-Id: Ibbf18bc51e146abef1ab211614a98ec59031b1b9
Yifan Hong [Fri, 10 Feb 2017 18:48:14 +0000 (18:48 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF." am:
01f374c635
am:
71e77c865b
Change-Id: I37c99d5135046c6b0d2589f321cd8e4b235392e7
Alan Viverette [Fri, 10 Feb 2017 18:43:47 +0000 (18:43 +0000)]
Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev
am:
41023417e7
Change-Id: I4e42386e1f227e2cb48bf37eb05bcf7f81b6d709
Yifan Hong [Fri, 10 Feb 2017 18:43:37 +0000 (18:43 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF."
am:
01f374c635
Change-Id: I1db3c946211861e6edd7c03d9eaeae7a0cb412c4
Paul Lawrence [Fri, 10 Feb 2017 18:07:48 +0000 (10:07 -0800)]
Expand seccomp whitelist
Bug:
34763393
Test: cts test android.os.cts.SeccompTest now passes
Change-Id: I8907074485395015a03119700543ff33fdd8e214
TreeHugger Robot [Fri, 10 Feb 2017 18:35:32 +0000 (18:35 +0000)]
Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev
Yifan Hong [Fri, 10 Feb 2017 18:33:41 +0000 (18:33 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF."
Android Build Merger (Role) [Fri, 10 Feb 2017 12:33:37 +0000 (12:33 +0000)]
Merge "Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9 am:
f85a20702a am:
0f2c853889" into nyc-mr2-dev-plus-aosp
Rubin Xu [Fri, 10 Feb 2017 12:32:57 +0000 (12:32 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9 am:
f85a20702a
am:
0f2c853889
Change-Id: Icfdd2a6027c75e43c78f85109341ae088102548b
Rubin Xu [Fri, 10 Feb 2017 12:32:48 +0000 (12:32 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9 am:
f85a20702a
am:
060cde9802
Change-Id: Ic591b48e298823b46f8d1fc25b0e01a82cc263b5
Rubin Xu [Fri, 10 Feb 2017 12:28:56 +0000 (12:28 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9
am:
f85a20702a
Change-Id: I3861a5229fdb55f7dc7fd57e1706b34f9847d492
Rubin Xu [Fri, 10 Feb 2017 12:28:47 +0000 (12:28 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9
am:
f85a20702a
Change-Id: If9e569ba66dc9e5876fab5ffd2a6c9b0a9fb923b
Rubin Xu [Fri, 10 Feb 2017 12:24:43 +0000 (12:24 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce
am:
72074e3ab9
Change-Id: I1cd4db65e0fe8c92628f22f94fe937cf64f2da04
Rubin Xu [Fri, 10 Feb 2017 12:20:18 +0000 (12:20 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293
am:
824c8284ce
Change-Id: If4dfa2d7af980c91ec3d3f8faa7e7f4a39350c82
Rubin Xu [Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
am:
42f2e80293
Change-Id: Ic167e10a205b5c8f9df81cd20a6f08359d3807f4
TreeHugger Robot [Fri, 10 Feb 2017 12:10:58 +0000 (12:10 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
Sooraj Sasindran [Fri, 10 Feb 2017 05:57:13 +0000 (05:57 +0000)]
Merge "Expose api to retrieve wakelock information per client" am:
8fbf6a29d0 am:
730c2d9c72 -s ours
am:
bae8d7a8c4 -s ours
Change-Id: I352f7dc305e64fa5e82bd3cccd9015732ab54504
Sooraj Sasindran [Fri, 10 Feb 2017 05:50:12 +0000 (05:50 +0000)]
Merge "Expose api to retrieve wakelock information per client" am:
8fbf6a29d0
am:
730c2d9c72 -s ours
Change-Id: I17a8dfcf0be71bcb667e70bab2834f0b7fd42b3c
Sooraj Sasindran [Fri, 10 Feb 2017 05:45:05 +0000 (05:45 +0000)]
Merge "Expose api to retrieve wakelock information per client"
am:
8fbf6a29d0
Change-Id: I1ca7d53b256333170b849cb1103c8b3ca0e76e0b
Sooraj Sasindran [Fri, 10 Feb 2017 05:38:40 +0000 (05:38 +0000)]
Merge "Expose api to retrieve wakelock information per client"
Sooraj Sasindran [Fri, 10 Feb 2017 03:03:38 +0000 (03:03 +0000)]
Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp
am:
cbbf530125
Change-Id: Id5ea5536246343a530f7579a31039421b3859de3
Sooraj Sasindran [Fri, 10 Feb 2017 02:58:40 +0000 (02:58 +0000)]
Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp
Andreas Gampe [Fri, 10 Feb 2017 01:03:15 +0000 (01:03 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am:
851afe56b8 am:
0e01cae667
am:
74acde1bc5
Change-Id: I40d67fcde4d9263d5c75d5c3f782a860dcff93f8
Andreas Gampe [Fri, 10 Feb 2017 00:58:42 +0000 (00:58 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am:
851afe56b8
am:
0e01cae667
Change-Id: Ifaa7595efaef554a47e05e030ccaf16a53a3bfce
Andreas Gampe [Fri, 10 Feb 2017 00:54:55 +0000 (00:54 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
am:
851afe56b8
Change-Id: Ib21530d511158635793f6180d53f193d1f1b0d95
Treehugger Robot [Fri, 10 Feb 2017 00:45:55 +0000 (00:45 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
Sooraj Sasindran [Mon, 18 Jul 2016 18:50:50 +0000 (11:50 -0700)]
Expose api to retrieve wakelock information per client
Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis
BUG=
31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Selim Cinek [Fri, 10 Feb 2017 00:12:48 +0000 (00:12 +0000)]
Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
am:
fbf2e0fb2c
Change-Id: Ib1c45af5ffea1d09e14ac5daac61a1046d2594a2
Selim Cinek [Fri, 10 Feb 2017 00:06:39 +0000 (00:06 +0000)]
Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
Selim Cinek [Wed, 8 Feb 2017 20:51:59 +0000 (12:51 -0800)]
Fixed an issue where the emergency affordance didn't show
The state wheather the sim affordance was needed before was
loaded but not saved locally if it didn't change, so any
further requests would have the default values if it stayed
true.
Test: add india sim, go into airplane mode, reboot, see emergency
button
Fixes:
34370542
Change-Id: I9da1f5ca8025df6c2618ab467e937cf5cf9aa132
Sooraj Sasindran [Mon, 18 Jul 2016 18:50:50 +0000 (11:50 -0700)]
Expose api to retrieve wakelock information per client
Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis
BUG=
31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Andreas Gampe [Wed, 8 Feb 2017 03:44:37 +0000 (19:44 -0800)]
Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit
Move methods where they belong.
Test: m
Test: Device boots
Merged-In: I805c6493078e960ff5b70d84dd93d2da6c7aa797
Change-Id: I805c6493078e960ff5b70d84dd93d2da6c7aa797
Android Build Merger (Role) [Thu, 9 Feb 2017 19:58:17 +0000 (19:58 +0000)]
Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
0265687aef" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Thu, 9 Feb 2017 19:58:11 +0000 (19:58 +0000)]
Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
89085b1593" into nyc-mr2-dev-plus-aosp
Greg Plesur [Thu, 9 Feb 2017 19:57:34 +0000 (19:57 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94
am:
0265687aef
Change-Id: I4cd33b9e688d90d8555b91c6547dbffe3099e0ae
Greg Plesur [Thu, 9 Feb 2017 19:57:28 +0000 (19:57 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94
am:
89085b1593
Change-Id: I50b457b5c6b5614d8b7c450b3ee6f7e375478194
Greg Plesur [Thu, 9 Feb 2017 19:56:28 +0000 (19:56 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am:
735b4dc0af
am:
968477129c
Change-Id: I623dd515c8eae81b4146d67c83007fc5213561a2
Greg Plesur [Thu, 9 Feb 2017 19:53:06 +0000 (19:53 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am:
735b4dc0af
am:
d78a0d21cb
Change-Id: I2e45ee1174cb287d8ce142ac4176148ceca5b248
Android Build Merger (Role) [Thu, 9 Feb 2017 19:50:56 +0000 (19:50 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours am:
966e600365 -s ours" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Thu, 9 Feb 2017 19:50:10 +0000 (19:50 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours
am:
966e600365 -s ours
Change-Id: Ia3e044a2c4e2c71505d9666fbe0f3a0552f5e14f
Greg Plesur [Thu, 9 Feb 2017 19:50:03 +0000 (19:50 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
am:
5659b15a94
Change-Id: I9bb30911e82207da68c3c5f088ef9efd1edf75ca
Greg Plesur [Thu, 9 Feb 2017 19:50:01 +0000 (19:50 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
am:
5659b15a94
Change-Id: I4bb6bc892ea172b7bda1ccc5dd840de128908223
Jeff Sharkey [Thu, 9 Feb 2017 19:50:01 +0000 (19:50 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours
am:
6d4af9c7f8 -s ours
Change-Id: I5e6c70874400b8239dfc4be958a002d964f3d204
Greg Plesur [Thu, 9 Feb 2017 19:49:58 +0000 (19:49 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
am:
735b4dc0af
Change-Id: Iafcc772f7f9c8111d26ebc48af67e104848e0885
Greg Plesur [Thu, 9 Feb 2017 19:49:58 +0000 (19:49 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
am:
735b4dc0af
Change-Id: I5c8ca6d0a63af83cde91c17d10a634469c726442
Jeff Sharkey [Thu, 9 Feb 2017 19:45:35 +0000 (19:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours
am:
31c7fa003d -s ours
Change-Id: I69602a5fbca3fd966c2bc8ab900b004308ce5f41
Jeff Sharkey [Thu, 9 Feb 2017 19:45:34 +0000 (19:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours
am:
31c7fa003d -s ours
Change-Id: Ia19b5ec4e496b8c87461081a23aef6335fe45725
Greg Plesur [Thu, 9 Feb 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
Jeff Sharkey [Thu, 9 Feb 2017 19:41:31 +0000 (19:41 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours
am:
b30169299b -s ours
Change-Id: Iac47439b256367683e44d09042996ad060c3c43d
Paul Duffin [Thu, 9 Feb 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am:
621ebe692f am:
a2c92b0b88
am:
c1a93884dc
Change-Id: Icce543cd86f83bff8c2e80bf7ef492d22c9cf2dc
Jeff Sharkey [Thu, 9 Feb 2017 19:37:23 +0000 (19:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
78f2e38a12 -s ours
Change-Id: I51385a2b84bfc4e0fa387ceb644be523ca55ced3
Paul Duffin [Thu, 9 Feb 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am:
621ebe692f
am:
a2c92b0b88
Change-Id: I605588603280ff0b4ebc1088c6c1f1c933c1e657
OSDN Git Service
