OSDN Git Service

android-x86/frameworks-base.git
8 years agoam b8eb9aa3: am 23cee7ca: am a2de2177: am df23f371: am c9ecc985: Merge "Add some...
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

8 years agoam 0b1098af: am b696779a: am dd8ccccd: am f17a4f42: am 54bdb2e7: Merge "docs: Updated...
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.

8 years agoam 3170650a: am 56df15d3: am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change defaul...
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

8 years agoam 620a31d9: am 40c75831: am b7f482ab: am ee2cfe48: Only call authenticate when we...
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

8 years agoam 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout...
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.

8 years agoam fc010d00: am 1d9a8c58: am 2591d6ff: am 358fcc79: Do not start with a black frame...
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

8 years agoam 8978d9ac: am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge...
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"

8 years agoam 6041a68b: am 458d4d6d: am 9b1fd822: am 2ad94499: Merge "Use init to write usb...
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.

8 years agoam 0f3ac894: am c91b67ad: am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Creat...
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."

8 years agoam 1559f1c5: am 217d4568: am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878...
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

8 years agoam 23cee7ca: am a2de2177: am df23f371: am c9ecc985: Merge "Add some bookmarks to...
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

8 years agoam b696779a: am dd8ccccd: am f17a4f42: am 54bdb2e7: Merge "docs: Updated hardware...
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.

8 years agoam 56df15d3: am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular...
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

8 years agoam 40c75831: am b7f482ab: am ee2cfe48: Only call authenticate when we are not listeni...
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

8 years agoam ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when...
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.

8 years agoam 1d9a8c58: am 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimation
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

8 years agoam 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to...
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"

8 years agoam 458d4d6d: am 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props....
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.

8 years agoam c91b67ad: am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special...
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."

8 years agoam 217d4568: am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in Usage...
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

8 years agoam a2de2177: am df23f371: am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle...
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

8 years agoam dd8ccccd: am f17a4f42: am 54bdb2e7: Merge "docs: Updated hardware system images...
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.

8 years agoam 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeou...
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

8 years agoam b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet
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

8 years agoam 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth...
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.

8 years agoam 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimation
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

8 years agoam e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
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"

8 years agoam 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
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.

8 years agoam 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED...
Roozbeh Pournader [Wed, 19 Aug 2015 01:31:43 +0000 (01:31 +0000)]
am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

* commit '31a536e117ff750b49350d5dc7268239bfc2ff36':
  Revert "Create a special CONSTRAINED font bucket in frameworks."

8 years agoam 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService...
Dianne Hackborn [Wed, 19 Aug 2015 01:31:27 +0000 (01:31 +0000)]
am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit '8100b3fa8be63b5c3525997b35d216edfc0cd7e7':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

8 years agoam df23f371: am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into...
Tenghui Zhu [Wed, 19 Aug 2015 00:59:19 +0000 (00:59 +0000)]
am df23f371: am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev

* commit 'df23f37105747918921099e7618b4071358fac92':
  Add some bookmarks to plugin-for-gradle page

8 years agoam f17a4f42: am 54bdb2e7: Merge "docs: Updated hardware system images for M." into...
Quddus Chong [Wed, 19 Aug 2015 00:59:15 +0000 (00:59 +0000)]
am f17a4f42: am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev

* commit 'f17a4f4257d8e18439ba894435ba2d112e757753':
  docs: Updated hardware system images for M.

8 years agoam bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10"...
Adam Lesinski [Wed, 19 Aug 2015 00:59:10 +0000 (00:59 +0000)]
am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit 'bda9b324c88b70514109f2d9ffc937ca3202fd03':
  Change default cellular activity timeout to 10

8 years agoam ee2cfe48: Only call authenticate when we are not listening yet
Jorim Jaggi [Wed, 19 Aug 2015 00:59:06 +0000 (00:59 +0000)]
am ee2cfe48: Only call authenticate when we are not listening yet

* commit 'ee2cfe48d4fb36906c59c2ae545808dba01f90d8':
  Only call authenticate when we are not listening yet

8 years agoam c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
Tenghui Zhu [Wed, 19 Aug 2015 00:53:52 +0000 (00:53 +0000)]
am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev

* commit 'c9ecc985947462e3032fdd3b1c6abc0d5b5b1084':
  Add some bookmarks to plugin-for-gradle page

8 years agoam 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev
Quddus Chong [Wed, 19 Aug 2015 00:53:39 +0000 (00:53 +0000)]
am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev

