OSDN Git Service
Wale Ogunwale [Thu, 11 Aug 2016 21:19:45 +0000 (21:19 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev am:
efa21a9924
am:
70d32b3d22
Change-Id: I7b235a555e585900e7949f79757d7555e277270d
Wale Ogunwale [Thu, 11 Aug 2016 21:19:10 +0000 (21:19 +0000)]
Clear WS.mDestroying on AWT.clearAnimatingFlags am:
3c0d44e633
am:
5d132bf021
Change-Id: I637742001089d128a22762411b35b5973dd604ae
Chong Zhang [Thu, 11 Aug 2016 21:18:37 +0000 (21:18 +0000)]
Some fixes for transition animation selection am:
808621ca54
am:
3d2acc1ab6
Change-Id: I0158f63b4ad154aabe0a53a8b8030ab914f76c29
Wale Ogunwale [Thu, 11 Aug 2016 21:05:48 +0000 (21:05 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev
am:
efa21a9924
Change-Id: I540bf405007052af240d58a4e390cbbbda9011e8
Wale Ogunwale [Thu, 11 Aug 2016 21:05:45 +0000 (21:05 +0000)]
Clear WS.mDestroying on AWT.clearAnimatingFlags
am:
3c0d44e633
Change-Id: I7188dc89d20ee7d96f99e0116cef0eaa4b1bcc4e
Chong Zhang [Thu, 11 Aug 2016 21:05:17 +0000 (21:05 +0000)]
Some fixes for transition animation selection
am:
808621ca54
Change-Id: I9ded235ab5d8942ba66e4dbcb769169565eb4304
Phil Weaver [Thu, 11 Aug 2016 21:04:01 +0000 (21:04 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev am:
364580d20a
am:
f933858b07
Change-Id: I22e571503489cd6300a9f475a3faca58da528883
Phil Weaver [Thu, 11 Aug 2016 21:03:28 +0000 (21:03 +0000)]
Limit capabilities of a11y gesture dispatch. am:
a8918f23c7
am:
0e97bb6c1a
Change-Id: Ibb5b330e3ffe8530c6a506311146bc3597bd512b
Phil Weaver [Thu, 11 Aug 2016 21:03:22 +0000 (21:03 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev am:
aefa892035
am:
4e1d6f439a
Change-Id: Id2fbc3ae31e60d2940be6c9fbf01147f5d3d376d
Phil Weaver [Thu, 11 Aug 2016 21:03:19 +0000 (21:03 +0000)]
Don't preserve a11y focus in hierarchy state. am:
f40ee509c6
am:
711d7260ba
Change-Id: I7b2f1b2955c279f21f8f7a5ffc7b615ddaa50ff5
Chong Zhang [Thu, 11 Aug 2016 20:55:17 +0000 (20:55 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev am:
b1dfc3e7e1
am:
c88f140ee4
Change-Id: I7889b6239c319d5f5d456c383e659b56796376e5
Chong Zhang [Thu, 11 Aug 2016 20:55:12 +0000 (20:55 +0000)]
Dump out last real used app transit type am:
60091a978f
am:
3d2bf37da1
Change-Id: Ia31640768df6a5fb05efaa4307066e7dd8c461af
Phil Weaver [Thu, 11 Aug 2016 20:53:47 +0000 (20:53 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev
am:
364580d20a
Change-Id: I84aef92197ee41a92351a32df7326fd91801e8f3
Phil Weaver [Thu, 11 Aug 2016 20:53:44 +0000 (20:53 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
a8918f23c7
Change-Id: I8c14c8b8ada7e7c53b17be2df63c14c4e0e10c83
Phil Weaver [Thu, 11 Aug 2016 20:53:40 +0000 (20:53 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev
am:
aefa892035
Change-Id: Ic2403a6e01ee7e35bc364b2f8fec5f4fcc37a24f
Phil Weaver [Thu, 11 Aug 2016 20:53:37 +0000 (20:53 +0000)]
Don't preserve a11y focus in hierarchy state.
am:
f40ee509c6
Change-Id: I14ba7354058eef6942286483b3f61ea0404135ea
Wale Ogunwale [Thu, 11 Aug 2016 20:43:26 +0000 (20:43 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev
* changes:
Clear WS.mDestroying on AWT.clearAnimatingFlags
Some fixes for transition animation selection
Chong Zhang [Thu, 11 Aug 2016 20:43:28 +0000 (20:43 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev
am:
b1dfc3e7e1
Change-Id: Iaab588bf3527920b754a2b8815d3d99ba3ce5cf7
Chong Zhang [Thu, 11 Aug 2016 20:43:27 +0000 (20:43 +0000)]
Dump out last real used app transit type
am:
60091a978f
Change-Id: Iafeb1d21ab90c9ea124bfb6911abc1ad9165895d
Chris Tate [Thu, 11 Aug 2016 20:35:48 +0000 (20:35 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev am:
dd59a27f2e
am:
949afd5eaf
Change-Id: I25f687dc7d87efd1da1bac45722b5581b0fe0683
Christopher Tate [Thu, 11 Aug 2016 20:35:43 +0000 (20:35 +0000)]
Check system & lock wallpaper backup eligibility independently am:
6172266154
am:
611afaf4ae
Change-Id: I5d8361f2854647fae86847828d58154af06618c8
Phil Weaver [Thu, 11 Aug 2016 20:35:11 +0000 (20:35 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev
Phil Weaver [Thu, 11 Aug 2016 20:34:41 +0000 (20:34 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev
TreeHugger Robot [Thu, 11 Aug 2016 20:29:41 +0000 (20:29 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev
Chris Tate [Thu, 11 Aug 2016 20:28:48 +0000 (20:28 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev
am:
dd59a27f2e
Change-Id: I9b1f2951d80832182afb11e87a9e56acb80a302b
Christopher Tate [Thu, 11 Aug 2016 20:28:44 +0000 (20:28 +0000)]
Check system & lock wallpaper backup eligibility independently
am:
6172266154
Change-Id: I1bfe06d10c1a68b23d4ba8cb4648099f482a22e5
Chris Tate [Thu, 11 Aug 2016 20:20:08 +0000 (20:20 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev
Esteban Talavera [Thu, 11 Aug 2016 19:00:40 +0000 (19:00 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev am:
fd97e7bc8c
am:
5c96b0d1ab
Change-Id: Idbb8416e0f3e20e57568a5e3d0f2cb7a202f7742
Esteban Talavera [Thu, 11 Aug 2016 19:00:37 +0000 (19:00 +0000)]
Do not toggle OEM unlock if bootloader unlocked am:
c48b20f8f1
am:
83583bd596
Change-Id: Ib8293a02ca13587154133a939c4515de1a114bd9
Esteban Talavera [Thu, 11 Aug 2016 18:54:17 +0000 (18:54 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev
am:
fd97e7bc8c
Change-Id: I383fd638d92e62a1a83d91c2088b78c6fd4bba3f
Esteban Talavera [Thu, 11 Aug 2016 18:54:14 +0000 (18:54 +0000)]
Do not toggle OEM unlock if bootloader unlocked
am:
c48b20f8f1
Change-Id: Ic42a52cc9d71aa1192de0a052efb23a625673232
TreeHugger Robot [Thu, 11 Aug 2016 18:45:25 +0000 (18:45 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev
Christopher Tate [Wed, 10 Aug 2016 23:13:14 +0000 (16:13 -0700)]
Check system & lock wallpaper backup eligibility independently
Bug
30751829
Change-Id: Ic94689dd63238449222d1aea07231d9fd29fc76d
Android Build Merger (Role) [Thu, 11 Aug 2016 17:40:10 +0000 (17:40 +0000)]
Merge "Merge "Use colorAccent for profile_button." into nyc-mr1-dev am:
f679329412 am:
099d69999f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 11 Aug 2016 17:39:59 +0000 (17:39 +0000)]
Merge "Use colorAccent for profile_button. am:
ae01c57cb5 am:
d4c31c0649" into nyc-mr1-dev-plus-aosp
Andrew Sapperstein [Thu, 11 Aug 2016 17:39:28 +0000 (17:39 +0000)]
Merge "Use colorAccent for profile_button." into nyc-mr1-dev am:
f679329412
am:
099d69999f
Change-Id: Ia99ba941445e18a9eaf085d01a8bc72064a8919b
Andrew Sapperstein [Thu, 11 Aug 2016 17:39:18 +0000 (17:39 +0000)]
Use colorAccent for profile_button. am:
ae01c57cb5
am:
d4c31c0649
Change-Id: I20c102867a05285182fe6a7e21a24ddc85d7b13e
Hans Boehm [Thu, 11 Aug 2016 17:39:16 +0000 (17:39 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter" am:
d0197ac340 am:
c97c9dbd96
am:
a33407d2f8
Change-Id: If98f629f0675a01e0c9f12eb0cd1b48f497357ce
Hans Boehm [Thu, 11 Aug 2016 17:32:34 +0000 (17:32 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter" am:
d0197ac340
am:
c97c9dbd96
Change-Id: I9ceb9f35c22e84a57e2c38f9e6fd562827ae7e0d
Andrew Sapperstein [Thu, 11 Aug 2016 17:32:33 +0000 (17:32 +0000)]
Merge "Use colorAccent for profile_button." into nyc-mr1-dev
am:
f679329412
Change-Id: Id408d5440510592bb5f6ddf7f9f96da59d5609f3
Andrew Sapperstein [Thu, 11 Aug 2016 17:32:30 +0000 (17:32 +0000)]
Use colorAccent for profile_button.
am:
ae01c57cb5
Change-Id: I8e13055e5ce1b85e5f0cf8f3d7dc16aaddc3a331
Ta-wei Yen [Thu, 11 Aug 2016 17:31:59 +0000 (17:31 +0000)]
Merge "Add API to enable/disable the visual voicemail client" into nyc-mr1-dev am:
fb6e1bf239
am:
f2cfff28a9
Change-Id: I99cd5995e348305b9e19977bf2f51edd49b50fcc
Ta-wei Yen [Thu, 11 Aug 2016 17:31:25 +0000 (17:31 +0000)]
Add API to enable/disable the visual voicemail client am:
20f2ebbf4d
am:
6dc3efcc16
Change-Id: I13bc9bd9b12732fa3a7aa5de47cba5eacc5ba092
Hans Boehm [Thu, 11 Aug 2016 17:28:07 +0000 (17:28 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter"
am:
d0197ac340
Change-Id: I077f9c190025d688af17d1a840b841cbdc4e003d
Andrew Sapperstein [Thu, 11 Aug 2016 17:27:55 +0000 (17:27 +0000)]
Merge "Use colorAccent for profile_button." into nyc-mr1-dev
Ta-wei Yen [Thu, 11 Aug 2016 17:23:51 +0000 (17:23 +0000)]
Merge "Add API to enable/disable the visual voicemail client" into nyc-mr1-dev
am:
fb6e1bf239
Change-Id: If19064840dacce88fa0b211e1b1db3894ca065ac
Ta-wei Yen [Thu, 11 Aug 2016 17:23:30 +0000 (17:23 +0000)]
Add API to enable/disable the visual voicemail client
am:
20f2ebbf4d
Change-Id: I4051b810ab020208001f726e4911df1905ef81bf
Hans Boehm [Thu, 11 Aug 2016 17:18:21 +0000 (17:18 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter"
Ta-wei Yen [Thu, 11 Aug 2016 17:15:12 +0000 (17:15 +0000)]
Merge "Add API to enable/disable the visual voicemail client" into nyc-mr1-dev
Esteban Talavera [Thu, 11 Aug 2016 10:23:40 +0000 (11:23 +0100)]
Do not toggle OEM unlock if bootloader unlocked
Bug:
30681215
Change-Id: Ia0fd55dd7b6b731d6f5733fc733621e99bd7b153
smain@google.com [Thu, 11 Aug 2016 16:54:15 +0000 (16:54 +0000)]
add info about how to return default values from android.jar bug:
30757670 am:
abfa7e2c65 am:
7a66b70d96
am:
4b93d10f2a
Change-Id: I6ad3beb287c15aa98c3548cab2724e3270563595
smain@google.com [Thu, 11 Aug 2016 16:49:59 +0000 (16:49 +0000)]
add info about how to return default values from android.jar bug:
30757670 am:
abfa7e2c65
am:
93d8ffc4f3
Change-Id: Id4301a4fb462e34428912c12ec570ddfa9010fb2
smain@google.com [Thu, 11 Aug 2016 16:48:48 +0000 (16:48 +0000)]
add info about how to return default values from android.jar bug:
30757670 am:
abfa7e2c65
am:
7a66b70d96
Change-Id: Iecbe2dc116c8004c5547690571ac35dfc546743f
smain@google.com [Thu, 11 Aug 2016 16:42:50 +0000 (16:42 +0000)]
add info about how to return default values from android.jar bug:
30757670
am:
abfa7e2c65
Change-Id: I45cdaec2d7e1b3c4bfb7b283a8ac581e2c87df95
smain@google.com [Thu, 11 Aug 2016 16:42:03 +0000 (16:42 +0000)]
add info about how to return default values from android.jar bug:
30757670
am:
abfa7e2c65
Change-Id: I60f631fa7d33bc8cd39082a8caf8dbb9f94bb47c
Wale Ogunwale [Thu, 11 Aug 2016 16:34:45 +0000 (09:34 -0700)]
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
smain@google.com [Wed, 10 Aug 2016 19:59:24 +0000 (12:59 -0700)]
add info about how to return default values from android.jar
bug:
30757670
Change-Id: I84e1624cbe7ae8d5e4e2886d4e8f61d621729464
Chong Zhang [Fri, 29 Jul 2016 20:09:40 +0000 (13:09 -0700)]
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
ec8299ca4575cb5afe96bb60082d50cb8a01c74b)
Chong Zhang [Thu, 28 Jul 2016 00:52:45 +0000 (17:52 -0700)]
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
1c93f6de2dd74dfc7ee0f52aca6e8b491ace02f9)
Julia Reynolds [Thu, 11 Aug 2016 14:45:59 +0000 (14:45 +0000)]
Merge "Don't run expand/collapse animations when dismissing." into nyc-mr1-dev am:
2af6932ae8
am:
b359f4dddb
Change-Id: I9c1bb574a27d97a01b231e2909cddb5cb9eae47b
Julia Reynolds [Thu, 11 Aug 2016 14:45:54 +0000 (14:45 +0000)]
Don't run expand/collapse animations when dismissing. am:
48242f0ac6
am:
738f8c4b8d
Change-Id: I17fec4658cbe0b35e5d3423b0bac7deecd6ba536
Julia Reynolds [Thu, 11 Aug 2016 14:37:55 +0000 (14:37 +0000)]
Merge "Don't run expand/collapse animations when dismissing." into nyc-mr1-dev
am:
2af6932ae8
Change-Id: I93c0e294c8a4e0e4c151da68be5c8e66201f1724
Julia Reynolds [Thu, 11 Aug 2016 14:37:50 +0000 (14:37 +0000)]
Don't run expand/collapse animations when dismissing.
am:
48242f0ac6
Change-Id: Id90846c9e9d505b9bbdd35cf70d071cc561b49d3
Julia Reynolds [Thu, 11 Aug 2016 14:28:47 +0000 (14:28 +0000)]
Merge "Don't run expand/collapse animations when dismissing." into nyc-mr1-dev
Geoffrey Pitsch [Thu, 11 Aug 2016 13:13:09 +0000 (13:13 +0000)]
Merge "Suppress Boot sound for non-standard scenarios." into nyc-mr1-dev am:
eed326b072
am:
ecc1996d73
Change-Id: Iac5bb29a880c7d9507e1f593cf07fcfdb053763d
Geoffrey Pitsch [Thu, 11 Aug 2016 13:13:04 +0000 (13:13 +0000)]
Suppress Boot sound for non-standard scenarios. am:
290c4350ed
am:
854f8cecf7
Change-Id: I182a77ce9fec2ae3f900a544ac4af8064240a06b
Geoffrey Pitsch [Thu, 11 Aug 2016 13:06:39 +0000 (13:06 +0000)]
Merge "Suppress Boot sound for non-standard scenarios." into nyc-mr1-dev
am:
eed326b072
Change-Id: Ifdcff520e6010f888e5d8e723cfd29cb9f2ed935
Geoffrey Pitsch [Thu, 11 Aug 2016 13:06:37 +0000 (13:06 +0000)]
Suppress Boot sound for non-standard scenarios.
am:
290c4350ed
Change-Id: I819489be834dd262de530b0ff24a2e20aafcad2d
Geoffrey Pitsch [Thu, 11 Aug 2016 12:56:42 +0000 (12:56 +0000)]
Merge "Suppress Boot sound for non-standard scenarios." into nyc-mr1-dev
Justin Klaassen [Thu, 11 Aug 2016 03:00:29 +0000 (03:00 +0000)]
Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev am:
609770d34b
am:
73d8feb514
Change-Id: Ib9e3312110548ade5108cac0a7c8b3324b6bc2c2
Justin Klaassen [Thu, 11 Aug 2016 03:00:20 +0000 (03:00 +0000)]
Make NightDisplayService robust to early alarms am:
4346f63dbf
am:
49b3fbabf1
Change-Id: I0e6038c6435883911501fab6b159c204807af18f
Hans Boehm [Thu, 11 Aug 2016 02:56:50 +0000 (19:56 -0700)]
Do not stack allocate RefBase object in AaptAssets::filter
Doing so is likely to trigger log messages in the future, and will
hinder diagnosis of other problems.
Bug:
30292538
Change-Id: I2cb8c507e43d06d4afa7e35b564416c1474c81d1
Justin Klaassen [Thu, 11 Aug 2016 02:55:36 +0000 (02:55 +0000)]
Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev
am:
609770d34b
Change-Id: I6d297a3e1714cff39b904fa9a7881e86a1c5c201
Justin Klaassen [Thu, 11 Aug 2016 02:55:33 +0000 (02:55 +0000)]
Make NightDisplayService robust to early alarms
am:
4346f63dbf
Change-Id: I0ab6422a9d3da3a673f23f3e217682710e8ae296
TreeHugger Robot [Thu, 11 Aug 2016 02:46:49 +0000 (02:46 +0000)]
Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev
Adrian Roos [Thu, 11 Aug 2016 02:44:47 +0000 (02:44 +0000)]
Merge "Only disable trust agents after lockout" into nyc-mr1-dev am:
f6487b63a1
am:
dc915e418b
Change-Id: I7b498ec9fa8ef080295bffb5eda912e5d58fa525
Adrian Roos [Thu, 11 Aug 2016 02:44:42 +0000 (02:44 +0000)]
Only disable trust agents after lockout am:
9d6fc9246b
am:
73b2f5981e
Change-Id: Idec9662345a8ed9f75605d1b5dd39f04ef488389
Adrian Roos [Thu, 11 Aug 2016 02:38:51 +0000 (02:38 +0000)]
Merge "Only disable trust agents after lockout" into nyc-mr1-dev
am:
f6487b63a1
Change-Id: Id59329047a2857697d3611cd4179dace742364c3
Adrian Roos [Thu, 11 Aug 2016 02:38:45 +0000 (02:38 +0000)]
Only disable trust agents after lockout
am:
9d6fc9246b
Change-Id: I1fd7860a5a2c452e4b3c2e3e8d1073c423c9f054
TreeHugger Robot [Thu, 11 Aug 2016 02:30:31 +0000 (02:30 +0000)]
Merge "Only disable trust agents after lockout" into nyc-mr1-dev
Andreas Gampe [Thu, 11 Aug 2016 02:16:16 +0000 (02:16 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev am:
927db408a2
am:
c9c0edfa14
Change-Id: Ief749fa39db72532fbc91d075a130751a66d11df
Andreas Gampe [Thu, 11 Aug 2016 02:16:12 +0000 (02:16 +0000)]
Zygote: allow system server compilation to fail am:
e7bc152c20
am:
8253782f5b
Change-Id: I1fc916e9db2e391975b0037853cbfda9b08c706a
Andreas Gampe [Thu, 11 Aug 2016 02:11:26 +0000 (02:11 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev
am:
927db408a2
Change-Id: I11435b1853073eca75bcff33e180fc165eb3d460
Andreas Gampe [Thu, 11 Aug 2016 02:11:21 +0000 (02:11 +0000)]
Zygote: allow system server compilation to fail
am:
e7bc152c20
Change-Id: Ibaea0c9bc3a5eb0e8a64342e4e27b7cfca21c647
TreeHugger Robot [Thu, 11 Aug 2016 02:02:08 +0000 (02:02 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev
Justin Klaassen [Mon, 8 Aug 2016 22:01:47 +0000 (15:01 -0700)]
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
Christopher Tate [Thu, 11 Aug 2016 01:12:11 +0000 (01:12 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev am:
262f0186bd
am:
dd1d9baa55
Change-Id: I69200ed34995f3ce1c1a90d18912953b525cca62
Christopher Tate [Thu, 11 Aug 2016 01:12:07 +0000 (01:12 +0000)]
Base date-change alarm on 24h "hour zero," not 12h am:
afa8b980ac
am:
3303c26759
Change-Id: I145b9c4e1de61b8b1e8b456fea39ebc0ef928c18
Christopher Tate [Thu, 11 Aug 2016 01:06:00 +0000 (01:06 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev
am:
262f0186bd
Change-Id: I5182e8474d0ed481485b58d1a6a0c447859ea5dd
Christopher Tate [Thu, 11 Aug 2016 01:05:58 +0000 (01:05 +0000)]
Base date-change alarm on 24h "hour zero," not 12h
am:
afa8b980ac
Change-Id: I4dac5d4eab675fde483ab3fe821370b02a3a8b05
Adrian Roos [Thu, 11 Aug 2016 00:09:55 +0000 (17:09 -0700)]
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
TreeHugger Robot [Thu, 11 Aug 2016 00:57:25 +0000 (00:57 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev
Yin-Chia Yeh [Thu, 11 Aug 2016 00:47:32 +0000 (00:47 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev am:
58b4623d1f
am:
ffa443f431
Change-Id: I2ee72a0857d2a4e4756727d876eed227f6e68653
Yin-Chia Yeh [Thu, 11 Aug 2016 00:47:26 +0000 (00:47 +0000)]
Camera: ensure lock ordering (device->session) am:
b0025e1f68
am:
de71f83c2c
Change-Id: I0c6addd8191c9e6ebde8b5efd066f54aaad71af5
Yin-Chia Yeh [Thu, 11 Aug 2016 00:39:28 +0000 (00:39 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
am:
58b4623d1f
Change-Id: I8c92a36230ae4b838cd06f421fdf8359e9a8a966
Yin-Chia Yeh [Thu, 11 Aug 2016 00:39:26 +0000 (00:39 +0000)]
Camera: ensure lock ordering (device->session)
am:
b0025e1f68
Change-Id: Idcb9b48274ecfe9fe2f306ae201491d1e485d601
Yin-Chia Yeh [Thu, 11 Aug 2016 00:32:13 +0000 (00:32 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:21:01 +0000 (00:21 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev am:
938d298116
am:
3cd67ed9d2
Change-Id: I43d37ca45ed9c0a6c26799cf323c72dec5228ca9
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:20:57 +0000 (00:20 +0000)]
Use non-fast JNI for Canvas.native_drawBitmap. am:
bce8866506
am:
5d92aea521
Change-Id: I5ca2535d1220c93c0bddc714542a727ec6fae93d
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:14:05 +0000 (00:14 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev
am:
938d298116
Change-Id: Ie9c4ffd766ba9965ef2287a9e5a45cbe81555c58
OSDN Git Service
