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

195876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
c95fba7354 am 1a3ab87e: am 614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev 
* commit '1a3ab87e93d26e659067298e250fe5e8cfc2e1b8':
  Refactor Android Keystore CipherSpi base class.
 2015-06-01 15:26:52 +00:00
Quddus Chong
613330265b am d5796be5: am c1862737: am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956 
* commit 'd5796be5e074345d073101cee2a1a2dcf825eea0':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
 2015-06-01 15:26:46 +00:00
Tyler Gunn
791eac8613 am 19eadcab: am 2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev 
* commit '19eadcaba885872491269399a1b2110c90b43ca8':
  Un-@hide some missed video APIs.
 2015-06-01 15:26:39 +00:00
John Spurlock
57436577e2 am f1b897e8: am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev 
* commit 'f1b897e8b5793430a1c28e66df7e4d346cd9a9a4':
  Zen: Add warning text if total silence will eat the next alarm.
 2015-06-01 15:26:31 +00:00
Alex Klyubin
3e83ea3f11 am 97e7fec6: am 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev 
* commit '97e7fec63ca3c72516e478b158e9673bdfc0118f':
  Add algorithm aliases for Android Keystore HMACs.
 2015-06-01 15:26:25 +00:00
Andy Hung
f3853332a4 am af739a10: am 51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev 
* commit 'af739a10cf15c00467b90aaccc4907ce460e64de':
  Clarify AudioFormat sample rate and encoding documentation
 2015-06-01 15:26:19 +00:00
Jason Monk
d232a172ee am 3e1bdc61: am 2280218a: Merge "Don\'t use string that has been removed." into mnc-dev 
* commit '3e1bdc61d85b9cc135cd52c0f05c0665d93621d5':
  Don't use string that has been removed.
 2015-06-01 15:26:12 +00:00
Glenn Kasten
d90bcad521 am 507758f2: am e5c38788: am 92614179: am dedc768f: Fix typo 
* commit '507758f21bd2d6b0a80dc96dd5e36040f7e9b0a5':
  Fix typo
 2015-06-01 15:26:06 +00:00
James Cook
fcce03b608 am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 
* commit '3c668bac5a670999719e2a5c9d8a719b5422ea38':
  assist: Fix reported colors/styles for TextView/Switch
 2015-06-01 15:26:00 +00:00
Tony Mantler
8e56a1a67d am 29ef4811: am 85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '29ef481165b2362c1fc91219b09f8a1f4b24e246':
  Move ZoneGetter into SettingsLib
 2015-06-01 15:25:54 +00:00
Geoff Mendal
c38f200803 am c5508f85: (-s ours) am 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit 'c5508f8560b48a195f5b19dab98b0bc1bb85928b':
  Revert "Import translations. DO NOT MERGE"
 2015-06-01 15:25:47 +00:00
Geoff Mendal
777767cb92 am 8474bf48: (-s ours) am 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '8474bf48aa37487270e335441005cea19515cf13':
  Revert "Import translations. DO NOT MERGE"
 2015-06-01 15:25:42 +00:00
Geoff Mendal
ed2f33ce76 am 6c15c153: (-s ours) am 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '6c15c153fa831264f1134b703107acf40e206728':
  Revert "Import translations. DO NOT MERGE"
 2015-06-01 15:25:36 +00:00
John Spurlock
a0962acfbe am 8cf1276c: am 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev 
* commit '8cf1276c8e08abcfe744309d3ce78f3e7b37ed31':
  Tuner: add battery pct preference.
 2015-06-01 15:25:31 +00:00
Geoff Mendal
e30f773ca5 am 060b2ce9: (-s ours) am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '060b2ce9eaf77155024676f419ca37aa6c5ab895':
  Import translations. DO NOT MERGE
 2015-06-01 15:25:25 +00:00
Geoff Mendal
b6dae108b3 am 76625fec: (-s ours) am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '76625fec224a0fffa0664060f72d6cc1a7e9ba49':
  Import translations. DO NOT MERGE
 2015-06-01 15:25:20 +00:00
Geoff Mendal
36fc6a88d2 am 57103ebf: (-s ours) am df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '57103ebfa6188b2c421ba860d7063b62ca935af5':
  Import translations. DO NOT MERGE
 2015-06-01 15:25:15 +00:00
Geoff Mendal
39a58e878c am 408606f3: (-s ours) am 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '408606f31eb126bad9a8c1da28026ffe9c4943f4':
  Import translations. DO NOT MERGE
 2015-06-01 15:25:10 +00:00
Xiyuan Xia
bfcdb7b41b am 223826b3: am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev 
* commit '223826b3cd1c7dc00706efc137b8a4dcaf7595fa':
  Avoid keyguard UI layout dimensions underflow
 2015-06-01 15:25:02 +00:00
Geoff Mendal
7b5e5d5ade am 7ec9264f: (-s ours) am 642c4fc5: (-s ours) Import translations. DO NOT MERGE 
* commit '7ec9264f40087f48dcab821c65a93f8628dd0e93':
  Import translations. DO NOT MERGE
 2015-06-01 15:24:55 +00:00