* commit '54bdb2e732de98ae2829101570dc29970e377fa3':
  docs: Updated hardware system images for M.

8 years agoam 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
Adam Lesinski [Wed, 19 Aug 2015 00:53:35 +0000 (00:53 +0000)]
am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
  Change default cellular activity timeout to 10

8 years agoMerge "Fix trigger sensor lifecycle"
Jorim Jaggi [Wed, 19 Aug 2015 00:52:00 +0000 (00:52 +0000)]
Merge "Fix trigger sensor lifecycle"

8 years agoOnly call authenticate when we are not listening yet
Jorim Jaggi [Tue, 18 Aug 2015 22:25:09 +0000 (15:25 -0700)]
Only call authenticate when we are not listening yet

Bug: 23304421
Change-Id: I5c589ba8992039ca995138d7d74abd123b911a5c

8 years agoMerge "Trace scanDirLI()"
Yusuke Sato [Wed, 19 Aug 2015 00:51:15 +0000 (00:51 +0000)]
Merge "Trace scanDirLI()"

8 years agoTrace scanDirLI()
Yusuke Sato [Wed, 19 Aug 2015 00:23:22 +0000 (17:23 -0700)]
Trace scanDirLI()

Change-Id: I3761b4991d45684e9b712c5870bcacd08dc806de

8 years agoFix trigger sensor lifecycle
Jorim Jaggi [Tue, 18 Aug 2015 02:04:54 +0000 (19:04 -0700)]
Fix trigger sensor lifecycle

Make sure the mRegistered flag is updated early enough, so we don't
call cancel if we are not registered.

Bug: 23105138
Change-Id: I1feeab9ea3d0ca31eb5deaab97f6de2cfc4c3b3d

8 years agoMerge "Restore recent task to freeform space when resizing"
Chong Zhang [Tue, 18 Aug 2015 23:55:07 +0000 (23:55 +0000)]
Merge "Restore recent task to freeform space when resizing"

8 years agoam bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into...
Jim Miller [Tue, 18 Aug 2015 23:18:36 +0000 (23:18 +0000)]
am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev

* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
  Reset fingerprint lockout timer when strong auth is used.

8 years agoMerge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
Tenghui Zhu [Tue, 18 Aug 2015 23:13:12 +0000 (23:13 +0000)]
Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev

8 years agoMerge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
Jim Miller [Tue, 18 Aug 2015 23:12:18 +0000 (23:12 +0000)]
Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev

8 years agoMerge "Remove driver stop delay config as it is no longer used"
Mitchell Wills [Tue, 18 Aug 2015 22:55:30 +0000 (22:55 +0000)]
Merge "Remove driver stop delay config as it is no longer used"

8 years agoam efb71f44: am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handl...
Tao Bao [Tue, 18 Aug 2015 22:46:26 +0000 (22:46 +0000)]
am efb71f44: am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."

* commit 'efb71f442c6dbdb75113d29df49106217f22cea3':
  Recursively delete directories in handleAftermath().

8 years agoam 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."
Tao Bao [Tue, 18 Aug 2015 22:41:34 +0000 (22:41 +0000)]
am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."

* commit '2e3746abc7d70dd72f60a7912cd45472f3032acb':
  Recursively delete directories in handleAftermath().

8 years agoam 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."
Tao Bao [Tue, 18 Aug 2015 22:32:48 +0000 (22:32 +0000)]
am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."

* commit '9bcb0fcc217e35f8290ee5f283fae86a6306ab25':
  Recursively delete directories in handleAftermath().

8 years agoRestore recent task to freeform space when resizing
Chong Zhang [Tue, 18 Aug 2015 20:50:26 +0000 (13:50 -0700)]
Restore recent task to freeform space when resizing

bug: 22984782
Change-Id: I95b7b7b4871865102a279e529f068479e9b5df34

8 years agoMerge "Recursively delete directories in handleAftermath()."
Tao Bao [Tue, 18 Aug 2015 22:26:16 +0000 (22:26 +0000)]
Merge "Recursively delete directories in handleAftermath()."

8 years agoMerge "docs: Updated hardware system images for M." into mnc-dev
Quddus Chong [Tue, 18 Aug 2015 22:03:21 +0000 (22:03 +0000)]
Merge "docs: Updated hardware system images for M." into mnc-dev

8 years agodocs: Updated hardware system images for M.
Quddus Chong [Tue, 18 Aug 2015 19:59:24 +0000 (12:59 -0700)]
docs: Updated hardware system images for M.

