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
2017-02-10 12:32:57 +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
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
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
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
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
2017-02-10 05:57:13 +00:00
Sooraj Sasindran
bae8d7a8c4
Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29d0
...
am: 730c2d9c72
2017-02-10 05:50:12 +00:00
Sooraj Sasindran
730c2d9c72
Merge "Expose api to retrieve wakelock information per client"
...
am: 8fbf6a29d0
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
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
2017-02-10 01:03:15 +00:00
Andreas Gampe
74acde1bc5
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am: 851afe56b8
...
am: 0e01cae667
2017-02-10 00:58:42 +00:00
Andreas Gampe
0e01cae667
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
...
am: 851afe56b8
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
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
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
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
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
2017-02-09 19:53:06 +00:00
Android Build Merger (Role)
3b7ee3598f
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
2017-02-09 19:50:58 +00:00
Jeff Sharkey
91aac0db54
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
2017-02-09 19:50:10 +00:00
Greg Plesur
0265687aef
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
...
am: 5659b15a94
2017-02-09 19:50:03 +00:00
Greg Plesur
89085b1593
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
...
am: 5659b15a94
2017-02-09 19:50:01 +00:00
Jeff Sharkey
bbdec11843
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
2017-02-09 19:50:01 +00:00
Greg Plesur
968477129c
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
...
am: 735b4dc0af
2017-02-09 19:49:58 +00:00
Greg Plesur
d78a0d21cb
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
...
am: 735b4dc0af
2017-02-09 19:49:58 +00:00
Jeff Sharkey
6d4af9c7f8
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours
...
am: 31c7fa003d
2017-02-09 19:45:35 +00:00
Jeff Sharkey
966e600365
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours
...
am: 31c7fa003d
2017-02-09 19:45:34 +00:00
Greg Plesur
5659b15a94
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
2017-02-09 19:45:17 +00:00
Jeff Sharkey
31c7fa003d
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours
...
am: b30169299b
2017-02-09 19:41:31 +00:00
Paul Duffin
8faed45024
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am: 621ebe692f am: a2c92b0b88
...
am: c1a93884dc
2017-02-09 19:37:26 +00:00
Jeff Sharkey
b30169299b
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
...
am: 78f2e38a12
2017-02-09 19:37:23 +00:00
Paul Duffin
c1a93884dc
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am: 621ebe692f
...
am: a2c92b0b88
2017-02-09 19:32:58 +00:00
Paul Duffin
a2c92b0b88
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
...
am: 621ebe692f
2017-02-09 19:28:25 +00:00
Paul Duffin
621ebe692f
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
2017-02-09 19:18:35 +00:00
Jeff Sharkey
78f2e38a12
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
...
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
Merged-In: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9
2017-02-09 18:03:18 +00:00
Jeff Sharkey
70fd2f7197
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458
...
am: 2b9ee48dae
2017-02-09 17:50:15 +00:00
Android Build Merger (Role)
37115274c0
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458 am: 0a2374524a" into nyc-mr2-dev-plus-aosp
2017-02-09 17:47:16 +00:00
Jeff Sharkey
b697587f20
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd am: 99755cb458
...
am: 0a2374524a
2017-02-09 17:46:20 +00:00
Jeff Sharkey
983dc41c8d
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675 am: 14b308de91
...
am: 19fd8e3f06
2017-02-09 17:45:13 +00:00
Jeff Sharkey
2b9ee48dae
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours am: be0dab477e am: 47656a3cbd
...
am: 99755cb458
2017-02-09 17:44:19 +00:00
