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

194608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
36325016ca am 2400197f: Enable Keyguard debug logging 
* commit '2400197f10ff2ca8d393eac47a65a09dc0cea3e9':
  Enable Keyguard debug logging
 2015-05-29 20:51:39 +00:00
Jorim Jaggi
2400197f10 Enable Keyguard debug logging 
Bug: 21320918
Change-Id: I2529bfb7cdaae6042bbc9e51340c7571a5a63ad0
 2015-05-29 19:34:48 +00: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
Jason Monk
3e1bdc61d8 am 2280218a: Merge "Don\'t use string that has been removed." into mnc-dev 
* commit '2280218a93cbda885a7530f3b30c3d8d4b3a1ff6':
  Don't use string that has been removed.
 2015-05-29 19:21:58 +00:00
Glenn Kasten
507758f21b am e5c38788: am 92614179: am dedc768f: Fix typo 
* commit 'e5c3878864993a974d48b11790106adb2a09031c':
  Fix typo
 2015-05-29 19:21:44 +00:00
James Cook
3c668bac5a am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 
* commit '63b6320af4302c0d190bbfaba739049b59c2418b':
  assist: Fix reported colors/styles for TextView/Switch
 2015-05-29 19:21:37 +00:00
Tony Mantler
29ef481165 am 85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '85b039f3488d15a926993b9df2a550a01a1938a4':
  Move ZoneGetter into SettingsLib
 2015-05-29 19:20:57 +00:00
Geoff Mendal
c5508f8560 am 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '55b4b2d5a82ef7999a32b8163340a15085b2df38':
  Revert "Import translations. DO NOT MERGE"
 2015-05-29 19:20:42 +00:00
Geoff Mendal
8474bf48aa am 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '8320436ce559ba6b80e32bf24d5917fe7ee6c241':
  Revert "Import translations. DO NOT MERGE"
 2015-05-29 19:20:34 +00:00
Geoff Mendal
6c15c153fa am 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '9917768736f7d8581ee094267d2a4e5ca2b31cbf':
  Revert "Import translations. DO NOT MERGE"
 2015-05-29 19:20:23 +00:00
John Spurlock
8cf1276c8e am 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev 
* commit '4402f4bb12cc70eef3bae20631a4a9fe210c7c80':
  Tuner: add battery pct preference.
 2015-05-29 19:20:17 +00:00
Geoff Mendal
060b2ce9ea am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e796112904a737e61f2ecce3f0fd42d2cba25436':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:57 +00:00
Geoff Mendal
76625fec22 am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '0bdf1aab31d110b9e9de819e34e922f13442bf53':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:52 +00:00
Geoff Mendal
57103ebfa6 am df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'df55ecbf9ccb18793338aa7eb04f0faec45889cd':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:47 +00:00
Geoff Mendal
408606f31e am 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '78a247da5f21415657a9ab6f20d4d8449a13f734':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:41 +00:00
Xiyuan Xia
223826b3cd am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev 
* commit 'e103029dbc457596661ae4066aabcb2a35f07dfd':
  Avoid keyguard UI layout dimensions underflow
 2015-05-29 19:19:27 +00:00
Geoff Mendal
7ec9264f40 am 642c4fc5: (-s ours) Import translations. DO NOT MERGE 
* commit '642c4fc527da40cf4697d3630bdebdfc1044ab82':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:20 +00:00
Narayan Kamath
2de63d7cc1 am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 
* commit 'd644c5638180d5d4218f34e1afb9e7782fc52e49':
  Avoid inspecting packages twice to deduce ABIs for moves / installs.
 2015-05-29 19:18:51 +00:00
John Spurlock
015a95ff35 am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 
* commit '6a2999073ce4d4ac203e7e2d7b40aaaa794851d4':
  Zen: Use account name instead of calendar id in event conditions.
 2015-05-29 19:18:45 +00:00
Selim Cinek
4dbe7c0d16 am ff3bf4b1: Increased the falsing treashold for quick settings 
* commit 'ff3bf4b12f87d9aa552f517989f2b0dda4e43cc5':
  Increased the falsing treashold for quick settings
 2015-05-29 19:18:36 +00:00
Dirk Dougherty
4b9d724cd6 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 '34cca12bbda96ea8aad86b0455eb61e4674a4616':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
 2015-05-29 19:18:31 +00:00
David Friedman
bc0e7f2875 am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another. 
* commit '95af201aead0ce7dc5326220dd3ee8619a237ae6':
  Docs: Corrects technical content of one sentence, and deletes another.
 2015-05-29 19:18:26 +00:00
