207774 Commits

Author SHA1 Message Date
Chien-Yu Chen
84551d61fd am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev
* commit '6fdab993919a1784676782ad1c67068a7f8a7fdc':
  Camera2: Handle surface size change
2015-08-19 21:02:37 +00:00
Chien-Yu Chen
6fdab99391 am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev
* commit '86d86c2e7c08a99b226820a1a5e53876d9171086':
  Camera2: Handle surface size change
2015-08-19 20:53:16 +00:00
Chien-Yu Chen
86d86c2e7c am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev
* commit 'c3aa7f3a7564f36db58d8a9a5470fd64f6fa282b':
  Camera2: Handle surface size change
2015-08-19 20:48:27 +00:00
Amith Yamasani
a79f37c31f am 6e6fbc93: am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev
* commit '6e6fbc932ac5355bc90cc1f98b38d46281b1aeaf':
  Fix crashes when removing work profile
2015-08-19 20:40:52 +00:00
Chien-Yu Chen
c3aa7f3a75 Merge "Camera2: Handle surface size change" into mnc-dr-dev 2015-08-19 20:40:11 +00:00
Amith Yamasani
6e6fbc932a am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev
* commit '7102fb5f5282b2a0c68691a434c407539e334ada':
  Fix crashes when removing work profile
2015-08-19 20:34:23 +00:00
Amith Yamasani
7102fb5f52 am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev
* commit 'e1df482c173d975923dba2d3cf644f5a0fadee17':
  Fix crashes when removing work profile
2015-08-19 20:25:26 +00:00
Amith Yamasani
e1df482c17 am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev
* commit 'e3de6c5df5a94e627c5ee0f188cbb066233a3dd0':
  Fix crashes when removing work profile
2015-08-19 20:19:28 +00:00
Amith Yamasani
e3de6c5df5 Merge "Fix crashes when removing work profile" into mnc-dev 2015-08-19 20:10:30 +00:00
Dianne Hackborn
5a1234fabf 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
2015-08-19 18:53:24 +00:00
Dianne Hackborn
81b4616f9f 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
2015-08-19 18:45:41 +00:00
Dianne Hackborn
aa8c876e1d 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
2015-08-19 18:39:56 +00:00
Dianne Hackborn
5c577bab3b 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
2015-08-19 18:31:20 +00:00
Dianne Hackborn
29cd880890 Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 2015-08-19 18:25:29 +00:00
Elliott Hughes
9a6ec5862c Move aapt2 off HAVE_MS_C_RUNTIME.
Change-Id: Iea75251bde4d8795213ea235db446065e1fea7b5
(cherry picked from commit c301ab8d6ab553ee0e641558f9fbe2f974a70e52)
2015-08-19 17:56:44 +00:00
Geoff Mendal
35090b322f 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
2015-08-19 16:30:11 +00:00
Zhentao Sun
00447eeb99 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.
2015-08-19 16:30:05 +00:00
Geoff Mendal
cdeeecb056 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
2015-08-19 16:24:41 +00:00
Zhentao Sun
4caf6b9784 am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev
* commit '880ef585ab1887bd7f95a1a668d11057d86dd964':
  Launched camera in the correct user.
2015-08-19 16:24:35 +00:00
Geoff Mendal
37aa01a34d am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '399237f825863f8d52336778debde8c54313cca2':
  Import translations. DO NOT MERGE
2015-08-19 16:18:11 +00:00
Zhentao Sun
880ef585ab am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev
* commit 'f2f0114848e5fb729bf5943a70142520f66daa4c':
  Launched camera in the correct user.