Change-Id: Ied1658cd2c3052e4c6cf23aa18b65b291d03dbc6

8 years agoMerge "Added am command for test docked stack resizing."
Wale Ogunwale [Tue, 18 Aug 2015 21:38:00 +0000 (21:38 +0000)]
Merge "Added am command for test docked stack resizing."

8 years agoMerge "Added support for docked stack"
Wale Ogunwale [Tue, 18 Aug 2015 21:23:46 +0000 (21:23 +0000)]
Merge "Added support for docked stack"

8 years agoMerge "Show guest notification on each user switch"
Fyodor Kupolov [Tue, 18 Aug 2015 21:16:22 +0000 (21:16 +0000)]
Merge "Show guest notification on each user switch"

8 years agoRecursively delete directories in handleAftermath().
Tao Bao [Tue, 18 Aug 2015 19:37:02 +0000 (12:37 -0700)]
Recursively delete directories in handleAftermath().

RecoverySystem.handleAftermath() is called to clean up recovery-related
files. It needs to handle non-empty directories as well such as leftover
stashes from failed OTAs.

Bug: 23199081
Change-Id: I33fb326d376d04c793ad7b5948a10e8c1c572812

8 years agoMerge "Change default cellular activity timeout to 10" into mnc-dev
Adam Lesinski [Tue, 18 Aug 2015 20:43:34 +0000 (20:43 +0000)]
Merge "Change default cellular activity timeout to 10" into mnc-dev

8 years agoam 358fcc79: Do not start with a black frame in bootanimation
Jorim Jaggi [Tue, 18 Aug 2015 20:33:08 +0000 (20:33 +0000)]
am 358fcc79: Do not start with a black frame in bootanimation

* commit '358fcc795ea567ba086a460c587de427507fefdd':
  Do not start with a black frame in bootanimation

8 years agoDo not start with a black frame in bootanimation
Jorim Jaggi [Wed, 12 Aug 2015 03:23:56 +0000 (20:23 -0700)]
Do not start with a black frame in bootanimation

Bug: 23128307
Change-Id: I0ec044f983c1c30960be046e43a882c63205dc5f

8 years agoMerge "Make VolumeDialog respect the mouse cursor."
Jun Mukai [Tue, 18 Aug 2015 20:24:44 +0000 (20:24 +0000)]
Merge "Make VolumeDialog respect the mouse cursor."

8 years agoam 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
Jim Miller [Tue, 18 Aug 2015 20:15:10 +0000 (20:15 +0000)]
am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev

* commit '33a5c80773b7b2913c92fec170787499a453d184':
  Revert "Disable fingerprint when remotely reset by DPM"

8 years agoresolved conflicts for merge of 448216e7 to mnc-dr-dev
Jim Miller [Tue, 18 Aug 2015 20:07:25 +0000 (13:07 -0700)]
resolved conflicts for merge of 448216e7 to mnc-dr-dev

Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5

8 years agoam 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
Tim Kilbourn [Tue, 18 Aug 2015 20:02:47 +0000 (20:02 +0000)]
am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev

* commit '2ad94499697d79dc41489ab873527411f88b3f15':
  Use init to write usb typec props.

8 years agoReset fingerprint lockout timer when strong auth is used.
Jim Miller [Thu, 13 Aug 2015 03:30:34 +0000 (20:30 -0700)]
Reset fingerprint lockout timer when strong auth is used.

Fixes bug 22565462

Change-Id: I4842877839845e7fe103396d8ca8104928568c04

8 years agoMerge "Use init to write usb typec props." into mnc-dr-dev
Tim Kilbourn [Tue, 18 Aug 2015 19:54:46 +0000 (19:54 +0000)]
Merge "Use init to write usb typec props." into mnc-dr-dev

8 years agoam 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket...
Roozbeh Pournader [Tue, 18 Aug 2015 19:44:49 +0000 (19:44 +0000)]
am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

* commit '579283647e110538651fa812ceb15bc7f44e50a8':
  Revert "Create a special CONSTRAINED font bucket in frameworks."

8 years agoShow guest notification on each user switch
Fyodor Kupolov [Tue, 18 Aug 2015 19:41:52 +0000 (12:41 -0700)]
Show guest notification on each user switch

Change-Id: I572ee347a4059789a67f6da4da008a293bcb3596

