OSDN Git Service
Tyler Gunn [Wed, 30 May 2018 14:47:11 +0000 (07:47 -0700)]
Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev am:
5025812860
am:
5823043e0c
Change-Id: Ia6d217c8669232b14eccf867b1e5826bb4a286d5
Tyler Gunn [Wed, 30 May 2018 14:37:35 +0000 (07:37 -0700)]
Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev
am:
5025812860
Change-Id: Id84d7761db866905a8c6850beca302f17674ba5f
Tyler Gunn [Wed, 30 May 2018 14:24:23 +0000 (14:24 +0000)]
Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev
Nicolas Geoffray [Wed, 30 May 2018 12:08:34 +0000 (05:08 -0700)]
Merge "More greylisted APIs." into pi-dev am:
6d71fa791b
am:
28d10e9129
Change-Id: I94f662909f15a872e477a9d4220d721381a75acf
Nicolas Geoffray [Wed, 30 May 2018 11:57:41 +0000 (04:57 -0700)]
Merge "More greylisted APIs." into pi-dev
am:
6d71fa791b
Change-Id: I343e80b48ce03daff53b3150f02463f8139d0662
Nicolas Geoffray [Wed, 30 May 2018 11:45:46 +0000 (11:45 +0000)]
Merge "More greylisted APIs." into pi-dev
TreeHugger Robot [Wed, 30 May 2018 11:36:27 +0000 (11:36 +0000)]
Merge "Statsd: ISOLATED_UID_CHANGED out of batterystats"
Nicolas Geoffray [Wed, 30 May 2018 09:51:48 +0000 (10:51 +0100)]
More greylisted APIs.
bug:
80447248
bug:
80444865
bug:
80441306
bug:
80441307
bug:
80440630
Test: m
Change-Id: I8be93884ad770f885fed1afb3864ea5322902bb1
Michael Wright [Wed, 30 May 2018 09:48:14 +0000 (02:48 -0700)]
Merge "Allow for any default vibration intensity level." into pi-dev am:
fb840c9170
am:
4af6ded846
Change-Id: I436509b14ffc1a100293e36dedbddeceb53c362b
Michael Wright [Wed, 30 May 2018 09:38:47 +0000 (02:38 -0700)]
Merge "Allow for any default vibration intensity level." into pi-dev
am:
fb840c9170
Change-Id: Ia1df028a9a0011f47ef2de6ec50e64c227c4b418
Michael Wright [Wed, 30 May 2018 09:28:22 +0000 (09:28 +0000)]
Merge "Allow for any default vibration intensity level." into pi-dev
Colin Cross [Wed, 30 May 2018 06:41:52 +0000 (23:41 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors" am:
ce1979d707 am:
da6fcd1f9a
am:
872accd1e0
Change-Id: I36ca83766ab9d5c0d54c9acdefb31838686028f8
Colin Cross [Wed, 30 May 2018 06:31:12 +0000 (23:31 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors" am:
ce1979d707
am:
da6fcd1f9a
Change-Id: Ib73e574214064ba0c4112e901d9997724ecd7cb8
Tiger Huang [Wed, 30 May 2018 06:26:48 +0000 (06:26 +0000)]
Merge "Clear mDeferredHideWallpaper if wallpaper is being hidden"
Colin Cross [Wed, 30 May 2018 06:21:55 +0000 (23:21 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors"
am:
ce1979d707
Change-Id: If52a42d9f2a95d5d957b177e36a7a14fd54bace9
Lucas Dupin [Wed, 30 May 2018 05:47:55 +0000 (22:47 -0700)]
Merge "Cancel dark animation when new one arrives" into pi-dev am:
7c0e462b20
am:
59e792baeb
Change-Id: Ie5de6d2c5dd5fd871aa2a76e146be58377abc059
Lucas Dupin [Wed, 30 May 2018 05:21:31 +0000 (22:21 -0700)]
Merge "Cancel dark animation when new one arrives" into pi-dev
am:
7c0e462b20
Change-Id: I055e40a9ce8aed257f14efd77677031a6656a034
TreeHugger Robot [Wed, 30 May 2018 05:14:35 +0000 (05:14 +0000)]
Merge "Cancel dark animation when new one arrives" into pi-dev
Colin Cross [Wed, 30 May 2018 05:01:08 +0000 (05:01 +0000)]
Merge "Use AAPT2 for more modules with manifest validation errors"
Tracy Zhou [Wed, 30 May 2018 04:54:53 +0000 (21:54 -0700)]
Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev am:
5a0c1e1101
am:
471cf1b910
Change-Id: I57fc05f3e8b582b11ae90b26395b10365624239a
Sungsoo Lim [Wed, 30 May 2018 04:44:52 +0000 (21:44 -0700)]
Merge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev am:
babf190396
am:
a51ceb590b
Change-Id: I65491f578c654578ec9feb34768fb553323285a4
Tracy Zhou [Wed, 30 May 2018 04:44:31 +0000 (21:44 -0700)]
Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev
am:
5a0c1e1101
Change-Id: I5544c8b5e7b79a9b8002be53a04cf0af48c7f050
Sungsoo Lim [Wed, 30 May 2018 04:39:47 +0000 (21:39 -0700)]
Merge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev
am:
babf190396
Change-Id: I7b4dba8612a8e58172d210f6f0764079cfc98af1
TreeHugger Robot [Wed, 30 May 2018 04:30:49 +0000 (04:30 +0000)]
Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev
Fan Zhang [Wed, 30 May 2018 03:44:46 +0000 (20:44 -0700)]
[automerger skipped] Merge "Add default phone/sms to battery whitelist apps." into pi-dev am:
89722d829e
am:
32cb24c5c9 -s ours
Change-Id: I5017028520f91b1dea4aa6629d5066c1f5e0f895
Jakub Pawlowski [Wed, 30 May 2018 03:39:05 +0000 (20:39 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am:
459888be84 am:
bc45dc9536 -s ours am:
2d6209f71d -s ours am:
e6cbbd4994 -s ours
am:
622c4b7b5d -s ours
Change-Id: Iccc5baea262a40ace49366b038a0db28a6152559
Sundong Ahn [Wed, 30 May 2018 03:31:41 +0000 (20:31 -0700)]
Merge "Build java.obex with java_sdk_library" am:
ad769993a9 am:
efb4ce221e
am:
1d0038a843
Change-Id: Ie696bfe2d978f7078f1051e3320c183f69a65556
TreeHugger Robot [Wed, 30 May 2018 03:26:22 +0000 (03:26 +0000)]
Merge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev
Lucas Dupin [Wed, 30 May 2018 03:25:38 +0000 (20:25 -0700)]
Merge "Do not request focus during wake and unlock" into pi-dev am:
58fc12e8fa
am:
668642b945
Change-Id: I9d87436cb157322f1fa02cdb00d6f4071ca0fae9
Fan Zhang [Wed, 30 May 2018 03:20:08 +0000 (20:20 -0700)]
Merge "Add default phone/sms to battery whitelist apps." into pi-dev
am:
89722d829e
Change-Id: Ide1af36c0e0b70d93cca44a4193f7e2a242d2de5
Jakub Pawlowski [Wed, 30 May 2018 03:14:57 +0000 (20:14 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am:
459888be84 am:
bc45dc9536 -s ours am:
2d6209f71d -s ours
am:
e6cbbd4994 -s ours
Change-Id: I0cebfeee832964a286c6b31873368dbf90a8a6f6
TreeHugger Robot [Wed, 30 May 2018 03:08:19 +0000 (03:08 +0000)]
Merge "Add default phone/sms to battery whitelist apps." into pi-dev
Jakub Pawlowski [Wed, 30 May 2018 03:05:21 +0000 (20:05 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am:
459888be84 am:
bc45dc9536 -s ours
am:
2d6209f71d -s ours
Change-Id: I0b7af0f19142f0aa5a039de6db22f292d16c76df
Sundong Ahn [Wed, 30 May 2018 02:54:35 +0000 (19:54 -0700)]
Merge "Build java.obex with java_sdk_library" am:
ad769993a9
am:
efb4ce221e
Change-Id: I31f65699193f026c7ed64a182b360791eee35608
Lucas Dupin [Wed, 30 May 2018 02:16:55 +0000 (19:16 -0700)]
Merge "Do not request focus during wake and unlock" into pi-dev
am:
58fc12e8fa
Change-Id: If45bd1074dc22c732074cfc59896614d4b28ab22
Selim Cinek [Wed, 30 May 2018 02:13:00 +0000 (19:13 -0700)]
Merge "Fixed an issue where the reply icon was disabled" into pi-dev am:
1c6b809579
am:
684f5ffc34
Change-Id: Iba94508463ba20402b77210eaf59cee9887ea437
Selim Cinek [Wed, 30 May 2018 02:05:58 +0000 (19:05 -0700)]
Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev am:
d982210d89
am:
0fc5e52023
Change-Id: I601fde5804a921a9e634e342993402d4feb8031a
Selim Cinek [Wed, 30 May 2018 02:04:43 +0000 (19:04 -0700)]
Merge "Fixed an issue where the reply icon was disabled" into pi-dev
am:
1c6b809579
Change-Id: Ib9593bdbf872a9146a877b3ec22c101001b2ad13
Selim Cinek [Wed, 30 May 2018 01:59:25 +0000 (18:59 -0700)]
Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev
am:
d982210d89
Change-Id: I4b29f82656e3b3402f89cb5d66e71955287ac0b8
TreeHugger Robot [Wed, 30 May 2018 01:55:18 +0000 (01:55 +0000)]
Merge "Do not request focus during wake and unlock" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 01:50:40 +0000 (01:50 +0000)]
Merge "Add default phone/sms to battery whitelist apps."
Jakub Pawlowski [Wed, 30 May 2018 01:49:17 +0000 (18:49 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am:
459888be84
am:
bc45dc9536 -s ours
Change-Id: I087f8de352c5c61db32d95ee8c47b6ab0bd171e2
Sungsoo Lim [Wed, 23 May 2018 15:28:27 +0000 (00:28 +0900)]
Update mGlobalBluetoothA2dpOn when active device changed
Also do not setForceUse when a2dp config without change.
Bug:
79982460
Test: manual
Change-Id: I789b03c00366f9fd78fd3a0305fdf2c11dfc23d2
Sundong Ahn [Wed, 30 May 2018 01:38:07 +0000 (18:38 -0700)]
Merge "Build java.obex with java_sdk_library"
am:
ad769993a9
Change-Id: I3a895f10880efb9ae916376f62d059941a25e417
TreeHugger Robot [Wed, 30 May 2018 01:29:40 +0000 (01:29 +0000)]
Merge "Fixed an issue where the reply icon was disabled" into pi-dev
Fan Zhang [Wed, 30 May 2018 01:04:04 +0000 (18:04 -0700)]
Merge "Update call log permission group icon." into pi-dev am:
9a184cb7f3
am:
c79ed0f09f
Change-Id: I933fc06c7904778486ac63e3edc244f7083ad0dc
TreeHugger Robot [Wed, 30 May 2018 00:52:32 +0000 (00:52 +0000)]
Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev
Jakub Pawlowski [Wed, 30 May 2018 00:50:07 +0000 (17:50 -0700)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
am:
459888be84
Change-Id: Ibccfb97e0b41a9ef6af9fcb1da23870dbff7f9b9
Lucas Dupin [Wed, 30 May 2018 00:26:35 +0000 (17:26 -0700)]
Cancel dark animation when new one arrives
Not doing so causes weird artifacts when power button is pressed
multiple times in a row and StackScroller would have the wrong
state if unlocked with fingerprint while animation is still running.
Test: lock from lock screen, fp before animation ends
Test: press power multiple times on lock screen, look at smooth animation
Change-Id: I381bf367533983595cd22ff080f51465f6c0f750
Fixes:
79747888
Treehugger Robot [Wed, 30 May 2018 00:20:36 +0000 (00:20 +0000)]
Merge "Build java.obex with java_sdk_library"
Sundong Ahn [Fri, 18 May 2018 00:58:11 +0000 (09:58 +0900)]
Build java.obex with java_sdk_library
javax.obex is built with java_sdk_library and api files are added by
running "make update-api".
Remove java.obex is from platform.xml, since it will be generated
automatically by soong when the library is built with java_sdk_library.
Bug:
77577799
Test: make -j
make checkapi
Change-Id: Ib94955e62582ffbdfc7eb88cd0e494c61757c7aa
Selim Cinek [Wed, 30 May 2018 00:01:05 +0000 (17:01 -0700)]
Fixed an issue where the reply icon was disabled
Because it was disabled by an earlier update, a subsequent update
needs to enable the reply icon again, as the pending intent
might be valid again.
Change-Id: Ic562b399184e37c3870e1da7dc5d15baca43dc54
Fixes:
80250615
Test: add multiple messages where each one cancels the previous pendinging intent, observe clickable reply icon
Tracy Zhou [Tue, 29 May 2018 22:36:16 +0000 (15:36 -0700)]
Fix unwanted PIP window dismissal when moving to the bottom
Display#getSize() returns screen size excluding certain system decor
elements. We should get a more accurate size using Display#getRealSize()
minus bottom inset instead for calculating whether the PIP window
should be dismissed.
Fixes:
80367557
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerPinnedStackTests and manual test
Change-Id: I20cd8ccfa53bd7cc1cb7176280a01dbcb64b5745
Fan Zhang [Tue, 29 May 2018 23:41:36 +0000 (16:41 -0700)]
Merge "Update call log permission group icon." into pi-dev
am:
9a184cb7f3
Change-Id: I4d8ce9671c310e8b6c5b7ca94dd341dba8c2c449
TreeHugger Robot [Tue, 29 May 2018 23:38:57 +0000 (23:38 +0000)]
Merge changes I03b8b712,I62688119
* changes:
Fix assertion failure in TaskPositionerTest
Fix NPE in TaskPositionerTest
TreeHugger Robot [Tue, 29 May 2018 23:23:18 +0000 (23:23 +0000)]
Merge "Update call log permission group icon." into pi-dev
Michael Wright [Fri, 25 May 2018 14:13:36 +0000 (15:13 +0100)]
Allow for any default vibration intensity level.
Because we can't always create the range of effects we'd like, we may
need different default intensity levels for different devices. This
works fine for prebaked effects, but for application defined amplitudes
we need to provide a scaling function. In addition, this scaling
function should leave amplitude values untouched in the default state so
that application developers produce the effects they expect.
Bug:
80275800
Test: manual
Merged-In: Ibb552ddfa60891853ebcb1a5567ed6745bb5defe
Change-Id: Ibb552ddfa60891853ebcb1a5567ed6745bb5defe
Makoto Onuki [Tue, 29 May 2018 23:14:42 +0000 (16:14 -0700)]
Merge "Disable battery saver tron log by default" into pi-dev am:
dfb99b257b
am:
8d4dbded5c
Change-Id: Ie869029e5178517f4b71a981c57334d5f9ea1b13
Christopher Tate [Tue, 29 May 2018 23:09:46 +0000 (16:09 -0700)]
Guard pre-O apps from malicious startForegroundService() am:
0a82690868
am:
33369bbd2a
Change-Id: I074b6274b98cf233b3fe9bf97807e727e38ad4bb
Christopher Tate [Tue, 29 May 2018 23:05:50 +0000 (16:05 -0700)]
Merge "Extend startForegroundService() fg transition timeout to 10 seconds" into pi-dev am:
3ec17d31c5
am:
96efd907c5
Change-Id: I3d2ddef0b5add85130daeadc88bb907661c8d210
Chad Brubaker [Tue, 29 May 2018 23:00:13 +0000 (16:00 -0700)]
Merge "Remove downgrade check for targetSandboxLevel" into pi-dev am:
d55f0108c5
am:
bd14364a06
Change-Id: Ia686f4d2c08e542a30af8e999bf4f43551bef815
Lucas Dupin [Tue, 29 May 2018 22:41:03 +0000 (15:41 -0700)]
Do not request focus during wake and unlock
Focus was being required because the expansion of the panel
would trigger onFullyShown. Bouncer shouldn't need any
translation during WAKE_AND_UNLOCK.
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Test: go/sysui-bouncer-tests
Change-Id: I6d5c17ba89e14384859cf7fc91ca5cc2815dbfd9
Fixes:
80345339
Jakub Pawlowski [Fri, 8 Dec 2017 06:56:03 +0000 (22:56 -0800)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
Bug:
69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Fan Zhang [Tue, 29 May 2018 17:55:51 +0000 (10:55 -0700)]
Add default phone/sms to battery whitelist apps.
This is to prevent essential default apps from being restricted in using
battery in the background.
Change-Id: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Merged-In: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Fixes:
76435804
Bug:
80428049
Test: robotests
Fan Zhang [Tue, 29 May 2018 17:55:51 +0000 (10:55 -0700)]
Add default phone/sms to battery whitelist apps.
This is to prevent essential default apps from being restricted in using
battery in the background.
Change-Id: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Fixes:
76435804
Bug:
80428049
Test: robotests
Selim Cinek [Thu, 24 May 2018 23:37:22 +0000 (16:37 -0700)]
Fixed the animations of Messaging Layout, leading to overlaps
The animations could go wild at times, leading to overlapping
messages and ugly renderings. This improves the animations
overall and fixes those cases.
Test: add messages, observe animations
Fixes:
78114531
Fixes:
80409521
Change-Id: I6f21b87706ccc2e85f1edbd9489e4bf7e686d7d8
Makoto Onuki [Tue, 29 May 2018 22:29:11 +0000 (15:29 -0700)]
Merge "Disable battery saver tron log by default" into pi-dev
am:
dfb99b257b
Change-Id: I0d894c09ce1d6a96e60160ebd1246cdda4d9f9be
Christopher Tate [Tue, 29 May 2018 22:23:25 +0000 (15:23 -0700)]
Guard pre-O apps from malicious startForegroundService()
am:
0a82690868
Change-Id: I4dbab603ba2d42b5301539cc3110bef02868ee1e
Christopher Tate [Tue, 29 May 2018 22:20:59 +0000 (15:20 -0700)]
Merge "Extend startForegroundService() fg transition timeout to 10 seconds" into pi-dev
am:
3ec17d31c5
Change-Id: I9a3a0d8e9fa348018a36c1e306aab822df377aa0
Chad Brubaker [Tue, 29 May 2018 22:15:11 +0000 (15:15 -0700)]
Merge "Remove downgrade check for targetSandboxLevel" into pi-dev
am:
d55f0108c5
Change-Id: I5c42e8d96666b4a3bbe942a4a4e59bd95a4028ae
Makoto Onuki [Tue, 29 May 2018 22:12:26 +0000 (22:12 +0000)]
Merge "Disable battery saver tron log by default" into pi-dev
Christopher Tate [Fri, 25 May 2018 22:15:44 +0000 (15:15 -0700)]
Guard pre-O apps from malicious startForegroundService()
Don't enforce the startForegroundService() requirement to transition to
foreground when the app hosting the service doesn't yet target the API
level at which this semantic was introduced.
Bug:
79377529
Test: manual (ApiDemos is pre-O)
Test: atest CtsAndroidAppTestCases
Change-Id: Ib0b970211d4ee6a86e22c89aff47b05403907ed5
TreeHugger Robot [Tue, 29 May 2018 21:55:52 +0000 (21:55 +0000)]
Merge "Extend startForegroundService() fg transition timeout to 10 seconds" into pi-dev
Chad Brubaker [Tue, 29 May 2018 21:51:33 +0000 (21:51 +0000)]
Merge "Remove downgrade check for targetSandboxLevel" into pi-dev
Wale Ogunwale [Tue, 29 May 2018 21:49:27 +0000 (14:49 -0700)]
Merge "Enable WM.DEBUG_WALLPAPER_LIGHT logs" into pi-dev am:
c71ef2bc86
am:
f167af7513
Change-Id: Ic9006f6c53ec7596ce7093b92396f6cfaa72c2e6
Michael Wright [Tue, 29 May 2018 21:44:00 +0000 (14:44 -0700)]
Merge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev am:
eb2fdbb3c9
am:
6489d832e1
Change-Id: I3e54ce6ecb394ff591d25f31560a05b84acd8141
Wale Ogunwale [Tue, 29 May 2018 21:42:35 +0000 (14:42 -0700)]
Merge "Enable WM.DEBUG_WALLPAPER_LIGHT logs" into pi-dev
am:
c71ef2bc86
Change-Id: Ia4c4a6d146944040c28c16289392485d859d0507
TreeHugger Robot [Tue, 29 May 2018 21:33:03 +0000 (21:33 +0000)]
Merge "Enable WM.DEBUG_WALLPAPER_LIGHT logs" into pi-dev
Michael Wright [Tue, 29 May 2018 21:31:36 +0000 (14:31 -0700)]
Merge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev
am:
eb2fdbb3c9
Change-Id: Iaff15045e39534124f4a78fa34e0319df9f111f5
Fan Zhang [Tue, 29 May 2018 21:22:16 +0000 (14:22 -0700)]
Update call log permission group icon.
Change-Id: I605ece95cd29405b9d63692d038f36390ac367ef
Fixes:
78230210
Test: visual
TreeHugger Robot [Tue, 29 May 2018 21:20:24 +0000 (21:20 +0000)]
Merge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev
Rohan Shah [Tue, 29 May 2018 21:15:10 +0000 (14:15 -0700)]
Merge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev am:
a8464603ed
am:
548d19e4bb
Change-Id: I3662346215b8ed11a05cc31c67a029f77ee55e9b
Rohan Shah [Tue, 29 May 2018 21:07:56 +0000 (14:07 -0700)]
Merge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev
am:
a8464603ed
Change-Id: I546936b695ae0355a92aa3dd6131e369f784b98e
Tracy Zhou [Tue, 29 May 2018 21:07:11 +0000 (14:07 -0700)]
Merge "Update quick scrub tip according to the latest mock." into pi-dev am:
d7a053448b
am:
2b1150519d
Change-Id: Ie70de7596b3d894176b35e373bb7a00907f97821
Ben Wagner [Tue, 29 May 2018 21:02:08 +0000 (21:02 +0000)]
Merge "Update sk_sp use for explicit."
Chavi Weingarten [Tue, 29 May 2018 21:01:31 +0000 (14:01 -0700)]
Merge "Add animation to running animation list before starting." into pi-dev am:
908610fd74
am:
8b3d7adbef
Change-Id: Ib442b72330b02014d0d3776d32650ce33c136c73
Tracy Zhou [Tue, 29 May 2018 21:00:41 +0000 (14:00 -0700)]
Merge "Update quick scrub tip according to the latest mock." into pi-dev
am:
d7a053448b
Change-Id: Ifb83a3c334efe749c79a25f1e8c86a518b93df2c
Christopher Tate [Fri, 25 May 2018 20:12:12 +0000 (13:12 -0700)]
Extend startForegroundService() fg transition timeout to 10 seconds
Change-Id: I5e09205218e5ddb2ff536f7f5c20ac31c0c03bb1
Fixes:
80309073
Test: atest CtsAndroidAppTestCases
TreeHugger Robot [Tue, 29 May 2018 20:35:54 +0000 (20:35 +0000)]
Merge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev
Amith Yamasani [Tue, 29 May 2018 20:33:44 +0000 (13:33 -0700)]
Merge "Fix for missing location icon" into pi-dev am:
8c4c359b25
am:
2b04227379
Change-Id: Ib61d6ed9db7082f5255c7b9eba61cc4616e7019e
Chavi Weingarten [Tue, 29 May 2018 20:32:58 +0000 (13:32 -0700)]
Merge "Add animation to running animation list before starting." into pi-dev
am:
908610fd74
Change-Id: Ia3b5ec7242ac438bcbe71cdf53ea5d45e4b57b15
TreeHugger Robot [Tue, 29 May 2018 20:26:23 +0000 (20:26 +0000)]
Merge "Update quick scrub tip according to the latest mock." into pi-dev
Amith Yamasani [Tue, 29 May 2018 20:22:35 +0000 (13:22 -0700)]
Merge "Fix for missing location icon" into pi-dev
am:
8c4c359b25
Change-Id: I1e108f56230915e0950712a0fa2cc363e3ffbc9e
TreeHugger Robot [Tue, 29 May 2018 20:22:25 +0000 (20:22 +0000)]
Merge "Follow minikin header structure changes"
Chavi Weingarten [Tue, 29 May 2018 20:20:20 +0000 (20:20 +0000)]
Merge "Add animation to running animation list before starting." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 20:09:21 +0000 (20:09 +0000)]
Merge "Fix for missing location icon" into pi-dev
Winson Chung [Tue, 29 May 2018 20:08:28 +0000 (13:08 -0700)]
Merge "Fix regression in swiping over rotation button." into pi-dev am:
287d4327cd
am:
5c050ea1da
Change-Id: I58a3d0e020d65bff557b3c9ef699bd82c9369642
Winson Chung [Tue, 29 May 2018 19:59:00 +0000 (12:59 -0700)]
Merge "Fix regression in swiping over rotation button." into pi-dev
am:
287d4327cd
Change-Id: I576b5ab4c537d9fb3f221c8e2bae0339c63b7d57
TreeHugger Robot [Tue, 29 May 2018 19:45:35 +0000 (19:45 +0000)]
Merge "Fix regression in swiping over rotation button." into pi-dev
Android Build Merger (Role) [Tue, 29 May 2018 19:37:59 +0000 (19:37 +0000)]
Merge "Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev am:
a5d8c3718d am:
a64203d608"