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

207689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Tao Bao
9bcb0fcc21 Merge "Recursively delete directories in handleAftermath()." 2015-08-18 22:26:16 +00:00
Tao Bao
5065e12dbe 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
 2015-08-18 13:48:17 -07:00
Jorim Jaggi
2591d6ffc6 am 358fcc79: Do not start with a black frame in bootanimation 
* commit '358fcc795ea567ba086a460c587de427507fefdd':
  Do not start with a black frame in bootanimation
 2015-08-18 20:33:08 +00:00
Jorim Jaggi
358fcc795e Do not start with a black frame in bootanimation 
Bug: 23128307
Change-Id: I0ec044f983c1c30960be046e43a882c63205dc5f
 2015-08-18 20:26:47 +00:00
Jim Miller
e11fbc08a3 am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev 
* commit '33a5c80773b7b2913c92fec170787499a453d184':
  Revert "Disable fingerprint when remotely reset by DPM"
 2015-08-18 20:15:10 +00:00
Jim Miller
33a5c80773 resolved conflicts for merge of 448216e7 to mnc-dr-dev 
Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5
 2015-08-18 13:07:25 -07:00
Tim Kilbourn
9b1fd822d0 am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev 
* commit '2ad94499697d79dc41489ab873527411f88b3f15':
  Use init to write usb typec props.
 2015-08-18 20:02:47 +00:00
Jim Miller
e0507bbbf9 Reset fingerprint lockout timer when strong auth is used. 
Fixes bug 22565462

Change-Id: I4842877839845e7fe103396d8ca8104928568c04
 2015-08-18 13:01:31 -07:00
Tim Kilbourn
2ad9449969 Merge "Use init to write usb typec props." into mnc-dr-dev 2015-08-18 19:54:46 +00:00
Roozbeh Pournader
31a536e117 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."
 2015-08-18 19:44:49 +00:00
Roozbeh Pournader
579283647e 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."
 2015-08-18 19:37:16 +00:00
Jim Miller
448216e7b8 Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev 2015-08-18 19:32:01 +00:00
Roozbeh Pournader
53c38c8819 Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev 2015-08-18 19:29:47 +00:00
Roozbeh Pournader
bbf0c88e6c Revert "Create a special CONSTRAINED font bucket in frameworks." 
This reverts commit 9e21eced5efacd605036be599d96974964deb09b.

Bug: 22929087
 2015-08-18 12:17:13 -07:00
Dianne Hackborn
8100b3fa8b am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
* commit '4439dcdc395a9c173df1ddcf64c510eed5face07':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
 2015-08-18 18:41:51 +00:00
Dianne Hackborn
4439dcdc39 am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
* commit 'af75c17bca8b2f017e254131393cd72e2fe7c6e8':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
 2015-08-18 18:33:25 +00:00
Dianne Hackborn
af75c17bca Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a
 2015-08-18 11:08:10 -07:00
Sebastien Hertz
60a2716f72 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
 2015-08-18 09:52:46 +00:00
Sebastien Hertz
3244dc229a 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
 2015-08-18 08:04:41 +00:00
Sebastien Hertz
677cd08720 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
 2015-08-18 07:56:37 +00:00
Sebastien Hertz
e9de1b4cef am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev 
* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
  Allow debugging only for apps forked from zygote
 2015-08-18 07:50:06 +00:00
Joe Fernandez
069b3c1997 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
 2015-08-18 07:48:52 +00:00
Sebastien Hertz
9a010d0a41 Merge "Allow debugging only for apps forked from zygote" into mnc-dev 2015-08-18 07:41:50 +00:00
Joe Fernandez
9b56bff4a9 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
 2015-08-18 07:41:22 +00:00
Joe Fernandez
20a9ca1581 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
 2015-08-18 07:36:25 +00:00
Joe Fernandez
d294dc437d 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
 2015-08-18 07:28:31 +00:00
Joe Fernandez
96695d2f59 Merge "docs: App link doc update for M Preview 3" into mnc-dev 2015-08-18 07:23:35 +00:00
Joe Fernandez
94fc625cf1 docs: App link doc update for M Preview 3 
Change-Id: I9a8843bb2209f9ac12d5d0946dda1e3bdd6f1947
 2015-08-18 00:14:14 -07:00
David Friedman
41f78a408f am 878acada: am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev 
* commit '878acada08c49214b720fdd57b8150407a4e223f':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs
 2015-08-18 05:14:12 +00:00
David Friedman
878acada08 am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev 
* commit 'd7792759e703200c833736df276915958588cad4':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs
 2015-08-18 05:07:15 +00:00
David Friedman
d7792759e7 am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev 
* commit '5f89ce649c6385bd6463641c5408cc7a274b0eb6':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs
 2015-08-18 05:00:50 +00:00
David Friedman
5f89ce649c am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev 
* commit '3e40a27eaca9e82398f7dc59006c14e56de7cc43':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs
 2015-08-18 04:54:58 +00:00
David Friedman
3e40a27eac Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into mnc-dev 2015-08-18 04:50:23 +00:00
Filip Gruszczynski
e1e9e811ab am d29dd0c9: am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev 
* commit 'd29dd0c98633e274499ec4177e48a62644175912':
  Clear old clip rect when creating new surface.
 2015-08-18 02:31:05 +00:00