Guang Zhu
0ca15144e3 am 9bb76544: fix NPE in shutdown thread 
* commit '9bb765448df43d41e0a3edb7de1d1641c9251c35':
  fix NPE in shutdown thread
 2015-05-29 19:18:19 +00:00
Andrew Solovay
74f4e4f1b8 am 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix 
* commit '832654a8574b4371b5dc69216dd0b8377368fb5c':
  docs: Quick spelling fix
 2015-05-29 19:18:09 +00:00
Sungsoo Lim
f819ac38a9 am 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev 
* commit '6dddc7d1a9ed7f94e37dd6127664e02e25ceb6c8':
  Send a message with data in MediaController.MessageHandler.post()
 2015-05-29 19:18:01 +00:00
Alex Klyubin
614b39f3de Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev 2015-05-29 19:15:18 +00:00
Quddus Chong
c1862737f8 am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956 
* commit 'f253e7d547f22bb02ef943bd80f598ca30302bda':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
 2015-05-29 18:55:02 +00:00
Quddus Chong
f253e7d547 am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956 
* commit 'c4d39dfc6c00578d4f7b9970bc9b33b237a1da54':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
 2015-05-29 18:40:50 +00:00
Quddus Chong
c4d39dfc6c docs: Fix issue where images are not appearing in mobile browsers. 
bug: 21517956

Change-Id: Ia00a42cd5c195881885c2f2927ada9acf2e1f453
 2015-05-29 11:23:16 -07:00
Tyler Gunn
2b26e8dcd1 Merge "Un-@hide some missed video APIs." into mnc-dev 2015-05-29 18:18:37 +00:00
John Spurlock
e648c5f1cb Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev 2015-05-29 18:07:36 +00:00
Alex Klyubin
1a23c31752 Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev 2015-05-29 18:01:08 +00:00
Andy Hung
51c1e3bd14 Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev 2015-05-29 17:51:53 +00:00
Jason Monk
2280218a93 Merge "Don't use string that has been removed." into mnc-dev 2015-05-29 17:50:51 +00:00
Jason Monk
5458aded3d Don't use string that has been removed. 
Change-Id: I60edc3f23f40e48013165dccab83af536582f1c4
 2015-05-29 13:44:32 -04:00
Glenn Kasten
e5c3878864 am 92614179: am dedc768f: Fix typo 
* commit '926141795c3115d674be2ed0a735e3b994e31c03':
  Fix typo
 2015-05-29 17:32:51 +00:00
James Cook
63b6320af4 Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 2015-05-29 17:30:23 +00:00
Glenn Kasten
926141795c am dedc768f: Fix typo 
* commit 'dedc768f829908242bda75b56d4a77ff247d5609':
  Fix typo
 2015-05-29 17:18:35 +00:00
Andy Hung
04065187d9 Clarify AudioFormat sample rate and encoding documentation 
Bug: 21476142
Change-Id: I74fa3fcced5cc197a4cee6a7c10f3ed4690b0af1
 2015-05-29 10:17:40 -07:00
Tyler Gunn
a2df92512b Un-@hide some missed video APIs. 
- renamed some methods to match what is in the non-remote version of
the API.
- Renamed RemoteConnection.VideoProvider.Listener to Callback.

Bug: 21474356
Change-Id: I4840e19921dafb4db288a4f8362b14d5dfa0aea1
 2015-05-29 10:05:46 -07:00
Alex Klyubin
a8c837f11a Add algorithm aliases for Android Keystore HMACs. 
The aliases have been copied from Conscrypt.

Bug: 18088752
Change-Id: I1c66d8c3655f57db41cc0b9cc88d08b44b4a774b
 2015-05-29 10:02:31 -07:00
Alex Klyubin
7cbcfd4fc1 Refactor Android Keystore CipherSpi base class. 
This makes Android Keystore's CipherSpi base class suitable for
implementing AES and RSA ciphers. Previously, the class was heavily
biased towards only AES.

Bug: 18088752
Change-Id: I6bd1ca54165592d28482e56471dcfe0344337cf4
 2015-05-29 09:53:05 -07:00
Tony Mantler
85b039f348 Merge "Move ZoneGetter into SettingsLib" into mnc-dev 2015-05-29 16:44:39 +00:00
John Spurlock
8be53eaaf7 Zen: Add warning text if total silence will eat the next alarm. 
Bug: 21359239
Change-Id: I8a69738e6488f40f24eed622529c913b6c3865a0
 2015-05-29 12:18:34 -04:00
Geoff Mendal
55b4b2d5a8 Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 2015-05-29 15:57:51 +00:00