Amith Yamasani
669d6694e1
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18
...
am: 67dbaa8a14
2017-02-14 01:07:53 +00:00
Amith Yamasani
67dbaa8a14
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5
...
am: c510e19d18
2017-02-14 01:02:54 +00:00
Android Build Merger (Role)
a0dff34532
Merge "Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23 am: d56887f8fa" into nyc-mr2-dev-plus-aosp
2017-02-14 01:01:13 +00:00
Michael Kwan
5af3dd4bb5
Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23
...
am: d56887f8fa
2017-02-14 01:00:27 +00:00
Michael Kwan
49fa0405b1
Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23
...
am: a26e371c9b
2017-02-14 01:00:23 +00:00
Amith Yamasani
c510e19d18
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
...
am: 7556690cf5
2017-02-14 00:57:56 +00:00
Michael Kwan
a26e371c9b
Merge "Only modify window layout params when necessary." into cw-f-dev
...
am: 9fbd981f23
2017-02-14 00:55:32 +00:00
Michael Kwan
d56887f8fa
Merge "Only modify window layout params when necessary." into cw-f-dev
...
am: 9fbd981f23
2017-02-14 00:55:29 +00:00
TreeHugger Robot
7556690cf5
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
2017-02-14 00:49:44 +00:00
Android Build Merger (Role)
b98f76e276
Merge "DO NOT MERGE - Check exported status in chooser am: 7bae18232e am: 45fa749c5a" into nyc-mr2-dev-plus-aosp
2017-02-14 00:48:20 +00:00
Michael Kwan
9fbd981f23
Merge "Only modify window layout params when necessary." into cw-f-dev
2017-02-14 00:48:12 +00:00
Hakan Seyalioglu
f13504555f
DO NOT MERGE - Check exported status in chooser am: 7bae18232e
...
am: 45fa749c5a
2017-02-14 00:47:27 +00:00
Hakan Seyalioglu
62666ab94a
DO NOT MERGE - Check exported status in chooser am: 7bae18232e
...
am: aeb1f1241e
2017-02-14 00:47:25 +00:00
Hakan Seyalioglu
aeb1f1241e
DO NOT MERGE - Check exported status in chooser
...
am: 7bae18232e
2017-02-14 00:41:55 +00:00
Hakan Seyalioglu
45fa749c5a
DO NOT MERGE - Check exported status in chooser
...
am: 7bae18232e
2017-02-14 00:41:51 +00:00
Hakan Seyalioglu
7bae18232e
DO NOT MERGE - Check exported status in chooser
...
Relevant change in master is ag/1844170
bug: 34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
(cherry picked from commit e3286c3145
2017-02-13 23:12:28 +00:00
Amith Yamasani
55100571da
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 b61338ecb3
2017-02-13 22:00:12 +00:00
Michael Kwan
134ad6ef3f
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
2017-02-13 13:20:09 -08:00
Bryan Mawhinney
8542554d93
Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev
...
am: 5de3e5ab36
2017-02-13 20:54:11 +00:00
TreeHugger Robot
5de3e5ab36
Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev
2017-02-13 20:49:53 +00:00
Peter Qiu
bfceb41f5d
Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c am: 5644c190a0
...
am: 1b510ecff7
2017-02-13 20:12:20 +00:00
Bryan Mawhinney
b70bd94b6b
Merge "Workaround wallpaper restore race" into nyc-mr2-dev
...
am: 29e3920c4e
2017-02-13 20:09:34 +00:00
Peter Qiu
1b510ecff7
Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c
...
am: 5644c190a0
2017-02-13 20:07:16 +00:00
TreeHugger Robot
29e3920c4e
Merge "Workaround wallpaper restore race" into nyc-mr2-dev
2017-02-13 20:04:11 +00:00
Peter Qiu
5644c190a0
Merge "hotspot2: fix typo in the getter functions"
...
am: d3146f3c3c
2017-02-13 20:02:06 +00:00
Treehugger Robot
d3146f3c3c
Merge "hotspot2: fix typo in the getter functions"
2017-02-13 19:49:51 +00:00
Android Build Merger (Role)
6982f2df37
Merge "Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c am: ddc6e0b7ae" into nyc-mr2-dev-plus-aosp
2017-02-13 19:39:31 +00:00
Michael Kwan
7e8fab35cd
Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c
...
am: ddc6e0b7ae
2017-02-13 19:38:34 +00:00
Michael Kwan
6853de9729
Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c
...
am: 2155f773db
2017-02-13 19:38:32 +00:00
Michael Kwan
2155f773db
Add tweaks to smooth out swipe to dismiss.
...
am: 5758a9a94c
2017-02-13 19:32:35 +00:00
Michael Kwan
ddc6e0b7ae
Add tweaks to smooth out swipe to dismiss.
...
am: 5758a9a94c
2017-02-13 19:32:29 +00:00
Bryan Mawhinney
e7aadaaa3a
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 5c14853296
2017-02-13 18:29:57 +00:00
Bryan Mawhinney
cd757d4979
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 96eb5b724b
2017-02-13 18:26:31 +00:00
Bill Yi
46cff11000
Import translations. DO NOT MERGE
...
am: c342666ac8
2017-02-13 17:56:48 +00:00
Bill Yi
c342666ac8
Import translations. DO NOT MERGE
...
Change-Id: I3355bb35c1500306ddaf5102f82beb010b67c208
Auto-generated-cl: translation import
2017-02-13 06:10:54 -08:00
Erik Kline
60d14c429b
Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532 am: 0cca15ff88
...
am: 3de5971b40
2017-02-13 12:08:11 +00:00
Erik Kline
3de5971b40
Merge "Add test coverage for cleanup bug to be fixed." am: 89e6bf0532
...
am: 0cca15ff88
2017-02-13 12:02:48 +00:00
Erik Kline
0cca15ff88
Merge "Add test coverage for cleanup bug to be fixed."
...
am: 89e6bf0532
2017-02-13 11:57:37 +00:00
Treehugger Robot
89e6bf0532
Merge "Add test coverage for cleanup bug to be fixed."
2017-02-13 11:51:21 +00:00
Erik Kline
a954be9563
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
2017-02-13 17:38:34 +09:00
Michael Kwan
5758a9a94c
Add tweaks to smooth out swipe to dismiss.
...
Bug: 34673753
Change-Id: I5a9d420c70d124fc764803d505291e66818b1aa2
(cherry picked from commit 2e11adaac3
2017-02-13 06:17:06 +00:00
Android Build Merger (Role)
912a5f054c
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
2017-02-12 10:31:45 +00:00
Jeff Sharkey
065974c0fe
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
2017-02-12 10:30:58 +00:00
Jeff Sharkey
ed3841df86
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
2017-02-12 10:30:50 +00:00
Jeff Sharkey
8100f549bf
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
2017-02-12 10:26:57 +00:00
Jeff Sharkey
41c9029be0
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
2017-02-12 10:26:51 +00:00
Jeff Sharkey
62314d7dd3
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
2017-02-12 10:22:43 +00:00
Android Build Merger (Role)
09b336febd
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
2017-02-12 10:21:37 +00:00
Jeff Sharkey
4f86c07a3e
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
2017-02-12 10:20:52 +00:00
Jeff Sharkey
ce567aa642
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
2017-02-12 10:20:41 +00:00
