drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,266 Commits 1 Branch 0 Tags
Commit Graph

212266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tenghui Zhu
6c4edcce52 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
 2015-08-19 02:22:26 +00:00
Quddus Chong
23f0df8106 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.
 2015-08-19 02:22:19 +00:00
Adam Lesinski
90c68f2a24 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
 2015-08-19 02:22:12 +00:00
Jorim Jaggi
e6cfa30631 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
 2015-08-19 02:22:06 +00:00
Jim Miller
4ea5152bd8 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.
 2015-08-19 02:21:58 +00:00
Jorim Jaggi
2af1b3caaa 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
 2015-08-19 02:21:52 +00:00
Jim Miller
10fe83a9b9 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"
 2015-08-19 02:21:46 +00:00
Tim Kilbourn
4080a4197c 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.
 2015-08-19 02:21:39 +00:00
Roozbeh Pournader
9eeeea5ea6 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."
 2015-08-19 02:21:30 +00:00
Dianne Hackborn
35eb8d6205 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
 2015-08-19 02:21:23 +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
Dianne Hackborn
1559f1c5a0 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
 2015-08-19 01:42:45 +00:00
Tenghui Zhu
23cee7cab2 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
 2015-08-19 01:32:58 +00:00
Quddus Chong
b696779a54 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.
 2015-08-19 01:32:52 +00:00
Adam Lesinski
56df15d3b4 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
 2015-08-19 01:32:46 +00:00
Jorim Jaggi
40c7583163 am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet 
* commit 'b7f482ab41f3c50d2765c53db8b4e79f4e1b7903':
  Only call authenticate when we are not listening yet
 2015-08-19 01:32:40 +00:00
Jim Miller
ce6fb7bba9 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.
 2015-08-19 01:32:24 +00:00
Jorim Jaggi
1d9a8c58d8 am 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimation 
* commit '2591d6ffc60505df0099069877f7913ec30e4460':
  Do not start with a black frame in bootanimation
 2015-08-19 01:32:06 +00:00
Jim Miller
309fef16e1 am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev 
* commit 'e11fbc08a340cb069c8034b7ffd794c32344d4ba':
  Revert "Disable fingerprint when remotely reset by DPM"
 2015-08-19 01:31:58 +00:00
Tim Kilbourn
458d4d6d7f 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.
 2015-08-19 01:31:53 +00:00
Roozbeh Pournader
c91b67adba 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."
 2015-08-19 01:31:43 +00:00
Dianne Hackborn
217d45685f 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
 2015-08-19 01:31:27 +00:00
Tenghui Zhu
a2de21777d 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
 2015-08-19 00:59:19 +00:00
Quddus Chong
dd8ccccd83 am f17a4f42: am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev 
* commit 'f17a4f4257d8e18439ba894435ba2d112e757753':
  docs: Updated hardware system images for M.
 2015-08-19 00:59:15 +00:00
Adam Lesinski
5b3a38e07d am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev 
* commit 'bda9b324c88b70514109f2d9ffc937ca3202fd03':
  Change default cellular activity timeout to 10
 2015-08-19 00:59:10 +00:00
Jorim Jaggi
b7f482ab41 am ee2cfe48: Only call authenticate when we are not listening yet 
* commit 'ee2cfe48d4fb36906c59c2ae545808dba01f90d8':
  Only call authenticate when we are not listening yet
 2015-08-19 00:59:06 +00:00
Tenghui Zhu
df23f37105 am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev 
* commit 'c9ecc985947462e3032fdd3b1c6abc0d5b5b1084':
  Add some bookmarks to plugin-for-gradle page
 2015-08-19 00:53:52 +00:00
Quddus Chong
f17a4f4257 am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev 
* commit '54bdb2e732de98ae2829101570dc29970e377fa3':
  docs: Updated hardware system images for M.
 2015-08-19 00:53:39 +00:00
Adam Lesinski
bda9b324c8 am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev 
* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
  Change default cellular activity timeout to 10
 2015-08-19 00:53:35 +00:00
Jorim Jaggi
fe6fd5d29d Merge "Fix trigger sensor lifecycle" 2015-08-19 00:52:00 +00:00
Jorim Jaggi
ee2cfe48d4 Only call authenticate when we are not listening yet 
Bug: 23304421
Change-Id: I5c589ba8992039ca995138d7d74abd123b911a5c
 2015-08-19 00:51:23 +00:00
Yusuke Sato
10a2999a46 Merge "Trace scanDirLI()" 2015-08-19 00:51:15 +00:00
Yusuke Sato
8324a6ee83 Trace scanDirLI() 
Change-Id: I3761b4991d45684e9b712c5870bcacd08dc806de
 2015-08-18 17:24:14 -07:00
Jorim Jaggi
716a734eec 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
 2015-08-19 00:07:45 +00:00
Chong Zhang
aa1fd4e6d3 Merge "Restore recent task to freeform space when resizing" 2015-08-18 23:55:07 +00:00
Jim Miller
7ef772713f 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.
 2015-08-18 23:18:36 +00:00
Tenghui Zhu
c9ecc98594 Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev 2015-08-18 23:13:12 +00:00
Jim Miller
bea9d7b94c Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 2015-08-18 23:12:18 +00:00
Mitchell Wills
773bad16ec Merge "Remove driver stop delay config as it is no longer used" 2015-08-18 22:55:30 +00:00
Tao Bao
53c217f6c4 am efb71f44: am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()." 
* commit 'efb71f442c6dbdb75113d29df49106217f22cea3':
  Recursively delete directories in handleAftermath().
 2015-08-18 22:46:26 +00:00
Tao Bao
efb71f442c am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()." 
* commit '2e3746abc7d70dd72f60a7912cd45472f3032acb':
  Recursively delete directories in handleAftermath().
 2015-08-18 22:41:34 +00:00
Tao Bao
2e3746abc7 am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()." 
* commit '9bcb0fcc217e35f8290ee5f283fae86a6306ab25':
  Recursively delete directories in handleAftermath().
 2015-08-18 22:32:48 +00:00