OSDN Git Service
Jeff Sharkey [Thu, 11 Aug 2016 18:52:02 +0000 (18:52 +0000)]
Merge "Avoid caching services with missing binders."
Alexandria Cornwall [Thu, 11 Aug 2016 18:33:01 +0000 (18:33 +0000)]
Merge "AAPT2: Reorder link steps"
TreeHugger Robot [Thu, 11 Aug 2016 18:00:21 +0000 (18:00 +0000)]
Merge "Removed screen on/off callbacks from NPMS."
Andrew Sapperstein [Thu, 11 Aug 2016 17:45:48 +0000 (17:45 +0000)]
Merge "Merge "Use colorAccent for profile_button." into nyc-mr1-dev am:
f679329412 am:
099d69999f" into nyc-mr1-dev-plus-aosp
am:
58db3272a4
Change-Id: Ia92cb8901eaa723bff58ab0c6e1351d98a8d754c
Andrew Sapperstein [Thu, 11 Aug 2016 17:45:45 +0000 (17:45 +0000)]
Merge "Use colorAccent for profile_button." into nyc-mr1-dev am:
f679329412 am:
099d69999f
am:
59ef1cc1b8
Change-Id: I96fcbe21619967600d390eb6694569c555b678df
Andrew Sapperstein [Thu, 11 Aug 2016 17:45:37 +0000 (17:45 +0000)]
Merge "Use colorAccent for profile_button. am:
ae01c57cb5 am:
d4c31c0649" into nyc-mr1-dev-plus-aosp
am:
348641d972
Change-Id: Ia3a5247c1e124769b17d32b7ff1fd0de9dd301a5
Andrew Sapperstein [Thu, 11 Aug 2016 17:45:33 +0000 (17:45 +0000)]
Use colorAccent for profile_button. am:
ae01c57cb5 am:
d4c31c0649
am:
467658ddb2
Change-Id: I1530e5056d211dc9ee24539633f876d7daabc6a1
Hans Boehm [Thu, 11 Aug 2016 17:45:24 +0000 (17:45 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter" am:
d0197ac340 am:
c97c9dbd96 am:
a33407d2f8
am:
53511e1196
Change-Id: Id4486595ce42e524c7db17b09e120f132976599a
Ta-wei Yen [Thu, 11 Aug 2016 17:40:39 +0000 (17:40 +0000)]
Merge "Add API to enable/disable the visual voicemail client" into nyc-mr1-dev am:
fb6e1bf239 am:
f2cfff28a9
am:
7d8bf06c21
Change-Id: I05042b8a8c52acccab1fa71f8e578f7bfeb68664
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
Ta-wei Yen [Thu, 11 Aug 2016 17:39:34 +0000 (17:39 +0000)]
Add API to enable/disable the visual voicemail client am:
20f2ebbf4d am:
6dc3efcc16
am:
b71cea3ade
Change-Id: I8a8000e783fad884d8d8afdf32b8d240ae233cd8
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
smain@google.com [Thu, 11 Aug 2016 17:03:03 +0000 (17:03 +0000)]
add info about how to return default values from android.jar bug:
30757670 am:
abfa7e2c65 am:
7a66b70d96 am:
4b93d10f2a
am:
a2e0ff0969
Change-Id: Ie9595ab822456966acf07e7f81c89ef13103bddd
smain@google.com [Thu, 11 Aug 2016 16:58:19 +0000 (16:58 +0000)]
add info about how to return default values from android.jar bug:
30757670 am:
abfa7e2c65 am:
93d8ffc4f3
am:
bd2f5388c4
Change-Id: I581b6861901a999ef48e1a3d24764e1dc08a6864
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
Alexandria Cornwall [Thu, 11 Aug 2016 16:53:16 +0000 (09:53 -0700)]
AAPT2: Reorder link steps
AAPT2's link steps were writing the res/* files before optimizations to the
resource table were performed (such as version collapsing). This was causing
unreferenced res/* files to remain in the archive, even though they're no
longer necessary.
Bug:
30705740
Change-Id: I50d7943ef7429b14e46587093855c15d54038299
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
Felipe Leme [Wed, 10 Aug 2016 20:00:32 +0000 (13:00 -0700)]
Removed screen on/off callbacks from NPMS.
NetworkPolicyManagerService (NPMS) used to depend on screen on/off
changes to determine if a foreground activity should have network
restrictions, but such check is now redundant since ActivityManager
already changes the proper UID state (like going from TOP to
TOP_SLEEPING) when the screen status is changed.
Removing such code decreases the NPMS lock contention when the screen is
turned on in about 3-5ms.
Change-Id: I2853443efedbf14961ae9a5b2e72689d4d1a646c
BUG:
30785671
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
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
Jeff Sharkey [Tue, 10 May 2016 18:54:45 +0000 (12:54 -0600)]
Avoid caching services with missing binders.
When fetching system services early during boot, if the underlying
binder interface hasn't been published yet, we end up caching a
manager class that is broken for the remainder of the process
lifetime, and innocent downstream callers end up using the broken
cached manager.
Fix this by using an explicit exception to quickly abort manager
creation when the underlying binder is missing. The exception is
only used to skip the remainder of the manager creation, and it
doesn't actually crash the process.
Bug:
28634953
Change-Id: I0cb62261e6d6833660704b93a11185aa11a2ac97
Mikhail Naganov [Thu, 11 Aug 2016 15:29:53 +0000 (15:29 +0000)]
Merge "MIDI: Use server-side socket in blocking mode for virtual devices"
Julia Reynolds [Thu, 11 Aug 2016 14:53:28 +0000 (14:53 +0000)]
Merge "Don't run expand/collapse animations when dismissing." into nyc-mr1-dev am:
2af6932ae8 am:
b359f4dddb
am:
059e260ea3
Change-Id: Ie82167ab95b02653f166d3868748605a62366ab9
Julia Reynolds [Thu, 11 Aug 2016 14:53:24 +0000 (14:53 +0000)]
Don't run expand/collapse animations when dismissing. am:
48242f0ac6 am:
738f8c4b8d
am:
8913386d20
Change-Id: Id89f61d66a38bfa43bc3926aa836049c33bb8094
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:22:32 +0000 (13:22 +0000)]
Merge "Suppress Boot sound for non-standard scenarios." into nyc-mr1-dev am:
eed326b072 am:
ecc1996d73
am:
f863bcc1bc
Change-Id: I4f16d86f70df88a9ed9e78adfcade9e083daeff4
Geoffrey Pitsch [Thu, 11 Aug 2016 13:22:28 +0000 (13:22 +0000)]
Suppress Boot sound for non-standard scenarios. am:
290c4350ed am:
854f8cecf7
am:
9e7b3f657f
Change-Id: Id7d1cb29fa1e1a416d56b4b16a73576a458216c4
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
TreeHugger Robot [Thu, 11 Aug 2016 03:30:38 +0000 (03:30 +0000)]
Merge "Fix clang-tidy warnings in libs/hwui."
Android Build Merger (Role) [Thu, 11 Aug 2016 03:08:50 +0000 (03:08 +0000)]
Merge "Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev am:
609770d34b am:
73d8feb514 am:
647ebe7572"
Android Build Merger (Role) [Thu, 11 Aug 2016 03:08:37 +0000 (03:08 +0000)]
Merge "Make NightDisplayService robust to early alarms am:
4346f63dbf am:
49b3fbabf1 am:
f6383ac3bb"
Justin Klaassen [Thu, 11 Aug 2016 03:08:11 +0000 (03:08 +0000)]
Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev am:
609770d34b am:
73d8feb514
am:
647ebe7572
Change-Id: Ib8554ecdc1b35aad73ac7d61774d7a493f673f38
Justin Klaassen [Thu, 11 Aug 2016 03:08:08 +0000 (03:08 +0000)]
Make NightDisplayService robust to early alarms am:
4346f63dbf am:
49b3fbabf1
am:
f6383ac3bb
Change-Id: I0bc3b306313596c61e0b42a4ea0f35a13682cb4d
Bill Yi [Thu, 11 Aug 2016 03:07:48 +0000 (03:07 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Adrian Roos [Thu, 11 Aug 2016 02:51:15 +0000 (02:51 +0000)]
Merge "Only disable trust agents after lockout" into nyc-mr1-dev am:
f6487b63a1 am:
dc915e418b
am:
16d2c267cb
Change-Id: I55cc92dbefcba1188f28126fe48d60f549c735d9
Adrian Roos [Thu, 11 Aug 2016 02:51:07 +0000 (02:51 +0000)]
Only disable trust agents after lockout am:
9d6fc9246b am:
73b2f5981e
am:
bbf52f2e85
Change-Id: I4606854b24313cc8231aaa0ce3ea33ea909f68b0
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:23:05 +0000 (02:23 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev am:
927db408a2 am:
c9c0edfa14
am:
e329adfcf5
Change-Id: Idc7daa4c503b93dfe5b8e77797c513967682d5fa
Andreas Gampe [Thu, 11 Aug 2016 02:22:58 +0000 (02:22 +0000)]
Zygote: allow system server compilation to fail am:
e7bc152c20 am:
8253782f5b
am:
0d42671cc5
Change-Id: Ib811fe4631339f6edb98e9aba8b76513dc071140
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:18:32 +0000 (01:18 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev am:
262f0186bd am:
dd1d9baa55
am:
5d3db6ddcb
Change-Id: I5f77e62b60af6b9aa69c25c818e779d8ffe2618d
Christopher Tate [Thu, 11 Aug 2016 01:18:29 +0000 (01:18 +0000)]
Base date-change alarm on 24h "hour zero," not 12h am:
afa8b980ac am:
3303c26759
am:
db5188b641
Change-Id: Id83b79ed5cfd486e2314b4034662b9501008f4b9
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
TreeHugger Robot [Thu, 11 Aug 2016 01:09:18 +0000 (01:09 +0000)]
Merge "Import translations. DO NOT MERGE"
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:54:03 +0000 (00:54 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev am:
58b4623d1f am:
ffa443f431
am:
76efc13610
Change-Id: Iad1be783e840a2d01ee1bcc495fdca219f0186e1
Yin-Chia Yeh [Thu, 11 Aug 2016 00:54:01 +0000 (00:54 +0000)]
Camera: ensure lock ordering (device->session) am:
b0025e1f68 am:
de71f83c2c
am:
162c8b84b5
Change-Id: Ia2b36acc9f945c7ab838681f8ea63a6b94579207
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
TreeHugger Robot [Thu, 11 Aug 2016 00:43:55 +0000 (00:43 +0000)]
Merge "Import translations. DO NOT MERGE"
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:29:16 +0000 (00:29 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev am:
938d298116 am:
3cd67ed9d2
am:
9b39e97c0e
Change-Id: I38e06f9dd005e8445231bbd87e9a666c1753deed
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:29:11 +0000 (00:29 +0000)]
Use non-fast JNI for Canvas.native_drawBitmap. am:
bce8866506 am:
5d92aea521
am:
f88851a5f1
Change-Id: I90df07665f84932b8c6f88eacf409f60fabf8c7d
Jin Park [Tue, 9 Aug 2016 06:50:35 +0000 (15:50 +0900)]
ExifInterface: Handle test behavior
This CL corrects the compare values of lg_g4_iso_800 test file, which
was originally default values. Also, since .xml files do not handle
empty string cases, this CL adds code to treat it equal to a null
value.
Bug:
29409825
Change-Id: I26ed06a2ba689911c45885cfdaf9dfc018dfa7da
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
OSDN Git Service
