OSDN Git Service
Xiaohui Chen [Thu, 13 Aug 2015 23:20:56 +0000 (16:20 -0700)]
Clean up USER_OWNER in notifications
Bug:
19913735
Change-Id: Ib6c2ed11eee6adf062a6dff00c99e62945153f9e
Dianne Hackborn [Wed, 19 Aug 2015 19:01:16 +0000 (19:01 +0000)]
am
5a1234fa: am
81b4616f: am
aa8c876e: am
5c577bab: am
29cd8808: Merge "Fix issue #
23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '
5a1234fabf73224d107ce0715682728b35357203':
Fix issue #
23326715: Clarify --checkin/-c options in batterystats
Ben Wagner [Wed, 19 Aug 2015 19:01:04 +0000 (19:01 +0000)]
Merge "Use 'new' instead of 'SkNEW'."
Dianne Hackborn [Wed, 19 Aug 2015 18:53:24 +0000 (18:53 +0000)]
am
81b4616f: am
aa8c876e: am
5c577bab: am
29cd8808: Merge "Fix issue #
23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '
81b4616f9f8ecf1be2db999acbd8504c33201eb9':
Fix issue #
23326715: Clarify --checkin/-c options in batterystats
Dianne Hackborn [Wed, 19 Aug 2015 18:45:41 +0000 (18:45 +0000)]
am
aa8c876e: am
5c577bab: am
29cd8808: Merge "Fix issue #
23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '
aa8c876e1dd159c37fa00d7ed6f3fd228c74e30b':
Fix issue #
23326715: Clarify --checkin/-c options in batterystats
Dianne Hackborn [Wed, 19 Aug 2015 18:39:56 +0000 (18:39 +0000)]
am
5c577bab: am
29cd8808: Merge "Fix issue #
23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '
5c577bab3b4cd9bf74a09368be5d73aed627f6a5':
Fix issue #
23326715: Clarify --checkin/-c options in batterystats
Xiaohui Chen [Mon, 17 Aug 2015 23:09:02 +0000 (16:09 -0700)]
Clean up USER_OWNER reference.
Bug:
19913735
Change-Id: I441672b360fa0fff5453f72c88f9577b5cc8eecf
Dianne Hackborn [Wed, 19 Aug 2015 18:31:20 +0000 (18:31 +0000)]
am
29cd8808: Merge "Fix issue #
23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '
29cd880890825ce15a1b2da977bcb1796db6f4e3':
Fix issue #
23326715: Clarify --checkin/-c options in batterystats
Alan Viverette [Wed, 19 Aug 2015 18:30:27 +0000 (18:30 +0000)]
Merge "Ensure layout resolution occurs when relative rules are removed"
Dianne Hackborn [Wed, 19 Aug 2015 18:25:29 +0000 (18:25 +0000)]
Merge "Fix issue #
23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
Elliott Hughes [Wed, 19 Aug 2015 18:04:35 +0000 (18:04 +0000)]
am
9a6ec586: Move aapt2 off HAVE_MS_C_RUNTIME.
* commit '
9a6ec5862c8a3ef20ac46728da75d62c4c88bae4':
Move aapt2 off HAVE_MS_C_RUNTIME.
Elliott Hughes [Wed, 19 Aug 2015 17:38:36 +0000 (10:38 -0700)]
Move aapt2 off HAVE_MS_C_RUNTIME.
Change-Id: Iea75251bde4d8795213ea235db446065e1fea7b5
(cherry picked from commit
c301ab8d6ab553ee0e641558f9fbe2f974a70e52)
Derek Sollenberger [Wed, 19 Aug 2015 17:53:36 +0000 (13:53 -0400)]
Remove accidentally added old makefile
Change-Id: Id3966f1458c14b659b1b35437e6620fb8306aa83
Alan Viverette [Wed, 19 Aug 2015 17:39:18 +0000 (17:39 +0000)]
Merge "Allow ExploreByTouchHelper client to populate node/event for host"
Xiaohui Chen [Tue, 18 Aug 2015 18:04:20 +0000 (11:04 -0700)]
Clean up USER_OWNER reference in pm/Settings
Bug:
19913735
Change-Id: I538ed443b945e9cbb731520450bf5ef39882ae37
Ben Wagner [Wed, 19 Aug 2015 16:45:09 +0000 (12:45 -0400)]
Use 'new' instead of 'SkNEW'.
There isn't any good reason for Android code to be using SkNEW,
and in some places it is potentially an issue. Also, SkNEW really
should be considered private to Skia at this point.
Change-Id: I35c675bd2c45b7a65c526508c202a30e30859491
Chong Zhang [Wed, 19 Aug 2015 17:03:14 +0000 (17:03 +0000)]
Merge "Initialize visible to false to reflect the real visibility state"
Geoff Mendal [Wed, 19 Aug 2015 16:35:56 +0000 (16:35 +0000)]
am
35090b32: (-s ours) am
cdeeecb0: (-s ours) am
37aa01a3: (-s ours) am
399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
35090b322f2f198b641adb5a5af6e766b90eb1f2':
Import translations. DO NOT MERGE
Zhentao Sun [Wed, 19 Aug 2015 16:35:49 +0000 (16:35 +0000)]
am
00447eeb: am
4caf6b97: am
880ef585: am
f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev
* commit '
00447eeb99d93b135bd5ef4f7c1f6ca90000e6f7':
Launched camera in the correct user.
Geoff Mendal [Wed, 19 Aug 2015 16:30:11 +0000 (16:30 +0000)]
am
cdeeecb0: (-s ours) am
37aa01a3: (-s ours) am
399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
cdeeecb05607f302a306929c806dece0332eb182':
Import translations. DO NOT MERGE
Zhentao Sun [Wed, 19 Aug 2015 16:30:05 +0000 (16:30 +0000)]
am
4caf6b97: am
880ef585: am
f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev
* commit '
4caf6b9784d0102844f74ea65da75affc0750896':
Launched camera in the correct user.
Geoff Mendal [Wed, 19 Aug 2015 16:24:41 +0000 (16:24 +0000)]
am
37aa01a3: (-s ours) am
399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
37aa01a34da149fa893e731032fd0aee32321396':
Import translations. DO NOT MERGE
Zhentao Sun [Wed, 19 Aug 2015 16:24:35 +0000 (16:24 +0000)]
am
880ef585: am
f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev
* commit '
880ef585ab1887bd7f95a1a668d11057d86dd964':
Launched camera in the correct user.
Geoff Mendal [Wed, 19 Aug 2015 16:18:11 +0000 (16:18 +0000)]
am
399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
399237f825863f8d52336778debde8c54313cca2':
Import translations. DO NOT MERGE
Zhentao Sun [Wed, 19 Aug 2015 16:18:06 +0000 (16:18 +0000)]
am
f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev
* commit '
f2f0114848e5fb729bf5943a70142520f66daa4c':
Launched camera in the correct user.
Geoff Mendal [Wed, 19 Aug 2015 16:15:00 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 16:14:43 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Zhentao Sun [Wed, 19 Aug 2015 16:12:25 +0000 (16:12 +0000)]
Merge "Launched camera in the correct user." into mnc-dr-dev
Roshan Pius [Fri, 14 Aug 2015 19:58:08 +0000 (12:58 -0700)]
Add a new carrier config for DTMF tone gap in CDMA.
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network. Setting it to 100ms by default.
This is based on a similar set of changes for IMS calls: ag/747865.
BUG:
19118840
Change-Id: Ifb64fe406509fe7c401ad1c4b4e906d6643e327b
Geoff Mendal [Wed, 19 Aug 2015 16:00:52 +0000 (11:00 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ibf82892f48ab6cc0b5aa3eb2460859afa8e44332
Auto-generated-cl: translation import
Geoff Mendal [Wed, 19 Aug 2015 15:53:39 +0000 (10:53 -0500)]
Import translations. DO NOT MERGE
Change-Id: Idcb180e269b44fa1d28edeedf4a67b55a840c2ea
Auto-generated-cl: translation import
Ben Wagner [Wed, 19 Aug 2015 15:38:14 +0000 (15:38 +0000)]
Merge "Remove use of SkAutoSTMalloc from Android."
Ben Wagner [Wed, 19 Aug 2015 15:26:06 +0000 (11:26 -0400)]
Remove use of SkAutoSTMalloc from Android.
Skia desires to make SkTemplates.h private since the classes there
are designed only for internal use.
Change-Id: I1e05e54de9eb68e50ccd6a691889fecf34bc9cea
Alan Viverette [Wed, 19 Aug 2015 14:37:03 +0000 (14:37 +0000)]
Merge "Save and restore accessibility focus using decor view"
Geoff Mendal [Wed, 19 Aug 2015 14:32:39 +0000 (14:32 +0000)]
am
47b04832: (-s ours) am
5b9e3290: (-s ours) am
257a9a87: (-s ours) am
81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
47b04832a58ab1c52582a792c45b03d578220733':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:27:32 +0000 (14:27 +0000)]
am
5b9e3290: (-s ours) am
257a9a87: (-s ours) am
81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
5b9e3290062e4065aeb45085ea908b81c1fbe909':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:20:53 +0000 (14:20 +0000)]
am
257a9a87: (-s ours) am
81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
257a9a87d49a6bda05e9d18940152213fd156f0f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:19:28 +0000 (14:19 +0000)]
am
da1404d0: (-s ours) am
2c6fe6c1: (-s ours) am
0c6eba36: (-s ours) am
c2e81a0c: (-s ours) Import translations. DO NOT MERGE
* commit '
da1404d02d22dde2cd4e79eaed46a48e40eefe29':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:15:34 +0000 (14:15 +0000)]
am
2c6fe6c1: (-s ours) am
0c6eba36: (-s ours) am
c2e81a0c: (-s ours) Import translations. DO NOT MERGE
* commit '
2c6fe6c1ca362411f42afc22bb4c08082d03b636':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:15:26 +0000 (14:15 +0000)]
am
81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
81d99d47831153cfa71afaa1831b7a1e025e3069':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:07:53 +0000 (14:07 +0000)]
am
0c6eba36: (-s ours) am
c2e81a0c: (-s ours) Import translations. DO NOT MERGE
* commit '
0c6eba366e77daeedecdffdd4d1dcf9406d39117':
Import translations. DO NOT MERGE
Alan Viverette [Wed, 19 Aug 2015 14:07:29 +0000 (10:07 -0400)]
Save and restore accessibility focus using decor view
Also avoids potential NPE when decor view is null or has no view root.
Bug:
23316836
Change-Id: Iccf75ddc0e4c769a234f5b80bc0707631c2719a2
Geoff Mendal [Wed, 19 Aug 2015 14:07:13 +0000 (14:07 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:02:46 +0000 (07:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13d19cb68c1b7b7880e2168e621c377c2b750b1b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 19 Aug 2015 14:02:25 +0000 (14:02 +0000)]
am
c2e81a0c: (-s ours) Import translations. DO NOT MERGE
* commit '
c2e81a0c2d95c0eee54975cb62b6c535171d74ee':
Import translations. DO NOT MERGE
Ben Kwa [Wed, 19 Aug 2015 13:59:48 +0000 (13:59 +0000)]
Merge "Fix XML early-outs."
Geoff Mendal [Wed, 19 Aug 2015 13:53:44 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd3cfe65e9a82e21d6a1611368dcbe9d6dfee829
Auto-generated-cl: translation import
Derek Sollenberger [Wed, 19 Aug 2015 13:10:40 +0000 (13:10 +0000)]
Merge "Add ninePatch support to Canvas.h"
Geoff Mendal [Wed, 19 Aug 2015 12:53:52 +0000 (12:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 19 Aug 2015 12:50:29 +0000 (05:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I94432e596e46517d184b195e388af9ace8ac82dc
Auto-generated-cl: translation import
Geoff Mendal [Wed, 19 Aug 2015 12:34:40 +0000 (12:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 19 Aug 2015 12:32:43 +0000 (05:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic7efed73c357ab804e18094702e7f0ca29bcff66
Auto-generated-cl: translation import
Geoff Mendal [Wed, 19 Aug 2015 12:07:32 +0000 (05:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c57278b5b481e1e737f38b8361ef362ed3f83d4
Auto-generated-cl: translation import
Jorim Jaggi [Wed, 19 Aug 2015 03:10:27 +0000 (03:10 +0000)]
am
44ad8a51: am
6ac4af0f: am
8cc1abcb: am
b960e75e: am
8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '
44ad8a51158e2712f2400276cdf8faacb4c1454b':
Fix SysUI crash when no metadata is provided
Jorim Jaggi [Wed, 19 Aug 2015 03:09:27 +0000 (03:09 +0000)]
am
42904b65: am
43fdc250: am
e6c029b4: am
27c1a728: am
f610bd78: Fix race conditions for camera prewarm service
* commit '
42904b65535430732f05ddf7271b1da83e5f2f0a':
Fix race conditions for camera prewarm service
Jorim Jaggi [Wed, 19 Aug 2015 03:04:01 +0000 (20:04 -0700)]
"resolved conflicts for merge of
caacc8ba to master"
Change-Id: I7904ac66ded45c3173af14d2940dc8210088e387
Jorim Jaggi [Wed, 19 Aug 2015 02:42:47 +0000 (02:42 +0000)]
am
6ac4af0f: am
8cc1abcb: am
b960e75e: am
8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '
6ac4af0f4b31d3e33863263509d5a05bfc84d273':
Fix SysUI crash when no metadata is provided
Jorim Jaggi [Wed, 19 Aug 2015 02:35:26 +0000 (02:35 +0000)]
am
8cc1abcb: am
b960e75e: am
8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '
8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c':
Fix SysUI crash when no metadata is provided
Chong Zhang [Wed, 19 Aug 2015 02:21:47 +0000 (19:21 -0700)]
Initialize visible to false to reflect the real visibility state
So that ensureActivitiesVisibleLocked() doesn't skip the set visible
code for other apps in freeform stack.
bug:
22984782
Change-Id: Icbad7677f23ce788729c084e72d8757d5ae41188
Jorim Jaggi [Wed, 19 Aug 2015 02:27:04 +0000 (02:27 +0000)]
am
b960e75e: am
8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '
b960e75e52176bc4edc709aba71535b32e2d9970':
Fix SysUI crash when no metadata is provided
Jorim Jaggi [Wed, 19 Aug 2015 02:22:40 +0000 (02:22 +0000)]
am
72964a37: am
1dc1c93b: am
caa6cb3a: am
394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
* commit '
72964a37e090b17d8dabb05cc7f779237a5f3572':
Fix race condition for doze mode and wake-and-unlocking
Chris Craik [Wed, 19 Aug 2015 02:22:33 +0000 (02:22 +0000)]
am
7da9d7fa: am
9c45aa8f: am
ca3c865d: am
892768fb: am
0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '
7da9d7fae673473a3a24d3ff0127bd0c67f70337':
Constrain drawBitmap matrix-to-rect optimization
Tenghui Zhu [Wed, 19 Aug 2015 02:22:26 +0000 (02:22 +0000)]
am
b8eb9aa3: am
23cee7ca: am
a2de2177: am
df23f371: am
c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
* commit '
b8eb9aa3dd7869e242c9bf240318aacefc1cff25':
Add some bookmarks to plugin-for-gradle page
Quddus Chong [Wed, 19 Aug 2015 02:22:19 +0000 (02:22 +0000)]
am
0b1098af: am
b696779a: am
dd8ccccd: am
f17a4f42: am
54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev
* commit '
0b1098af3ccac2cde28089c00c3cdd69cd0661dd':
docs: Updated hardware system images for M.
Adam Lesinski [Wed, 19 Aug 2015 02:22:12 +0000 (02:22 +0000)]
am
3170650a: am
56df15d3: am
5b3a38e0: am
bda9b324: am
886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '
3170650a2b611f175e401634436c650a56d957e9':
Change default cellular activity timeout to 10
Jorim Jaggi [Wed, 19 Aug 2015 02:22:06 +0000 (02:22 +0000)]
am
620a31d9: am
40c75831: am
b7f482ab: am
ee2cfe48: Only call authenticate when we are not listening yet
* commit '
620a31d948bba714c309c3bb5abba7733eee0fe5':
Only call authenticate when we are not listening yet
Jim Miller [Wed, 19 Aug 2015 02:21:58 +0000 (02:21 +0000)]
am
849b9e58: am
ce6fb7bb: am
7ef77271: am
bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit '
849b9e58d6775a393f7d86a6305b658c6af9d16f':
Reset fingerprint lockout timer when strong auth is used.
Jorim Jaggi [Wed, 19 Aug 2015 02:21:52 +0000 (02:21 +0000)]
am
fc010d00: am
1d9a8c58: am
2591d6ff: am
358fcc79: Do not start with a black frame in bootanimation
* commit '
fc010d00f3d98e0fa35e9dc32f8c07354b12cbb7':
Do not start with a black frame in bootanimation
Jim Miller [Wed, 19 Aug 2015 02:21:46 +0000 (02:21 +0000)]
am
8978d9ac: am
309fef16: am
e11fbc08: am
33a5c807: resolved conflicts for merge of
448216e7 to mnc-dr-dev
* commit '
8978d9acbaaa89be3c14ed758e7c8a8d06071779':
Revert "Disable fingerprint when remotely reset by DPM"
Tim Kilbourn [Wed, 19 Aug 2015 02:21:39 +0000 (02:21 +0000)]
am
6041a68b: am
458d4d6d: am
9b1fd822: am
2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
* commit '
6041a68babcc0ec9cc2009fcfe75848882661785':
Use init to write usb typec props.
Roozbeh Pournader [Wed, 19 Aug 2015 02:21:30 +0000 (02:21 +0000)]
am
0f3ac894: am
c91b67ad: am
31a536e1: am
57928364: am
53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
* commit '
0f3ac8944a712f087041d088d82eaa53b1a7b47b':
Revert "Create a special CONSTRAINED font bucket in frameworks."
Dianne Hackborn [Wed, 19 Aug 2015 02:21:23 +0000 (02:21 +0000)]
am
1559f1c5: am
217d4568: am
8100b3fa: am
4439dcdc: am
af75c17b: Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
* commit '
1559f1c5a0a4db23b8338b8c4792dcb351c541f8':
Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
Jorim Jaggi [Wed, 19 Aug 2015 02:20:10 +0000 (02:20 +0000)]
am
8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '
8b8fa3e934e3ddf01790e647b4401dc88b24bf67':
Fix SysUI crash when no metadata is provided
Jorim Jaggi [Wed, 19 Aug 2015 01:44:00 +0000 (01:44 +0000)]
am
43fdc250: am
e6c029b4: am
27c1a728: am
f610bd78: Fix race conditions for camera prewarm service
* commit '
43fdc250fcfc0c86613a0be8dbb964d3380ac35c':
Fix race conditions for camera prewarm service
Jorim Jaggi [Wed, 19 Aug 2015 01:43:54 +0000 (01:43 +0000)]
am
f10e475d: am
ebcd9d55: am
0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
* commit '
f10e475d85a584e07bf74cc4d47ee4176ed543f8':
Improve motion for wake-and-unlocking while pulsing
Jorim Jaggi [Wed, 19 Aug 2015 01:43:47 +0000 (01:43 +0000)]
am
1dc1c93b: am
caa6cb3a: am
394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
* commit '
1dc1c93b9347380064c183398bb0441d99a33bf3':
Fix race condition for doze mode and wake-and-unlocking
Chris Craik [Wed, 19 Aug 2015 01:43:41 +0000 (01:43 +0000)]
am
9c45aa8f: am
ca3c865d: am
892768fb: am
0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '
9c45aa8f0db8e3c5370172018e162b7ecaf9ea4a':
Constrain drawBitmap matrix-to-rect optimization
Tenghui Zhu [Wed, 19 Aug 2015 01:43:36 +0000 (01:43 +0000)]
am
23cee7ca: am
a2de2177: am
df23f371: am
c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
* commit '
23cee7cab2164eaa72f018de6ad9c141c03ed203':
Add some bookmarks to plugin-for-gradle page
Quddus Chong [Wed, 19 Aug 2015 01:43:31 +0000 (01:43 +0000)]
am
b696779a: am
dd8ccccd: am
f17a4f42: am
54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev
* commit '
b696779a540c6a5ce70d3f43705882d3587023f4':
docs: Updated hardware system images for M.
Adam Lesinski [Wed, 19 Aug 2015 01:43:25 +0000 (01:43 +0000)]
am
56df15d3: am
5b3a38e0: am
bda9b324: am
886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '
56df15d3b41e6599e174da92352d85d11f9155ee':
Change default cellular activity timeout to 10
Jorim Jaggi [Wed, 19 Aug 2015 01:43:20 +0000 (01:43 +0000)]
am
40c75831: am
b7f482ab: am
ee2cfe48: Only call authenticate when we are not listening yet
* commit '
40c758316302851a99cf6e285ed7b06497ac36f9':
Only call authenticate when we are not listening yet
Jim Miller [Wed, 19 Aug 2015 01:43:12 +0000 (01:43 +0000)]
am
ce6fb7bb: am
7ef77271: am
bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit '
ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034':
Reset fingerprint lockout timer when strong auth is used.
Jorim Jaggi [Wed, 19 Aug 2015 01:43:06 +0000 (01:43 +0000)]
am
1d9a8c58: am
2591d6ff: am
358fcc79: Do not start with a black frame in bootanimation
* commit '
1d9a8c58d8a68027eec950875700550600e3e46b':
Do not start with a black frame in bootanimation
Jim Miller [Wed, 19 Aug 2015 01:43:02 +0000 (01:43 +0000)]
am
309fef16: am
e11fbc08: am
33a5c807: resolved conflicts for merge of
448216e7 to mnc-dr-dev
* commit '
309fef16e1494c80a54cbd0a59a98f32c512f845':
Revert "Disable fingerprint when remotely reset by DPM"
Tim Kilbourn [Wed, 19 Aug 2015 01:42:57 +0000 (01:42 +0000)]
am
458d4d6d: am
9b1fd822: am
2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
* commit '
458d4d6d7fa8d4e76674a32c240bdbd7701a86dc':
Use init to write usb typec props.
Roozbeh Pournader [Wed, 19 Aug 2015 01:42:51 +0000 (01:42 +0000)]
am
c91b67ad: am
31a536e1: am
57928364: am
53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
* commit '
c91b67adba14e596dbe86a57a2e907f3e360aa79':
Revert "Create a special CONSTRAINED font bucket in frameworks."
Dianne Hackborn [Wed, 19 Aug 2015 01:42:45 +0000 (01:42 +0000)]
am
217d4568: am
8100b3fa: am
4439dcdc: am
af75c17b: Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
* commit '
217d45685f176c7a2584b32a484c644f9f921265':
Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
Jorim Jaggi [Wed, 19 Aug 2015 01:33:49 +0000 (18:33 -0700)]
Fix SysUI crash when no metadata is provided
Bug:
23327474
Change-Id: I4903c0812c9677e1b31e1f645e3d6f1a03150c38
Jorim Jaggi [Wed, 19 Aug 2015 01:33:57 +0000 (01:33 +0000)]
am
e6c029b4: am
27c1a728: am
f610bd78: Fix race conditions for camera prewarm service
* commit '
e6c029b48d18524dbc107939bb28e8efe46bfb34':
Fix race conditions for camera prewarm service
Jorim Jaggi [Wed, 19 Aug 2015 01:33:52 +0000 (01:33 +0000)]
am
ebcd9d55: am
0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
* commit '
ebcd9d558f1d9e17b5b04d96b816dffb2d8c8d13':
Improve motion for wake-and-unlocking while pulsing
Jorim Jaggi [Wed, 19 Aug 2015 01:33:46 +0000 (01:33 +0000)]
am
caa6cb3a: am
394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
* commit '
caa6cb3a2f8118df6e14862b5977d82b32771775':
Fix race condition for doze mode and wake-and-unlocking
Chris Craik [Wed, 19 Aug 2015 01:33:04 +0000 (01:33 +0000)]
am
ca3c865d: am
892768fb: am
0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '
ca3c865da2df561f675ff4faf92e0e9b4c97ef2d':
Constrain drawBitmap matrix-to-rect optimization
Tenghui Zhu [Wed, 19 Aug 2015 01:32:58 +0000 (01:32 +0000)]
am
a2de2177: am
df23f371: am
c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
* commit '
a2de21777d26be659fe6425e9713119836634955':
Add some bookmarks to plugin-for-gradle page
Quddus Chong [Wed, 19 Aug 2015 01:32:52 +0000 (01:32 +0000)]
am
dd8ccccd: am
f17a4f42: am
54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev
* commit '
dd8ccccd839f2e21b08ba9320d35a0b0757bce2c':
docs: Updated hardware system images for M.
Adam Lesinski [Wed, 19 Aug 2015 01:32:46 +0000 (01:32 +0000)]
am
5b3a38e0: am
bda9b324: am
886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '
5b3a38e07dcdbae03f13a55d91a8936996ddc9cf':
Change default cellular activity timeout to 10
Jorim Jaggi [Wed, 19 Aug 2015 01:32:40 +0000 (01:32 +0000)]
am
b7f482ab: am
ee2cfe48: Only call authenticate when we are not listening yet
* commit '
b7f482ab41f3c50d2765c53db8b4e79f4e1b7903':
Only call authenticate when we are not listening yet
Jim Miller [Wed, 19 Aug 2015 01:32:24 +0000 (01:32 +0000)]
am
7ef77271: am
bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit '
7ef772713fac5d7b69874f2b972cdec7a60f074b':
Reset fingerprint lockout timer when strong auth is used.
Jorim Jaggi [Wed, 19 Aug 2015 01:32:06 +0000 (01:32 +0000)]
am
2591d6ff: am
358fcc79: Do not start with a black frame in bootanimation
* commit '
2591d6ffc60505df0099069877f7913ec30e4460':
Do not start with a black frame in bootanimation
Jim Miller [Wed, 19 Aug 2015 01:31:58 +0000 (01:31 +0000)]
am
e11fbc08: am
33a5c807: resolved conflicts for merge of
448216e7 to mnc-dr-dev
* commit '
e11fbc08a340cb069c8034b7ffd794c32344d4ba':
Revert "Disable fingerprint when remotely reset by DPM"
Tim Kilbourn [Wed, 19 Aug 2015 01:31:53 +0000 (01:31 +0000)]
am
9b1fd822: am
2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
* commit '
9b1fd822d07a5e3c270b76b197bec7ebfadb250d':
Use init to write usb typec props.
OSDN Git Service
