Andrew Sapperstein
f679329412
Merge "Use colorAccent for profile_button." into nyc-mr1-dev
2016-08-11 17:27:56 +00:00
Ta-wei Yen
f2cfff28a9
Merge "Add API to enable/disable the visual voicemail client" into nyc-mr1-dev
...
am: fb6e1bf239
Change-Id: If19064840dacce88fa0b211e1b1db3894ca065ac
2016-08-11 17:23:51 +00:00
Ta-wei Yen
6dc3efcc16
Add API to enable/disable the visual voicemail client
...
am: 20f2ebbf4d
Change-Id: I4051b810ab020208001f726e4911df1905ef81bf
2016-08-11 17:23:30 +00:00
Ta-wei Yen
fb6e1bf239
Merge "Add API to enable/disable the visual voicemail client" into nyc-mr1-dev
2016-08-11 17:15:14 +00:00
Esteban Talavera
c48b20f8f1
Do not toggle OEM unlock if bootloader unlocked
...
Bug: 30681215
Change-Id: Ia0fd55dd7b6b731d6f5733fc733621e99bd7b153
2016-08-11 18:14:03 +01:00
smain@google.com
4b93d10f2a
add info about how to return default values from android.jar bug: 30757670 am: abfa7e2c65
...
am: 7a66b70d96
Change-Id: Iecbe2dc116c8004c5547690571ac35dfc546743f
2016-08-11 16:48:48 +00:00
smain@google.com
7a66b70d96
add info about how to return default values from android.jar bug: 30757670
...
am: abfa7e2c65
Change-Id: I60f631fa7d33bc8cd39082a8caf8dbb9f94bb47c
2016-08-11 16:42:03 +00:00
Wale Ogunwale
3c0d44e633
Clear WS.mDestroying on AWT.clearAnimatingFlags
...
We call AppWindowToken.clearAnimatingFlags() when an app token is
no longer considered exiting since it is now part of the opening
app transition. To the same effect we should no longer consider
its windows destroying so they can be factored in when decided
what to do during the transition like picking the right wallpaper
target.
Bug: 30790402
Change-Id: Ide94af72a38bd4a955abb122b47f921fd3f70652
2016-08-11 09:34:45 -07:00
smain@google.com
abfa7e2c65
add info about how to return default values from android.jar
...
bug: 30757670
Change-Id: I84e1624cbe7ae8d5e4e2886d4e8f61d621729464
2016-08-11 16:28:01 +00:00
Chong Zhang
808621ca54
Some fixes for transition animation selection
...
- Request wallpaper adjust after we clear mDestroying or
mAnimatingExit flags, as these could affect wallpaper
target selection result.
- Adjust wallpaper before we check lower/upper target. As
there could be pending operations that requested a wall-
paper update. Lower/upper target is needed to correctly
decide if the opening or closing apps had wallpaper.
- Make sure lower/upper targets are set even when current
target is clientHidden, in which case we should set
wallpaper target to old target but the lower/upper
still needs to be set up.
Bug: 30790402
Bug: 30255354
Change-Id: Ie2c94439142cbb91660c5aa4164cc660831486d5
(cherry picked from commit ec8299ca45 )
2016-08-11 08:00:51 -07:00
Chong Zhang
60091a978f
Dump out last real used app transit type
...
Easier for debugging or testing bad exit animations.
Bug: 30790402
Bug: 30255354
Change-Id: I8097195bfc918baf66ecc99b55f4845aba2eaff4
(cherry picked from commit 1c93f6de2d )
2016-08-11 08:00:28 -07:00
Julia Reynolds
b359f4dddb
Merge "Don't run expand/collapse animations when dismissing." into nyc-mr1-dev
...
am: 2af6932ae8
Change-Id: I93c0e294c8a4e0e4c151da68be5c8e66201f1724
2016-08-11 14:37:55 +00:00
Julia Reynolds
738f8c4b8d
Don't run expand/collapse animations when dismissing.
...
am: 48242f0ac6
Change-Id: Id90846c9e9d505b9bbdd35cf70d071cc561b49d3
2016-08-11 14:37:50 +00:00
Julia Reynolds
2af6932ae8
Merge "Don't run expand/collapse animations when dismissing." into nyc-mr1-dev
2016-08-11 14:28:48 +00:00
Geoffrey Pitsch
ecc1996d73
Merge "Suppress Boot sound for non-standard scenarios." into nyc-mr1-dev
...
am: eed326b072
Change-Id: Ifdcff520e6010f888e5d8e723cfd29cb9f2ed935
2016-08-11 13:06:39 +00:00
Geoffrey Pitsch
854f8cecf7
Suppress Boot sound for non-standard scenarios.
...
am: 290c4350ed
Change-Id: I819489be834dd262de530b0ff24a2e20aafcad2d
2016-08-11 13:06:37 +00:00
Geoffrey Pitsch
eed326b072
Merge "Suppress Boot sound for non-standard scenarios." into nyc-mr1-dev
2016-08-11 12:56:43 +00:00
Justin Klaassen
73d8feb514
Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev
...
am: 609770d34b
Change-Id: I6d297a3e1714cff39b904fa9a7881e86a1c5c201
2016-08-11 02:55:36 +00:00
Justin Klaassen
49b3fbabf1
Make NightDisplayService robust to early alarms
...
am: 4346f63dbf
Change-Id: I0ab6422a9d3da3a673f23f3e217682710e8ae296
2016-08-11 02:55:33 +00:00
TreeHugger Robot
609770d34b
Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev
2016-08-11 02:46:50 +00:00
Adrian Roos
dc915e418b
Merge "Only disable trust agents after lockout" into nyc-mr1-dev
...
am: f6487b63a1
Change-Id: Id59329047a2857697d3611cd4179dace742364c3
2016-08-11 02:38:51 +00:00
Adrian Roos
73b2f5981e
Only disable trust agents after lockout
...
am: 9d6fc9246b
Change-Id: I1fd7860a5a2c452e4b3c2e3e8d1073c423c9f054
2016-08-11 02:38:45 +00:00
TreeHugger Robot
f6487b63a1
Merge "Only disable trust agents after lockout" into nyc-mr1-dev
2016-08-11 02:30:32 +00:00
Andreas Gampe
c9c0edfa14
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev
...
am: 927db408a2
Change-Id: I11435b1853073eca75bcff33e180fc165eb3d460
2016-08-11 02:11:26 +00:00
Andreas Gampe
8253782f5b
Zygote: allow system server compilation to fail
...
am: e7bc152c20
Change-Id: Ibaea0c9bc3a5eb0e8a64342e4e27b7cfca21c647
2016-08-11 02:11:21 +00:00
TreeHugger Robot
927db408a2
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev
2016-08-11 02:02:09 +00:00
Justin Klaassen
4346f63dbf
Make NightDisplayService robust to early alarms
...
Bug: 30743700
Use the same time for calculating the next activated state and
scheduling the next alarm. This prevents the alarm from being scheduled
incorrectly if the activated state is updated slightly before the
scheduled start or end time.
Change-Id: I690aebddd28547a25b507c227c4527ffdd7c6a02
2016-08-10 18:22:42 -07:00
Christopher Tate
dd1d9baa55
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev
...
am: 262f0186bd
Change-Id: I5182e8474d0ed481485b58d1a6a0c447859ea5dd
2016-08-11 01:06:00 +00:00
Christopher Tate
3303c26759
Base date-change alarm on 24h "hour zero," not 12h
...
am: afa8b980ac
Change-Id: I4dac5d4eab675fde483ab3fe821370b02a3a8b05
2016-08-11 01:05:58 +00:00
Adrian Roos
9d6fc9246b
Only disable trust agents after lockout
...
Previously trust agents would be disabled even after one
wrong attempt. Now we wait for the cooldown (usually 5 attempts),
the same as fingerprint.
Also adds a TrustArchive entry of when device policy changes are sent to
trust agents.
Bug: 30037948
Change-Id: I9e284d994ddae45ef66b5b8b601297c63d8ba667
2016-08-10 18:01:32 -07:00
TreeHugger Robot
262f0186bd
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev
2016-08-11 00:57:27 +00:00
Yin-Chia Yeh
ffa443f431
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
...
am: 58b4623d1f
Change-Id: I8c92a36230ae4b838cd06f421fdf8359e9a8a966
2016-08-11 00:39:28 +00:00
Yin-Chia Yeh
de71f83c2c
Camera: ensure lock ordering (device->session)
...
am: b0025e1f68
Change-Id: Idcb9b48274ecfe9fe2f306ae201491d1e485d601
2016-08-11 00:39:26 +00:00
Yin-Chia Yeh
58b4623d1f
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
2016-08-11 00:32:15 +00:00
Hiroshi Yamauchi
3cd67ed9d2
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev
...
am: 938d298116
Change-Id: Ie9c4ffd766ba9965ef2287a9e5a45cbe81555c58
2016-08-11 00:14:05 +00:00
Hiroshi Yamauchi
5d92aea521
Use non-fast JNI for Canvas.native_drawBitmap.
...
am: bce8866506
Change-Id: I58c322701cdc084aae018714f13fa9c2cf8d4cc6
2016-08-11 00:14:02 +00:00
Hiroshi Yamauchi
938d298116
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev
2016-08-11 00:05:19 +00:00
Jaewan Kim
28825f1af0
Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev
...
am: 25796925d9
Change-Id: I0c55170b259ea7f51f030456337d81bebfc6dcfe
2016-08-10 23:36:05 +00:00
Jaewan Kim
d5bee85ed5
PIP: Hide play/pause button by default
...
am: 7000519695
Change-Id: I82bb2fcb3ab91920c4d1ebb7d3c716b36f7e5bff
2016-08-10 23:36:00 +00:00
Chris Tate
cdfc491693
Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev
...
am: c72da3331b
Change-Id: I58152c38fd478978c7fb1454537ed3fc0f8eb644
2016-08-10 23:27:05 +00:00
Christopher Tate
7d29edf078
Fix lock wallpaper backup & restore
...
am: f47eff7343
Change-Id: I4ed7d178487cb2b1b36578dc69f13f2532c71665
2016-08-10 23:27:00 +00:00
Jaewan Kim
25796925d9
Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev
2016-08-10 23:22:21 +00:00
Chris Tate
c72da3331b
Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev
2016-08-10 23:17:08 +00:00
Christopher Tate
afa8b980ac
Base date-change alarm on 24h "hour zero," not 12h
...
Bug 30628519
Change-Id: Ie504748c7fc2d43c713ddc72c39c56a976cc0df0
2016-08-10 16:15:48 -07:00
Alan Viverette
35af2d8672
Merge "Use localized hour when announcing selection for accessibility" into nyc-mr1-dev
...
am: 75f7bfdc7a
Change-Id: I6173deb1ca9b8d43844db798ab58cf35e80d5890
2016-08-10 22:05:02 +00:00
Alan Viverette
fde654fb97
Use localized hour when announcing selection for accessibility
...
am: 66a8562c58
Change-Id: Ieffd33d1e33fdd38e2383396b18dce8031fb1538
2016-08-10 22:04:59 +00:00
TreeHugger Robot
75f7bfdc7a
Merge "Use localized hour when announcing selection for accessibility" into nyc-mr1-dev
2016-08-10 21:55:30 +00:00
Tim Murray
e4ff55a10a
Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev
...
am: f6fcb7b77d
Change-Id: I4abc6cd03993383c0ace610a6c70b6a72b41e065
2016-08-10 21:43:42 +00:00
Tim Murray
76ac2e7a8b
Fix exception spam in ActivityManagerService.
...
am: feb846c299
Change-Id: I0d30d351d0c5455ebf518a36991d7772e43408ef
2016-08-10 21:43:37 +00:00
TreeHugger Robot
f6fcb7b77d
Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev
2016-08-10 21:38:17 +00:00