Commit Graph

283297 Commits

Author SHA1 Message Date
Mark Goldstein
31ecb52860 Update the exception description for start(). am: ac06177a13 am: 8b137cc06b
am: 539e1bab4d

Change-Id: I1274412a79c59da1a76f0b54f8633d9a2ec02d34
2017-02-11 01:41:37 +00:00
Mark Goldstein
673a2df291 Update the exception description for start(). am: ac06177a13 am: 8b137cc06b
am: fd88989486

Change-Id: I9fef1f2ba9ca5db9b46ea67e2507a682b249c595
2017-02-11 01:38:34 +00:00
Mark Goldstein
fd88989486 Update the exception description for start(). am: ac06177a13
am: 8b137cc06b

Change-Id: Id448ab164e1fd0d3f5977c30c5395bcb6e87f90f
2017-02-11 01:34:35 +00:00
Mark Goldstein
539e1bab4d Update the exception description for start(). am: ac06177a13
am: 8b137cc06b

Change-Id: I4fcbc9b93ce8e908810d6c8eb4f0dd06c471ed3a
2017-02-11 01:34:30 +00:00
Mark Goldstein
8b137cc06b Update the exception description for start().
am: ac06177a13

Change-Id: I124d99971918daa7768d79daa01ecbbb86f60199
2017-02-11 01:29:27 +00:00
Jesse Hall
516274249f resolve merge conflicts of b3a1417663 to nyc-mr2-dev-plus-aosp
Test: mmma frameworks/base
Change-Id: I2e1e04f55d05fd8aa33da304bdb951713b37793c
2017-02-10 17:15:15 -08:00
Paul Lawrence
6c1238699b Merge "Expand seccomp whitelist" am: c6c11723cb am: 3b9c0fadda
am: 507c3fb099

Change-Id: Idcdec4c87b2ad5f91cbe05874ea532139fe38d42
2017-02-10 21:28:56 +00:00
Paul Lawrence
507c3fb099 Merge "Expand seccomp whitelist" am: c6c11723cb
am: 3b9c0fadda

Change-Id: I50851e4d3c92d53562e593be0b82c09709262d4a
2017-02-10 21:22:25 +00:00
Mark Goldstein
ac06177a13 Update the exception description for start().
Bug: 31592353
Change-Id: Ic325a8004a87b71c0b43d02db58d4717b4b3831d
2017-02-10 13:22:24 -08:00
Paul Lawrence
3b9c0fadda Merge "Expand seccomp whitelist"
am: c6c11723cb

Change-Id: I73a7ede13a35354a08e1bc3301f624295373cd52
2017-02-10 21:17:14 +00:00
Treehugger Robot
c6c11723cb Merge "Expand seccomp whitelist" 2017-02-10 21:08:07 +00:00
Jesse Hall
b3a1417663 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 ba0370eef3)
2017-02-10 12:59:10 -08:00
Yifan Hong
229e2d09ce Merge "android.os.HwBinder.getService() in Java respects VINTF." am: 01f374c635 am: 71e77c865b
am: 2e943c5379

Change-Id: Ibbf18bc51e146abef1ab211614a98ec59031b1b9
2017-02-10 18:53:07 +00:00
Yifan Hong
2e943c5379 Merge "android.os.HwBinder.getService() in Java respects VINTF." am: 01f374c635
am: 71e77c865b

Change-Id: I37c99d5135046c6b0d2589f321cd8e4b235392e7
2017-02-10 18:48:14 +00:00
Alan Viverette
07a6ff6989 Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev
am: 41023417e7

Change-Id: I4e42386e1f227e2cb48bf37eb05bcf7f81b6d709
2017-02-10 18:43:47 +00:00
Yifan Hong
71e77c865b Merge "android.os.HwBinder.getService() in Java respects VINTF."
am: 01f374c635

Change-Id: I1db3c946211861e6edd7c03d9eaeae7a0cb412c4
2017-02-10 18:43:37 +00:00
Paul Lawrence
39139358e5 Expand seccomp whitelist
Bug: 34763393
Test: cts test android.os.cts.SeccompTest now passes
Change-Id: I8907074485395015a03119700543ff33fdd8e214
2017-02-10 10:42:07 -08:00
TreeHugger Robot
41023417e7 Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev 2017-02-10 18:35:37 +00:00
Yifan Hong
01f374c635 Merge "android.os.HwBinder.getService() in Java respects VINTF." 2017-02-10 18:33:42 +00:00
Android Build Merger (Role)
90629b8789 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 2017-02-10 12:33:40 +00:00
Rubin Xu
5d1aa36475 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
2017-02-10 12:32:57 +00:00
Rubin Xu
6ee5a0c8a5 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
2017-02-10 12:32:48 +00:00
Rubin Xu
060cde9802 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9
am: f85a20702a

Change-Id: I3861a5229fdb55f7dc7fd57e1706b34f9847d492
2017-02-10 12:28:56 +00:00
Rubin Xu
0f2c853889 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9
am: f85a20702a