2015-08-19 16:18:06 +00:00
Geoff Mendal
399237f825 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-19 16:15:00 +00:00
Zhentao Sun
f2f0114848 Merge "Launched camera in the correct user." into mnc-dr-dev 2015-08-19 16:12:25 +00:00
Geoff Mendal
79fd5c4559 Import translations. DO NOT MERGE
Change-Id: Ibf82892f48ab6cc0b5aa3eb2460859afa8e44332
Auto-generated-cl: translation import
2015-08-19 11:00:52 -05:00
Geoff Mendal
47b04832a5 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
2015-08-19 14:27:32 +00:00
Geoff Mendal
5b9e329006 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
2015-08-19 14:20:53 +00:00
Geoff Mendal
da1404d02d am 2c6fe6c1: (-s ours) am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE
* commit '2c6fe6c1ca362411f42afc22bb4c08082d03b636':
  Import translations. DO NOT MERGE
2015-08-19 14:15:34 +00:00
Geoff Mendal
257a9a87d4 am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '81d99d47831153cfa71afaa1831b7a1e025e3069':
  Import translations. DO NOT MERGE
2015-08-19 14:15:26 +00:00
Geoff Mendal
2c6fe6c1ca am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE
* commit '0c6eba366e77daeedecdffdd4d1dcf9406d39117':
  Import translations. DO NOT MERGE
2015-08-19 14:07:53 +00:00
Geoff Mendal
81d99d4783 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-19 14:07:13 +00:00
Geoff Mendal
31a96b3716 Import translations. DO NOT MERGE
Change-Id: I13d19cb68c1b7b7880e2168e621c377c2b750b1b
Auto-generated-cl: translation import
2015-08-19 07:02:46 -07:00
Geoff Mendal
0c6eba366e am c2e81a0c: (-s ours) Import translations. DO NOT MERGE
* commit 'c2e81a0c2d95c0eee54975cb62b6c535171d74ee':
  Import translations. DO NOT MERGE
2015-08-19 14:02:25 +00:00
Geoff Mendal
c2e81a0c2d Import translations. DO NOT MERGE
Change-Id: Ifd3cfe65e9a82e21d6a1611368dcbe9d6dfee829
Auto-generated-cl: translation import
2015-08-19 06:53:44 -07:00
Jorim Jaggi
44ad8a5115 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
2015-08-19 02:42:47 +00:00
Jorim Jaggi
6ac4af0f4b am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c':
  Fix SysUI crash when no metadata is provided
2015-08-19 02:35:26 +00:00
Jorim Jaggi
8cc1abcb7f am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit 'b960e75e52176bc4edc709aba71535b32e2d9970':
  Fix SysUI crash when no metadata is provided
2015-08-19 02:27:04 +00:00
Jorim Jaggi
b960e75e52 am 8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '8b8fa3e934e3ddf01790e647b4401dc88b24bf67':
  Fix SysUI crash when no metadata is provided
2015-08-19 02:20:10 +00:00
Jorim Jaggi
42904b6553 am 43fdc250: am e6c029b4: am 27c1a728: am f610bd78: Fix race conditions for camera prewarm service
* commit '43fdc250fcfc0c86613a0be8dbb964d3380ac35c':
  Fix race conditions for camera prewarm service
2015-08-19 01:44:00 +00:00
Jorim Jaggi
caacc8ba5e 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
2015-08-19 01:43:54 +00:00
Jorim Jaggi
72964a37e0 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
2015-08-19 01:43:47 +00:00
Chris Craik
7da9d7fae6 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
2015-08-19 01:43:41 +00:00
Tenghui Zhu
b8eb9aa3dd 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
2015-08-19 01:43:36 +00:00
Quddus Chong
0b1098af3c 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.
2015-08-19 01:43:31 +00:00
Adam Lesinski
3170650a2b 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
2015-08-19 01:43:25 +00:00
Jorim Jaggi
620a31d948 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
2015-08-19 01:43:20 +00:00
Jim Miller
849b9e58d6 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.
2015-08-19 01:43:12 +00:00
Jorim Jaggi
fc010d00f3 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
2015-08-19 01:43:06 +00:00
Jim Miller
8978d9acba 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"
2015-08-19 01:43:02 +00:00
Tim Kilbourn
6041a68bab 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.
2015-08-19 01:42:57 +00:00
Roozbeh Pournader
0f3ac8944a 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."
2015-08-19 01:42:51 +00:00