summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-16Merge "DO NOT MERGE - Ensuring that there are per-user last stack active ↵nougat-mr2-devTreeHugger Robot
times." into nyc-mr2-dev
2017-02-16Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-devHall Liu
2017-02-16Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-devChris Tate
2017-02-15DO NOT MERGE - Ensuring that there are per-user last stack active times.Manu Cornet
- 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
2017-02-15Add extra key for app-specified outgoing call timeoutHall Liu
Bug: 34474757 Test: manual Merged-In: I6e7e67c946205b28440a4daeeab3a002f8d6bccc Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
2017-02-14Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into ↵Michael Kwan
cw-f-dev am: c61cd1a635 Change-Id: Ib1cff2ace082862c2a1c250170453b989f6697df
2017-02-14Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into ↵TreeHugger Robot
cw-f-dev
2017-02-14Fix incorrect values for VelocityTracker in SwipeDismissLayout.Michael Kwan
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
2017-02-14Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() ↵Philip P. Moltmann
by 50 ms"" into nyc-mr2-dev
2017-02-14Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into ↵TreeHugger Robot
nyc-mr2-dev
2017-02-14Merge changes from topic 'pixel-c' into nyc-mr2-devTreeHugger Robot
* changes: Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE] Fix handling usb dialog for wall chargers. [DO NOT MERGE]
2017-02-13Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]Badhri Jagan Sridharan
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
2017-02-13Fix handling usb dialog for wall chargers. [DO NOT MERGE]Badhri Jagan Sridharan
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
2017-02-14Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from ↵Amith Yamasani
system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 Change-Id: I367d15ea4ab849ee16e58d08793dc7971304740f
2017-02-14Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from ↵Amith Yamasani
system."" into nyc-mr1-dev am: 7556690cf5 Change-Id: Ib0446301e56751f6a72403155c576516cd7e559c
2017-02-14Merge "Only modify window layout params when necessary." into cw-f-devMichael Kwan
am: 9fbd981f23 Change-Id: I14316841b80bdb25755e174528ef4bb271d3e005
2017-02-14Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from ↵TreeHugger Robot
system."" into nyc-mr1-dev
2017-02-14Merge "Only modify window layout params when necessary." into cw-f-devMichael Kwan
2017-02-14DO NOT MERGE - Check exported status in chooserHakan Seyalioglu
am: 7bae18232e Change-Id: Ieda18baab005a6a85b5107dfab37d20dec990110
2017-02-13[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"Philip P. Moltmann
This reverts commit 2fc44947dd4f45a23c56985d4c12f01332027a9f. Bug: 30662828 Change-Id: Ia22343c19e155555dff3b0cb58f7b58df0ce6301
2017-02-13DO NOT MERGE - Check exported status in chooserHakan Seyalioglu
Relevant change in master is ag/1844170 bug: 34147053 Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b (cherry picked from commit e3286c3145d54564e783333ac2a2bb89b9ffdc49)
2017-02-13DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."Amith Yamasani
Reason: Breaking setting the user avatar in Settings. Bug: 35158271 This reverts commit b61338ecb307a2f595a8f78e290b5287a6503aaa. Change-Id: Ia08c12be3da06b0d02e71635b46350c8ff50ec19
2017-02-13Only modify window layout params when necessary.Michael Kwan
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
2017-02-13Merge "Fix live wallpaper not showing on lock screen after restore" into ↵TreeHugger Robot
nyc-mr2-dev
2017-02-13Merge "Workaround wallpaper restore race" into nyc-mr2-devTreeHugger Robot
2017-02-13Add tweaks to smooth out swipe to dismiss.Michael Kwan
am: 5758a9a94c Change-Id: Id10a31504aa5a579e8670e7a23d2d99a990ed6e5
2017-02-13Workaround wallpaper restore raceBryan Mawhinney
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)
2017-02-13Fix live wallpaper not showing on lock screen after restoreBryan Mawhinney
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)
2017-02-13Import translations. DO NOT MERGEBill Yi
Change-Id: I3355bb35c1500306ddaf5102f82beb010b67c208 Auto-generated-cl: translation import
2017-02-13Add tweaks to smooth out swipe to dismiss.Michael Kwan
Bug: 34673753 Change-Id: I5a9d420c70d124fc764803d505291e66818b1aa2 (cherry picked from commit 2e11adaac3ec959044e8154c67b6ab9cde82fdab)
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 ↵Jeff Sharkey
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
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 ↵Jeff Sharkey
am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc am: 55ef8ba763 Change-Id: Ie2f9e943501b62177b23b701a9eea219a1dc696f
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 ↵Jeff Sharkey
am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a am: ab296986fc Change-Id: Idd20eb270f3824840900b60a0b507b3c135ddc9e
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 ↵Jeff Sharkey
am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b am: 86f242b071 Change-Id: Iaf37416af9d8d3e31b1825719f2f0cc8e860a603
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 ↵Jeff Sharkey
am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours am: 9aca89293a Change-Id: Ifc71c14cbdfe8e93cb6bca789daa17117b8f214f
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 ↵Jeff Sharkey
am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b Change-Id: Icc3179df0206649ca412eb3cb4a8b5a4691718fb
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 ↵Jeff Sharkey
am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 am: 208dcadb4f -s ours Change-Id: If13e06378379077bbf25e6accc35951c26703a9c
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 ↵Jeff Sharkey
am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 Change-Id: I7adf093b7b09d6cc69e13f17865f754ccf327200
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 ↵Jeff Sharkey
am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 am: 9335807fc4 Change-Id: I66766f7b8feccdf1855b3819ca30cec5b480ef07
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 ↵Jeff Sharkey
am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 Change-Id: I579175736bf9c3839492e67d08b8ce765c85c121
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 ↵Jeff Sharkey
am: a0b1198e70 -s ours am: 48f1ddc94a am: 00f5232dd0 Change-Id: I535ba4091bcb29fc25fc640f938a483b829e15c2
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 ↵Jeff Sharkey
am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours Change-Id: Ibb1a72ca35121ba586f18852445941b0a0c15724
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 ↵Jeff Sharkey
am: a0b1198e70 -s ours am: 48f1ddc94a Change-Id: I1785a0a301e2847946276be682f62ee263b39a3f
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 ↵Jeff Sharkey
am: 32c71b078c am: 75f767afa1 Change-Id: I1393b6bcfa074bef42b7491204df55e39471e689
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9Jeff Sharkey
am: a0b1198e70 -s ours Change-Id: Ieefebd7669b892cba9afade572e3f43d56095902
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9Jeff Sharkey
am: 32c71b078c Change-Id: I1af83dbf9869bd93ecc5c07e1ce6155206f73290
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID.Jeff Sharkey
am: 6f754e48e9 Change-Id: I2f6dd5ba1e266b3d451533e518ec7f2fe24b262c
2017-02-12DO NOT MERGE. Grant MMS Uri permissions as the calling UID.Jeff Sharkey
am: 3f3da42ef9 Change-Id: I222c32931827d906db5fc1e3258f2095e6013481
2017-02-11Update the exception description for start(). am: ac06177a13Mark Goldstein
am: 8b137cc06b Change-Id: Id448ab164e1fd0d3f5977c30c5395bcb6e87f90f
2017-02-11Update the exception description for start().Mark Goldstein
am: ac06177a13 Change-Id: I124d99971918daa7768d79daa01ecbbb86f60199