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

197007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Attwell
25b2889529 am d54cbba8: am 4ababd27: am 19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev 
* commit 'd54cbba80567110d103f93afdee16e582ef22751':
  Rename "end" to "endExclusive" in addPhoneTtsSpan
 2015-06-01 15:43:53 +00:00
Alan Viverette
1748df744f am e440ac1a: am 9ddcef8e: am 3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev 
* commit 'e440ac1aa433a62f668039d5b0ed9e2734706bf0':
  Postpone AnimatedVectorDrawable animator inflation until applyTheme()
 2015-06-01 15:43:48 +00:00
Andres Morales
782d7bc46a am 0b8ddb47: am 8d61ab00: am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev 
* commit '0b8ddb47924506ea349b327c233d50ee8508add5':
  [partition checking] re-enable bootimage/bootloader, add recovery
 2015-06-01 15:43:42 +00:00
Brian Attwell
d54cbba805 am 4ababd27: am 19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev 
* commit '4ababd27401db430afb2f30d29efce972f8b1ccb':
  Rename "end" to "endExclusive" in addPhoneTtsSpan
 2015-06-01 15:22:52 +00:00
Alan Viverette
e440ac1aa4 am 9ddcef8e: am 3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev 
* commit '9ddcef8eec56bd161d8f8e91c854b740232f6a64':
  Postpone AnimatedVectorDrawable animator inflation until applyTheme()
 2015-06-01 15:22:47 +00:00
Andres Morales
0b8ddb4792 am 8d61ab00: am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev 
* commit '8d61ab0003e26952349a959a4a38d3ebdea664d0':
  [partition checking] re-enable bootimage/bootloader, add recovery
 2015-06-01 15:22:42 +00:00
Geoff Mendal
505822b9cb Merge "Revert "Import translations. DO NOT MERGE"" 2015-06-01 14:05:58 +00:00
Geoff Mendal
c3ae228e99 Revert "Import translations. DO NOT MERGE" 
This reverts commit 50d10ccbc092d28533e6730c7e5abe10d785d0ce.

Change-Id: I689bf971848ebec0a88282c39e57113aee6d44cb
 2015-06-01 14:05:47 +00:00
Geoff Mendal
83d93ec4ab Merge "Import translations. DO NOT MERGE" 2015-06-01 13:49:23 +00:00
Geoff Mendal
50d10ccbc0 Import translations. DO NOT MERGE 
Change-Id: If4637a964f9f435c9b9189069574d017a711dc26
Auto-generated-cl: translation import
 2015-06-01 06:48:42 -07:00
Neil Fuller
1d19c4142d am 1d66281e: am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change" 
* commit '1d66281e4b1ffb2950e93f4473144cb4e68a6b62':
  Fix javadocs based on recent case consistency change
 2015-06-01 12:41:23 +00:00
Neil Fuller
1d66281e4b am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change" 
* commit '59b240404f19f3450e710e07a90d4e8d35fabcaf':
  Fix javadocs based on recent case consistency change
 2015-06-01 12:26:01 +00:00
Neil Fuller
59b240404f am e761938c: Merge "Fix javadocs based on recent case consistency change" 
* commit 'e761938c39c1cafa80d0c474e107041316a49cbd':
  Fix javadocs based on recent case consistency change
 2015-06-01 12:14:47 +00:00
Neil Fuller
e761938c39 Merge "Fix javadocs based on recent case consistency change" 2015-06-01 12:01:44 +00:00
Geoff Mendal
1e1d4d8959 Merge "Revert "Import translations. DO NOT MERGE"" 2015-05-30 05:23:14 +00:00
Geoff Mendal
d97da2de1e Revert "Import translations. DO NOT MERGE" 
This reverts commit c48b8785efb6ad1103b50d53130476b82c62824d.

Change-Id: I31f53bf893bd60834a608b48205843861efc5430
 2015-05-30 05:22:59 +00:00
Geoff Mendal
d362f94667 Merge "Import translations. DO NOT MERGE" 2015-05-30 04:41:25 +00:00
Geoff Mendal
34b8c2fd10 Merge "Import translations. DO NOT MERGE" 2015-05-30 04:41:03 +00:00
Geoff Mendal
733eae45fb Import translations. DO NOT MERGE 
Change-Id: Iee3d801255d38c5e864dcb066680999548fea217
Auto-generated-cl: translation import
 2015-05-29 21:31:39 -07:00
Geoff Mendal
c48b8785ef Import translations. DO NOT MERGE 
Change-Id: I5ba1a4b5d0cc2c4e0de7459ccf4e8c029ebdea8d
Auto-generated-cl: translation import
 2015-05-29 21:28:16 -07:00
Geoff Mendal
7320d762f2 Merge "Import translations. DO NOT MERGE" 2015-05-30 04:15:44 +00:00
Geoff Mendal
ad70967f75 Import translations. DO NOT MERGE 
Change-Id: I3bb15edf7c79e228d2da63ebb39b8fe0b0798a93
Auto-generated-cl: translation import
 2015-05-29 21:15:06 -07:00
Geoff Mendal
861ed04e61 Merge "Import translations. DO NOT MERGE" 2015-05-30 04:13:50 +00:00
Geoff Mendal
bad5bceae2 Import translations. DO NOT MERGE 
Change-Id: I72496efc53c99b1ef5ca3a02aa1bf1dfcd5c8ddf
Auto-generated-cl: translation import
 2015-05-29 21:11:45 -07:00