Change-Id: If9e569ba66dc9e5876fab5ffd2a6c9b0a9fb923b
2017-02-10 12:28:47 +00:00
Rubin Xu
f85a20702a Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce
am: 72074e3ab9

Change-Id: I1cd4db65e0fe8c92628f22f94fe937cf64f2da04
2017-02-10 12:24:43 +00:00
Rubin Xu
72074e3ab9 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293
am: 824c8284ce

Change-Id: If4dfa2d7af980c91ec3d3f8faa7e7f4a39350c82
2017-02-10 12:20:18 +00:00
Rubin Xu
824c8284ce Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
am: 42f2e80293

Change-Id: Ic167e10a205b5c8f9df81cd20a6f08359d3807f4
2017-02-10 12:16:19 +00:00
TreeHugger Robot
42f2e80293 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev 2017-02-10 12:11:00 +00:00
Sooraj Sasindran
186c0839d8 Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29d0 am: 730c2d9c72 -s ours
am: bae8d7a8c4  -s ours

Change-Id: I352f7dc305e64fa5e82bd3cccd9015732ab54504
2017-02-10 05:57:13 +00:00
Sooraj Sasindran
bae8d7a8c4 Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29d0
am: 730c2d9c72  -s ours

Change-Id: I17a8dfcf0be71bcb667e70bab2834f0b7fd42b3c
2017-02-10 05:50:12 +00:00
Sooraj Sasindran
730c2d9c72 Merge "Expose api to retrieve wakelock information per client"
am: 8fbf6a29d0

Change-Id: I1ca7d53b256333170b849cb1103c8b3ca0e76e0b
2017-02-10 05:45:05 +00:00
Sooraj Sasindran
8fbf6a29d0 Merge "Expose api to retrieve wakelock information per client" 2017-02-10 05:38:41 +00:00
Sooraj Sasindran
4c8fc962dc Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp
am: cbbf530125

Change-Id: Id5ea5536246343a530f7579a31039421b3859de3
2017-02-10 03:03:38 +00:00
Sooraj Sasindran
cbbf530125 Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp 2017-02-10 02:58:44 +00:00
Andreas Gampe
c28592da33 Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am: 851afe56b8 am: 0e01cae667
am: 74acde1bc5

Change-Id: I40d67fcde4d9263d5c75d5c3f782a860dcff93f8
2017-02-10 01:03:15 +00:00
Andreas Gampe
74acde1bc5 Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am: 851afe56b8
am: 0e01cae667

Change-Id: Ifaa7595efaef554a47e05e030ccaf16a53a3bfce
2017-02-10 00:58:42 +00:00
Andreas Gampe
0e01cae667 Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
am: 851afe56b8

Change-Id: Ib21530d511158635793f6180d53f193d1f1b0d95
2017-02-10 00:54:55 +00:00
Treehugger Robot
851afe56b8 Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" 2017-02-10 00:45:56 +00:00
Sooraj Sasindran
0fc0a7edf7 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
2017-02-09 16:44:02 -08:00
Selim Cinek
0fe3d064a3 Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
am: fbf2e0fb2c

Change-Id: Ib1c45af5ffea1d09e14ac5daac61a1046d2594a2
2017-02-10 00:12:48 +00:00
Selim Cinek
fbf2e0fb2c Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev 2017-02-10 00:06:43 +00:00
Selim Cinek
e0358de1e4 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
2017-02-09 13:59:15 -08:00
Sooraj Sasindran
335c89c22e 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
2017-02-09 21:51:04 +00:00
Andreas Gampe
4e66db8d0c Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit
Move methods where they belong.

Test: m
Test: Device boots
Merged-In: I805c6493078e960ff5b70d84dd93d2da6c7aa797
Change-Id: I805c6493078e960ff5b70d84dd93d2da6c7aa797
2017-02-09 13:16:17 -08:00
Android Build Merger (Role)
1f26fadba7 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 2017-02-09 19:58:23 +00:00
Android Build Merger (Role)
a55677651f 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 2017-02-09 19:58:14 +00:00
Greg Plesur
d5c031c75b Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94
am: 0265687aef

Change-Id: I4cd33b9e688d90d8555b91c6547dbffe3099e0ae
2017-02-09 19:57:34 +00:00
Greg Plesur
7d297e7761 Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94
am: 89085b1593

Change-Id: I50b457b5c6b5614d8b7c450b3ee6f7e375478194
2017-02-09 19:57:28 +00:00
Greg Plesur
e25194b067 Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am: 735b4dc0af
am: 968477129c

Change-Id: I623dd515c8eae81b4146d67c83007fc5213561a2
2017-02-09 19:56:28 +00:00
Greg Plesur
82a3793269 Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am: 735b4dc0af
am: d78a0d21cb

Change-Id: I2e45ee1174cb287d8ce142ac4176148ceca5b248
2017-02-09 19:53:06 +00:00