8 years agoam 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks...
Roozbeh Pournader [Tue, 18 Aug 2015 19:37:16 +0000 (19:37 +0000)]
am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

* commit '53c38c8819e2497f8272e7615d34aaa4ae052adf':
  Revert "Create a special CONSTRAINED font bucket in frameworks."

8 years agoMerge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev
Jim Miller [Tue, 18 Aug 2015 19:32:01 +0000 (19:32 +0000)]
Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev

8 years agoMerge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
Roozbeh Pournader [Tue, 18 Aug 2015 19:29:47 +0000 (19:29 +0000)]
Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

8 years agoMerge "Some QS refactoring"
Jason Monk [Tue, 18 Aug 2015 19:24:33 +0000 (19:24 +0000)]
Merge "Some QS refactoring"

8 years agoSome QS refactoring
Jason Monk [Tue, 18 Aug 2015 18:53:06 +0000 (14:53 -0400)]
Some QS refactoring

Get the bit about tiles out into its own place.  This will make it
easier to experiment with new layouts, and to hide/show other elements
as necessary without lots of layout work.

Change-Id: I32752df1881e4e3c693730284f8608102abdc04b

8 years agoRevert "Create a special CONSTRAINED font bucket in frameworks."
Roozbeh Pournader [Tue, 18 Aug 2015 19:17:13 +0000 (12:17 -0700)]
Revert "Create a special CONSTRAINED font bucket in frameworks."

This reverts commit 9e21eced5efacd605036be599d96974964deb09b.

Bug: 22929087

8 years agoChange default cellular activity timeout to 10
Adam Lesinski [Tue, 18 Aug 2015 18:47:07 +0000 (11:47 -0700)]
Change default cellular activity timeout to 10

LTE radios take 10 seconds to power down, so we should set the
activity timeout to 10 seconds.

Bug:23294704
Change-Id: I7478b77f134b0fe2d82e39acd5c370add12735ca

8 years agoam 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running...
Dianne Hackborn [Tue, 18 Aug 2015 18:41:51 +0000 (18:41 +0000)]
am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit '4439dcdc395a9c173df1ddcf64c510eed5face07':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

8 years agoam af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManageme...
Dianne Hackborn [Tue, 18 Aug 2015 18:33:25 +0000 (18:33 +0000)]
am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit 'af75c17bca8b2f017e254131393cd72e2fe7c6e8':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

8 years agoAdded am command for test docked stack resizing.
Wale Ogunwale [Sun, 16 Aug 2015 04:10:14 +0000 (21:10 -0700)]
Added am command for test docked stack resizing.

Change-Id: I79f88d4dea4ed87336f9859b9d655cbf5466dbe0

8 years agoAdded support for docked stack
Wale Ogunwale [Fri, 14 Aug 2015 18:05:30 +0000 (11:05 -0700)]
Added support for docked stack

Docked stacks occupy a dedicated region on a display.
When a docked stack is present all other static stacks bounds
are restricted to the region of the screen not occupied by
the docked stack.

Change-Id: I6aec3aa19c41a7e756375002f3a925977b5533b5

8 years agoFix issue #23270878: NPE in UsageStatsService while running UserManagementTest
Dianne Hackborn [Tue, 18 Aug 2015 18:08:10 +0000 (11:08 -0700)]
Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a

8 years agoRemove driver stop delay config as it is no longer used
Mitchell Wills [Thu, 6 Aug 2015 00:10:25 +0000 (17:10 -0700)]
Remove driver stop delay config as it is no longer used

Bug: 22808676
Change-Id: I5c29a6d024cc34514876e56a349b496a2f734c8f

8 years agoClean up USER_OWNER in AccountManager
Xiaohui Chen [Fri, 14 Aug 2015 16:28:07 +0000 (09:28 -0700)]
Clean up USER_OWNER in AccountManager

Refactor copyAccountUser to take an explicit user handle instead of
hardcode to owner.  This requires refactoring one app that uses this
Api.

Bug: 19913735
Change-Id: Ib9b11d8155bea2a58974d09ec2d70bc756d46313

8 years agoMerge "Add @SmallTest for continuous tests."
Seigo Nonaka [Tue, 18 Aug 2015 17:37:36 +0000 (17:37 +0000)]
Merge "Add @SmallTest for continuous tests."

8 years agoMerge "Add comment to argument in MtpDocumentsProvider#openDocumentThumbnail."
Steve McKay [Tue, 18 Aug 2015 17:13:46 +0000 (17:13 +0000)]
Merge "Add comment to argument in MtpDocumentsProvider#openDocumentThumbnail."