Geoff Mendal
0db955195b Merge "Revert "Import translations. DO NOT MERGE"" 2015-05-30 04:11:15 +00:00
Geoff Mendal
bbb98b4ed0 Revert "Import translations. DO NOT MERGE" 
This reverts commit d2c3a7d7cca2bd828266cd362b00d7d2dfd41f5c.

Change-Id: Idd6e026369a191b5e4449c8decbba8d08e20de92
 2015-05-30 04:11:03 +00:00
Geoff Mendal
77779d9c75 Merge "Import translations. DO NOT MERGE" 2015-05-30 04:09:08 +00:00
Geoff Mendal
09e903e877 Import translations. DO NOT MERGE 
Change-Id: I68059e6ea2f556d75c9b87217e12fd300cbd7224
Auto-generated-cl: translation import
 2015-05-29 21:08:14 -07:00
Geoff Mendal
60c704d772 Merge "Import translations. DO NOT MERGE" 2015-05-30 04:02:15 +00:00
Geoff Mendal
0a80836b58 Merge "Import translations. DO NOT MERGE" 2015-05-30 04:01:54 +00:00
Geoff Mendal
6b370152a3 Import translations. DO NOT MERGE 
Change-Id: I36487f341adc97a7bda5d9e5722a074443845041
Auto-generated-cl: translation import
 2015-05-29 20:59:13 -07:00
Geoff Mendal
d392c2b8ad Import translations. DO NOT MERGE 
Change-Id: I72b14e7163a35d71613ec05ba36d159c49e1e0f3
Auto-generated-cl: translation import
 2015-05-29 20:55:56 -07:00
Geoff Mendal
1406b939bd Merge "Import translations. DO NOT MERGE" 2015-05-30 03:54:28 +00:00
Geoff Mendal
bcd4a0625e Import translations. DO NOT MERGE 
Change-Id: I7b2425050dd88c3e70affc7fed27b57ed1959ddc
Auto-generated-cl: translation import
 2015-05-29 20:52:37 -07:00
Geoff Mendal
b0230153bb Merge "Import translations. DO NOT MERGE" 2015-05-30 03:51:06 +00:00
Geoff Mendal
d2c3a7d7cc Import translations. DO NOT MERGE 
Change-Id: I83cdf342c0886f0b1d81104aa3f872b215077fbf
Auto-generated-cl: translation import
 2015-05-29 20:49:11 -07:00
Geoff Mendal
3f45956047 Merge "Import translations. DO NOT MERGE" 2015-05-30 03:45:16 +00:00
Geoff Mendal
f3f224e615 Merge "Import translations. DO NOT MERGE" 2015-05-30 03:44:59 +00:00
Geoff Mendal
fd05ca3411 Import translations. DO NOT MERGE 
Change-Id: Id6410182a7d042ba1b341d7a288edc80fc03c98d
Auto-generated-cl: translation import
 2015-05-29 20:42:24 -07:00
Geoff Mendal
3d9919eaa2 Import translations. DO NOT MERGE 
Change-Id: I004e61ace181adab6d681c9b8e79ee33a19520a8
Auto-generated-cl: translation import
 2015-05-29 20:39:05 -07:00
Geoff Mendal
50d78c540e Merge "Import translations. DO NOT MERGE" 2015-05-29 23:03:20 +00:00
Geoff Mendal
117889ac05 Import translations. DO NOT MERGE 
Change-Id: I8e46c3c2c16b5cfa66bb696299ed32f4ff43ef26
Auto-generated-cl: translation import
 2015-05-29 17:55:54 -05:00
Jorim Jaggi
25d85b06af Merge "Don't open QS on first notification pull down" 2015-05-29 22:11:30 +00:00
Chad Brubaker
8828e5136d am 533d164e: am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish" 
* commit '533d164ed0263c682b5868a0e0f021a95ec9a9fe':
  Add optional additional entropy to finish
 2015-05-29 22:01:04 +00:00
Chad Brubaker
533d164ed0 am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish" 
* commit '0189c6efed4f36db0661d827d998a49bc34ece12':
  Add optional additional entropy to finish
 2015-05-29 21:44:34 +00:00
Chad Brubaker
0189c6efed am dd783301: Merge "Add optional additional entropy to finish" 
* commit 'dd78330140ad0e02fc693fc1f5bf041adcf64a1f':
  Add optional additional entropy to finish
 2015-05-29 21:31:52 +00:00
Chad Brubaker
dd78330140 Merge "Add optional additional entropy to finish" 2015-05-29 21:17:55 +00:00
Chad Brubaker
9ce30624a4 Add optional additional entropy to finish 
If provided the extra entropy will be added to the device before calling
finish. If entropy is provided and the device does not support supplying
additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED.

Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58
 2015-05-29 12:32:56 -07:00
Guang Zhu
e422791505 fix NPE in shutdown thread 
null reboot reason is used when it's a simple reboot.

Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f
(cherry picked from commit 9bb765448df43d41e0a3edb7de1d1641c9251c35)
 2015-05-29 18:23:28 +00:00
Maxim Bogatov
3aa76940ed Merge "Remove AccessibilityAction.ACTION_CLICK from AbsListView." 2015-05-29 17:49:29 +00:00