Narayan Kamath
0bc58c6b5c am 2de63d7c: am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 
* commit '2de63d7cc1398fe699cc2a16b47647674e4efb64':
  Avoid inspecting packages twice to deduce ABIs for moves / installs.
 2015-06-01 15:24:49 +00:00
John Spurlock
f7043e284a am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 
* commit '015a95ff35e5e9de959c10d082fbe2e10c58885c':
  Zen: Use account name instead of calendar id in event conditions.
 2015-06-01 15:24:42 +00:00
Selim Cinek
19eee4a498 am 4dbe7c0d: am ff3bf4b1: Increased the falsing treashold for quick settings 
* commit '4dbe7c0d16944ba4b8df4216f730acfc06818eca':
  Increased the falsing treashold for quick settings
 2015-06-01 15:24:32 +00:00
Dirk Dougherty
9fc33d8d95 am 4b9d724c: am 34cca12b: am 906a91b4: am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video. 
* commit '4b9d724cd666bdad3703f383be8c024f4a6016a1':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
 2015-06-01 15:24:23 +00:00
David Friedman
1be7fb908a am bc0e7f28: am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another. 
* commit 'bc0e7f287599e90a44ab249ba2fc0673ddfaf609':
  Docs: Corrects technical content of one sentence, and deletes another.
 2015-06-01 15:24:15 +00:00
Guang Zhu
74ecc15db9 am 0ca15144: am 9bb76544: fix NPE in shutdown thread 
* commit '0ca15144e375e7439a64fabcbb53d6813135cfc4':
  fix NPE in shutdown thread
 2015-06-01 15:24:03 +00:00
Andrew Solovay
739b6941f6 am 74f4e4f1: am 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix 
* commit '74f4e4f1b8016a586d6a0b3ca6ebe06840c21573':
  docs: Quick spelling fix
 2015-06-01 15:23:55 +00:00
Sungsoo Lim
26eed04988 am f819ac38: am 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev 
* commit 'f819ac38a9647a8d7d00bca83f176e32a415517e':
  Send a message with data in MediaController.MessageHandler.post()
 2015-06-01 15:23:46 +00:00
Yorke Lee
ac8b0b024a am 923df3da: am d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev 
* commit '923df3da935b006b983ea1837538f6baecf26b86':
  Make ACTION_CONNECTION_SERVICE_CONFIGURE public
 2015-06-01 15:23:37 +00:00
Glenn Kasten
66127840c3 am a84e73a7: am ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev 
* commit 'a84e73a7bc99e4ef5c50125400d319a4124b4296':
  Improve error handling for AudioTrack write with PTS
 2015-06-01 15:23:23 +00:00
Raph Levien
1091defa85 am 023973ec: am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev 
* commit '023973ecc66c62f2b83d9154097bb370966ed96d':
  Use getRunAdvance to position cursor
 2015-06-01 15:23:16 +00:00
Alan Viverette
41eeeca272 am 4e419432: am a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev 
* commit '4e419432e1717de6154ea5c8177c519fe449b8f0':
  Synchronize Theme.Material and Theme.Material light attributes
 2015-06-01 15:23:09 +00:00
Makoto Onuki
7b8612d0ea am 8c48834b: am 0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev 
* commit '8c48834b112cf10d43bacd668aadf6f3cf4a9ad1':
  CountryDetector no longer requires location permissions.
 2015-06-01 15:23:03 +00:00
Yohei Yukawa
47d691baf7 am 92086e06: am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev 
* commit '92086e06ad3167ebfadbc746d32e86c335878a8f':
  Rely on IMM#focusOut() to close input session.
 2015-06-01 15:22:58 +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
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
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
Alex Klyubin
1a3ab87e93 am 614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev 
* commit '614b39f3de7747e9e1cd00d8985ec6fa9b356217':
  Refactor Android Keystore CipherSpi base class.
 2015-05-29 19:32:10 +00:00
Quddus Chong
d5796be5e0 am c1862737: am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956 
* commit 'c1862737f8fd5c1b366d488e22c020e565f543c3':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
 2015-05-29 19:22:34 +00:00
Tyler Gunn
19eadcaba8 am 2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev 
* commit '2b26e8dcd130a371ef7ed170316766d0fbcd3212':
  Un-@hide some missed video APIs.
 2015-05-29 19:22:24 +00:00
John Spurlock
f1b897e8b5 am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev 
* commit 'e648c5f1cb41f72a3404a9a7d2656e764c52f8e1':
  Zen: Add warning text if total silence will eat the next alarm.
 2015-05-29 19:22:17 +00:00
Alex Klyubin
97e7fec63c am 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev 
* commit '1a23c31752f1295c708cf749a7828dc42e4e9d9e':
  Add algorithm aliases for Android Keystore HMACs.
 2015-05-29 19:22:11 +00:00
Andy Hung
af739a10cf am 51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev 
* commit '51c1e3bd149d2e10e68ad72fd7d25ef826a6075c':
  Clarify AudioFormat sample rate and encoding documentation
 2015-05-29 19:22:04 +00:00