8 years agoAdd @SmallTest for continuous tests.
Seigo Nonaka [Tue, 18 Aug 2015 17:11:07 +0000 (10:11 -0700)]
Add @SmallTest for continuous tests.

The target unit test is introduced by
I01f5fafbbcfe3e3f5313829162ec011eaf2ad991 but it lacks @SmallTest
annotation which is necessary for continuous unit tests.

Bug: 22285167
Change-Id: I75235f26fe7a3baffbc60222bd9485ade85e13e8

8 years agoMerge "Rename fullscreen user switcher config"
Xiyuan Xia [Tue, 18 Aug 2015 15:54:08 +0000 (15:54 +0000)]
Merge "Rename fullscreen user switcher config"

8 years agoRename fullscreen user switcher config
Xiyuan Xia [Mon, 17 Aug 2015 20:19:30 +0000 (13:19 -0700)]
Rename fullscreen user switcher config

config_camelCase is the preferred format for config names.

Bug:19908596
Change-Id: I69f953fb1bd74ec61b2845c54a7c54c3c9b6b86e

8 years agoMerge "Use correct param for heightMode in RelativeLayout horizontal measure"
Alan Viverette [Tue, 18 Aug 2015 13:28:44 +0000 (13:28 +0000)]
Merge "Use correct param for heightMode in RelativeLayout horizontal measure"

8 years agoam 60a2716f: am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debuggi...
Sebastien Hertz [Tue, 18 Aug 2015 09:59:11 +0000 (09:59 +0000)]
am 60a2716f: am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '60a2716f720e843a7de6e7209c2021d95538711e':
  Allow debugging only for apps forked from zygote

8 years agoam 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for...
Sebastien Hertz [Tue, 18 Aug 2015 09:52:46 +0000 (09:52 +0000)]
am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '3244dc229af4d4c8b764bf9ca1e108b5cd933d90':
  Allow debugging only for apps forked from zygote

8 years agoam 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked...
Sebastien Hertz [Tue, 18 Aug 2015 08:04:41 +0000 (08:04 +0000)]
am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '677cd0872013cdeb4c201ce0994633065b616725':
  Allow debugging only for apps forked from zygote

8 years agoam e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote...
Sebastien Hertz [Tue, 18 Aug 2015 07:56:37 +0000 (07:56 +0000)]
am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit 'e9de1b4cef10922180cfe06049cf906160e2c315':
  Allow debugging only for apps forked from zygote

8 years agoam 069b3c19: am 9b56bff4: am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App...
Joe Fernandez [Tue, 18 Aug 2015 07:54:25 +0000 (07:54 +0000)]
am 069b3c19: am 9b56bff4: am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit '069b3c19972ebed77ff65593ba3c858641d852e2':
  docs: App link doc update for M Preview 3

8 years agoam 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
Sebastien Hertz [Tue, 18 Aug 2015 07:50:06 +0000 (07:50 +0000)]
am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
  Allow debugging only for apps forked from zygote

8 years agoam 9b56bff4: am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update...
Joe Fernandez [Tue, 18 Aug 2015 07:48:52 +0000 (07:48 +0000)]
am 9b56bff4: am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit '9b56bff4a9e849689f6441b50ea7c3f5b9910f43':
  docs: App link doc update for M Preview 3

8 years agoMerge "Allow debugging only for apps forked from zygote" into mnc-dev
Sebastien Hertz [Tue, 18 Aug 2015 07:41:50 +0000 (07:41 +0000)]
Merge "Allow debugging only for apps forked from zygote" into mnc-dev

8 years agoam 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview...
Joe Fernandez [Tue, 18 Aug 2015 07:41:22 +0000 (07:41 +0000)]
am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit '20a9ca1581c266ce320ea850ee6dc10719584ebf':
  docs: App link doc update for M Preview 3

8 years agoam d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into...
Joe Fernandez [Tue, 18 Aug 2015 07:36:25 +0000 (07:36 +0000)]
am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit 'd294dc437d53ceb74529e62aa70078a8f51bb462':
  docs: App link doc update for M Preview 3

8 years agoam 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
Joe Fernandez [Tue, 18 Aug 2015 07:28:31 +0000 (07:28 +0000)]
am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev

* commit '96695d2f5961cbfac2d5c5ea6a7c03612991d5fb':
  docs: App link doc update for M Preview 3