OSDN Git Service
TreeHugger Robot [Thu, 16 Feb 2017 03:02:14 +0000 (03:02 +0000)]
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
Hall Liu [Thu, 16 Feb 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
Chris Tate [Thu, 16 Feb 2017 00:50:56 +0000 (00:50 +0000)]
Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev
Manu Cornet [Thu, 16 Feb 2017 00:37:16 +0000 (16:37 -0800)]
DO NOT MERGE - Ensuring that there are per-user last stack active times.
- This fixes an issue where the last stack active time would be clobbered
when switching between users. With the policy in the phone/stack
recents, this is fine, but with the grid recents, it no longer only
applies when out of the historical window, so it is always wrong (it
would normally be wrong if switching back from another user after the
historical time of six hours).
This CL will migrate the last stack active time to a per-user secure
setting, which will be used going forward.
[This is a manual merge of change
1913535]
Bug:
35375206
Test: On the Ryu, launch some tasks, switch users, launch more tasks, and
return to the original user
Change-Id: Idc72920240093d15f822f5d9e3ee11b12a56edae
Hall Liu [Wed, 15 Feb 2017 02:11:11 +0000 (18:11 -0800)]
Add extra key for app-specified outgoing call timeout
Bug:
34474757
Test: manual
Merged-In: I6e7e67c946205b28440a4daeeab3a002f8d6bccc
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
gitbuildkicker [Wed, 15 Feb 2017 08:09:34 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Michael Kwan [Tue, 14 Feb 2017 22:53:41 +0000 (22:53 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev
am:
c61cd1a635
Change-Id: Ib1cff2ace082862c2a1c250170453b989f6697df
TreeHugger Robot [Tue, 14 Feb 2017 22:46:57 +0000 (22:46 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev
Michael Kwan [Tue, 14 Feb 2017 20:04:38 +0000 (12:04 -0800)]
Fix incorrect values for VelocityTracker in SwipeDismissLayout.
The offset used to adjust MotionEvents for swipe velocity tracking
was incorrect, and caused issues when touch points where close
together. Fixed the offset used, which resolved swiping issues.
Bug:
34673753
Change-Id: Ide6060b511510bcf299e3db778e6ffc6afda5e19
Philip P. Moltmann [Tue, 14 Feb 2017 16:03:27 +0000 (16:03 +0000)]
Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"" into nyc-mr2-dev
TreeHugger Robot [Tue, 14 Feb 2017 15:24:42 +0000 (15:24 +0000)]
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev
gitbuildkicker [Tue, 14 Feb 2017 08:09:33 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
TreeHugger Robot [Tue, 14 Feb 2017 03:34:48 +0000 (03:34 +0000)]
Merge changes from topic 'pixel-c' into nyc-mr2-dev
* changes:
Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]
Fix handling usb dialog for wall chargers. [DO NOT MERGE]
Badhri Jagan Sridharan [Fri, 10 Feb 2017 03:45:21 +0000 (19:45 -0800)]
Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]
Type-c ports can quickly toggle between connected/disconnected
states. Introduce debounce to prevent sending spurious notifications.
Bug:
34972898
Test: notification should not be queued for a pixel-c charger not connected
to the power outlet.
Change-Id: I4aa19f9f864fe5b77e65f6a07a3184d8aba1f5fc
Badhri Jagan Sridharan [Mon, 13 Feb 2017 21:14:40 +0000 (13:14 -0800)]
Fix handling usb dialog for wall chargers. [DO NOT MERGE]
UsbPort.POWER_ROLE_SINK is orthogonal to the type of the charger
attached. POWER_ROLE_SINK would be the case for AC charging and
USB charging. Therefore query BatteryManager for the charger
type.
Bug:
34972898
Test: Charging notification should not show for pixel-c chargers.
Change-Id: I8dddcd7727b6af973bd173d2c6e325aa4be2ca3a
Amith Yamasani [Tue, 14 Feb 2017 01:02:53 +0000 (01:02 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5
am:
c510e19d18
Change-Id: I367d15ea4ab849ee16e58d08793dc7971304740f
Amith Yamasani [Tue, 14 Feb 2017 00:57:56 +0000 (00:57 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
am:
7556690cf5
Change-Id: Ib0446301e56751f6a72403155c576516cd7e559c
Michael Kwan [Tue, 14 Feb 2017 00:55:29 +0000 (00:55 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
am:
9fbd981f23
Change-Id: I14316841b80bdb25755e174528ef4bb271d3e005
TreeHugger Robot [Tue, 14 Feb 2017 00:49:41 +0000 (00:49 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
Michael Kwan [Tue, 14 Feb 2017 00:48:10 +0000 (00:48 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
Hakan Seyalioglu [Tue, 14 Feb 2017 00:41:51 +0000 (00:41 +0000)]
DO NOT MERGE - Check exported status in chooser
am:
7bae18232e
Change-Id: Ieda18baab005a6a85b5107dfab37d20dec990110
Philip P. Moltmann [Mon, 13 Feb 2017 20:59:21 +0000 (20:59 +0000)]
[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"
This reverts commit
2fc44947dd4f45a23c56985d4c12f01332027a9f.
Bug:
30662828
Change-Id: Ia22343c19e155555dff3b0cb58f7b58df0ce6301
Hakan Seyalioglu [Mon, 30 Jan 2017 19:14:48 +0000 (11:14 -0800)]
DO NOT MERGE - Check exported status in chooser
Relevant change in master is ag/
1844170
bug:
34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
(cherry picked from commit
e3286c3145d54564e783333ac2a2bb89b9ffdc49)
Amith Yamasani [Mon, 13 Feb 2017 21:59:14 +0000 (21:59 +0000)]
DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."
Reason: Breaking setting the user avatar in Settings.
Bug:
35158271
This reverts commit
b61338ecb307a2f595a8f78e290b5287a6503aaa.
Change-Id: Ia08c12be3da06b0d02e71635b46350c8ff50ec19
Michael Kwan [Sat, 11 Feb 2017 02:38:34 +0000 (18:38 -0800)]
Only modify window layout params when necessary.
Cancelling swipe-to-dismiss will trigger a check to ensure the window
is reset to its original state. Ensure that the reset is actually
required before setting the new layout attributes.
Bug:
34816397
Change-Id: Idf26ce7c8b63dc44a76effefcb32eb8d8665f605
TreeHugger Robot [Mon, 13 Feb 2017 20:49:50 +0000 (20:49 +0000)]
Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev
TreeHugger Robot [Mon, 13 Feb 2017 20:04:08 +0000 (20:04 +0000)]
Merge "Workaround wallpaper restore race" into nyc-mr2-dev
Michael Kwan [Mon, 13 Feb 2017 19:32:29 +0000 (19:32 +0000)]
Add tweaks to smooth out swipe to dismiss.
am:
5758a9a94c
Change-Id: Id10a31504aa5a579e8670e7a23d2d99a990ed6e5
Bryan Mawhinney [Tue, 7 Feb 2017 15:18:07 +0000 (15:18 +0000)]
Workaround wallpaper restore race
If WallpaperManager is asked to read a wallpaper between when we
call mWm.clear and mWm.setStream, it is possible for us to end
up losing restored state such as cropHint and allowBackup
By not calling mWm.clear, we make this much less likely to happen.
It isn't necessary to call clear, as will explicitly overwrite
all the interesting state anyway.
Test: by repeated adb restore
Bug:
34760753
Change-Id: I2750695d5dd16077b47b5b8fca3a667b98cc4f6c
(cherry picked from commit
5c14853296172fe9885eee26d86351bd935e8430)
Bryan Mawhinney [Tue, 7 Feb 2017 15:27:19 +0000 (15:27 +0000)]
Fix live wallpaper not showing on lock screen after restore
A recent change in nyc-mr2 means that setWallpaperComponent will
promote any static system wallpaper to the lock screen. If we don't
actually have a static lock wallpaper to restore, we need to explicitly
clear the lock wallpaper to have the live one show through
Test: manually using adb backup / restore
Bug:
35090402
Change-Id: I8a2c5ffbaefe172c9d78a9f746ab87d9bc6b7448
(cherry picked from commit
96eb5b724bab31125e15eef2c926f6648567c3a1)
Bill Yi [Mon, 13 Feb 2017 14:10:54 +0000 (06:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3355bb35c1500306ddaf5102f82beb010b67c208
Auto-generated-cl: translation import
Michael Kwan [Sun, 12 Feb 2017 21:43:45 +0000 (13:43 -0800)]
Add tweaks to smooth out swipe to dismiss.
Bug:
34673753
Change-Id: I5a9d420c70d124fc764803d505291e66818b1aa2
(cherry picked from commit
2e11adaac3ec959044e8154c67b6ab9cde82fdab)
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
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: 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
gitbuildkicker [Sun, 12 Feb 2017 08:10:02 +0000 (00:10 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
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:29:27 +0000 (01:29 +0000)]
Update the exception description for start().
am:
ac06177a13
Change-Id: I124d99971918daa7768d79daa01ecbbb86f60199
Manu Cornet [Fri, 10 Feb 2017 20:54:40 +0000 (12:54 -0800)]
2D Recents: Fix a glitch during task relayout after a dismiss
This delays the resizing of the focus frame until all task views
relayout animations have ended.
Bug:
35258018
Test: Took before/after screencasts on local sw600dp device
Change-Id: Ifbf8932f4141bf90a3dfef20b2938d6801383706
Mark Goldstein [Fri, 10 Feb 2017 17:54:08 +0000 (09:54 -0800)]
Update the exception description for start().
Bug:
31592353
Change-Id: Ic325a8004a87b71c0b43d02db58d4717b4b3831d
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)
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
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
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
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
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
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
(cherry picked from commit
3eddf406755d6ab18acb46f9550c997ca4bb1970)
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
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
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: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
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
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
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
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Thu, 9 Feb 2017 17:41:44 +0000 (17:41 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd
am:
99755cb458
Change-Id: I0380911f9607eed5f10a6c497f273ccbc67b3721
Jeff Sharkey [Thu, 9 Feb 2017 17:37:47 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e
am:
47656a3cbd
Change-Id: I5835528fe288b1ee117265d37e39fcfd0bbb301b
Jeff Sharkey [Thu, 9 Feb 2017 17:37:44 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675
am:
14b308de91
Change-Id: I428dcaa5e44364d30a51392c224ad68a6e455e2b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:51 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours
am:
be0dab477e
Change-Id: I28971e3707b67f7f3e4a566fd4f8e891d7e8823b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:43 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
3eddf40675
Change-Id: Ied7f446ac2e539654b9f7d5e1ab7cce8aec7390e
Jeff Sharkey [Thu, 9 Feb 2017 17:28:44 +0000 (17:28 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
a78841ebd4 -s ours
Change-Id: Iac6ae6f87a60318e4557b238c196c3b0627e95ab
Greg Plesur [Thu, 9 Feb 2017 16:06:24 +0000 (11:06 -0500)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
BUG:
34824902
Change-Id: I95fbe0a352c48a3fff5af57b91325901a16d3d89
TreeHugger Robot [Thu, 9 Feb 2017 11:28:22 +0000 (11:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 9 Feb 2017 09:57:11 +0000 (01:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I751a4937bc2753f50aaf1177868c9199e8d201ec
Auto-generated-cl: translation import
gitbuildkicker [Thu, 9 Feb 2017 08:09:41 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Greg Plesur [Wed, 8 Feb 2017 23:44:17 +0000 (23:44 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
am:
8a2ea2cf83
Change-Id: I9c2c3d822023277aada4685a11f4b272585550ea
Greg Plesur [Wed, 8 Feb 2017 23:44:13 +0000 (23:44 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
am:
c7b18342ea
Change-Id: I692fee4165de9a274d8eb8f0deaf49762974bb22
TreeHugger Robot [Wed, 8 Feb 2017 23:36:06 +0000 (23:36 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
TreeHugger Robot [Wed, 8 Feb 2017 23:31:13 +0000 (23:31 +0000)]
Merge "Add additional logging for temperature readings." into nyc-mr2-dev
Greg Plesur [Wed, 8 Feb 2017 19:57:34 +0000 (14:57 -0500)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
BUG:
34824902
Change-Id: I49d4d7043829862e1abacb3f400a6690f454d6c0
Erik Wolsheimer [Wed, 8 Feb 2017 19:46:49 +0000 (19:46 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
am:
84aa5a864f
Change-Id: Ibcbaba3bb406e07f97561bc87916f6891fc25b74
Rubin Xu [Mon, 6 Feb 2017 17:18:50 +0000 (17:18 +0000)]
Fix uri permission grant on remote bug report uri
System server is no longer allowed to grant uri permission directly. As a result
we use grantUriPermissionFromIntent() to grant permission from the shell UID,
who is the owner of the bug report content.
Also fix a security bug where the broadcast to notify user consent of remote
bug report mismatches the <protected-broadcast> definition, causing it to be
sendable by anyone.
Bug:
34159108
Test: manual - Install TestDPC and request bugreport, try accept and decline
once the report is ready (Bullhead).
Merged-In: I66e3f2a16d4547549f09d3c96d52aed2330caedf
Change-Id: I66e3f2a16d4547549f09d3c96d52aed2330caedf
Manu Cornet [Tue, 7 Feb 2017 01:47:42 +0000 (17:47 -0800)]
2D Recents: Slightly darken header to differentiate from thumbnail
Bug:
34771148
Test: Locally on sw600dp device, sent screenshot to UX to confirm
Change-Id: I74282c6ed81d3b48d554f9acf55d4fafca2c73f4
gitbuildkicker [Wed, 8 Feb 2017 08:09:27 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Erik Wolsheimer [Wed, 8 Feb 2017 04:54:20 +0000 (20:54 -0800)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
BUG:
34312358
Change-Id: I9b303d443b082bba8b440e6e1ef68b050a970386
Shreyas Basarge [Wed, 8 Feb 2017 00:49:55 +0000 (00:49 +0000)]
Merge "Fix requiresCharging false value ignored issue" into nyc-mr2-dev
TreeHugger Robot [Wed, 8 Feb 2017 00:00:22 +0000 (00:00 +0000)]
Merge "2D Recents: Fix the thumbnail radius." into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 17:21:06 +0000 (17:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
gitbuildkicker [Tue, 7 Feb 2017 08:09:32 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
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
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
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
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
TreeHugger Robot [Tue, 7 Feb 2017 04:30:04 +0000 (04:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 04:21:41 +0000 (04:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
OSDN Git Service
