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

197232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olawale Ogunwale
37938cfcc1 am 995846a4: am d147203b: am ad2be762: Merge "Fix null pointer dereference when security exception occurs" 
* commit '995846a4310ef4270177bf9d6c6673827b5625af':
  Fix null pointer dereference when security exception occurs
 2015-06-01 15:48:14 +00:00
Olawale Ogunwale
3ec7b82bba am 185a3d7d: am f9efac12: am 5ef53783: Merge "WindowManagerService not propagating X and Y steps" 
* commit '185a3d7d3566348a191a448d3aff1ec6c2b97033':
  WindowManagerService not propagating X and Y steps
 2015-06-01 15:48:08 +00:00
Chris Wren
b74836329c am bb5ef426: am 8517a793: am 0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev 
* commit 'bb5ef42654b5a1dd768ece4a002ba0bbb941e7c6':
  add time-in-mode metrics for zen mode
 2015-06-01 15:48:02 +00:00
Adrian Roos
c2b1bf18cb am a3cd7dda: am 4adc3b00: am e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev 
* commit 'a3cd7dda9763c56f9ebdaa79700c8ed246a5ca75':
  Hide KeyguardMessageArea if empty
 2015-06-01 15:47:56 +00:00
destradaa
b1190c779f am 36cb20bc: am aff14c59: am ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868 
* commit '36cb20bc547e2d762f8ee51398143b0ab4cc0b59':
  Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868
 2015-06-01 15:47:50 +00:00
Yohei Yukawa
a6c4c80cc7 am 1d95daf3: am 4ad0161a: am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev 
* commit '1d95daf37dd492ae3f7c1ea0a35114ae32dcaecf':
  Revert "Rely on IMM#focusOut() to close input session."
 2015-06-01 15:47:43 +00:00
Doris Liu
626e3fa160 am 0040c7d2: am c2713141: am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev 
* commit '0040c7d2bab147d4ea88aa7d0299bd51420b799f':
  Update doc to include how clipToPadding affects EdgeEffect
 2015-06-01 15:47:38 +00:00
Svetoslav
b12280202d am d5464b9d: am 80c2cc14: am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev 
* commit 'd5464b9d07f6d5cf39d8173d5a026ce457dc458f':
  Use AtomicFile APIs correctly when reading.
 2015-06-01 15:47:32 +00:00
Alex Klyubin
df748ed7ca am c623d988: am db57c48e: am d377b067: Merge "Cleanup Binder token resetting." into mnc-dev 
* commit 'c623d9887be68d9c647dd40dc55743bb61b791ab':
  Cleanup Binder token resetting.
 2015-06-01 15:47:24 +00:00
John Spurlock
94d78b6bf0 am 7eac7b5a: am 68a00c52: am 2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev 
* commit '7eac7b5af10da68cb11737a3f7fcdc2012cda87f':
  Zen: Dim status bar alarm icon when zen = total silence.
 2015-06-01 15:47:19 +00:00
Jorim Jaggi
7014339477 am 79187252: am 36325016: am 2400197f: Enable Keyguard debug logging 
* commit '791872526f2461853cdab8744369bc6a3cc2ad06':
  Enable Keyguard debug logging
 2015-06-01 15:47:13 +00:00
Alex Klyubin
834191f14e am c95fba73: am 1a3ab87e: am 614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev 
* commit 'c95fba73540c475b92b3e9ce977992cd565d1a04':
  Refactor Android Keystore CipherSpi base class.
 2015-06-01 15:47:08 +00:00
Quddus Chong
9ee8835ca4 am 61333026: am d5796be5: am c1862737: am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956 
* commit '613330265bc8be621c924f45ffdca76d3c745195':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
 2015-06-01 15:47:02 +00:00
Tyler Gunn
9c3857161b am 791eac86: am 19eadcab: am 2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev 
* commit '791eac86138e0f8d04c7c507e7410c40114308a1':
  Un-@hide some missed video APIs.
 2015-06-01 15:46:54 +00:00
John Spurlock
950c50e7c4 am 57436577: am f1b897e8: am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev 
* commit '57436577e2771cd4ff81c88d93362325ecd3a8c7':
  Zen: Add warning text if total silence will eat the next alarm.
 2015-06-01 15:46:49 +00:00
Alex Klyubin
7135e60e1a am 3e83ea3f: am 97e7fec6: am 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev 
* commit '3e83ea3f117e3509bcd869141abf2fe0302d0264':
  Add algorithm aliases for Android Keystore HMACs.
 2015-06-01 15:46:44 +00:00
Andy Hung
57f8fbc935 am f3853332: am af739a10: am 51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev 
* commit 'f3853332a4d59a5448cc95c22e33ccee66b83e53':
  Clarify AudioFormat sample rate and encoding documentation
 2015-06-01 15:46:38 +00:00
Jason Monk
b1ce836cb9 am d232a172: am 3e1bdc61: am 2280218a: Merge "Don\'t use string that has been removed." into mnc-dev 
* commit 'd232a172ee34964b74a2ca400a247f37cca0c7f9':
  Don't use string that has been removed.
 2015-06-01 15:46:32 +00:00
Glenn Kasten
addc6ec637 am d90bcad5: am 507758f2: am e5c38788: am 92614179: am dedc768f: Fix typo 
* commit 'd90bcad521166be4ddcfe77090f855e1c57fff50':
  Fix typo
 2015-06-01 15:46:26 +00:00
James Cook
fe114c68bb am fcce03b6: am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 
* commit 'fcce03b6085b3faaaa2c95a6c32343be07cce2a3':
  assist: Fix reported colors/styles for TextView/Switch
 2015-06-01 15:46:20 +00:00
Tony Mantler
365ba67af8 am 8e56a1a6: am 29ef4811: am 85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '8e56a1a67d767d5c504232bbc697fe5de41acb7c':
  Move ZoneGetter into SettingsLib
 2015-06-01 15:46:14 +00:00
Geoff Mendal
935591ac33 am c38f2008: (-s ours) am c5508f85: (-s ours) am 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit 'c38f20080304c18bdb0bf90f942146ca53dff752':
  Revert "Import translations. DO NOT MERGE"
 2015-06-01 15:46:08 +00:00
Geoff Mendal
ffeeba154c am 777767cb: (-s ours) am 8474bf48: (-s ours) am 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '777767cb928123684d4e30f5eb5bbaf3d560cca3':
  Revert "Import translations. DO NOT MERGE"
 2015-06-01 15:46:04 +00:00
Geoff Mendal
1685c5ac41 am ed2f33ce: (-s ours) am 6c15c153: (-s ours) am 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit 'ed2f33ce76eac9b74b9b105bafbc328560b18d57':
  Revert "Import translations. DO NOT MERGE"
 2015-06-01 15:45:57 +00:00
John Spurlock
97a988b11c am a0962acf: am 8cf1276c: am 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev 
* commit 'a0962acfbe9d0d1d852e4b4aced18974a6ea6141':
  Tuner: add battery pct preference.
 2015-06-01 15:45:51 +00:00
Geoff Mendal
9a1078fdea am e30f773c: (-s ours) am 060b2ce9: (-s ours) am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e30f773ca54de3616cd1eeb935c871b60268b3c7':
  Import translations. DO NOT MERGE
 2015-06-01 15:45:46 +00:00
Geoff Mendal
3dc2f0a550 am b6dae108: (-s ours) am 76625fec: (-s ours) am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'b6dae108b33381f4478781136b0dc395fde38136':
  Import translations. DO NOT MERGE
 2015-06-01 15:45:40 +00:00
Geoff Mendal
4e1fd143b2 am 36fc6a88: (-s ours) am 57103ebf: (-s ours) am df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '36fc6a88d266ae18151971d390d5e7c9b6d91f55':
  Import translations. DO NOT MERGE
 2015-06-01 15:45:35 +00:00
Geoff Mendal
12249bfe83 am 39a58e87: (-s ours) am 408606f3: (-s ours) am 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '39a58e878c58579ab22b855a50d33398dbf5a7ff':
  Import translations. DO NOT MERGE
 2015-06-01 15:45:29 +00:00
Xiyuan Xia
9ec5c071e6 am bfcdb7b4: am 223826b3: am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev 
* commit 'bfcdb7b41bcff438243fbaa02580af7f5202cf11':
  Avoid keyguard UI layout dimensions underflow
 2015-06-01 15:45:23 +00:00
Geoff Mendal
2a21256a54 am 7b5e5d5a: (-s ours) am 7ec9264f: (-s ours) am 642c4fc5: (-s ours) Import translations. DO NOT MERGE 
* commit '7b5e5d5ade3d43c691afc2af389608f84823e19e':
  Import translations. DO NOT MERGE
 2015-06-01 15:45:17 +00:00
Narayan Kamath
13d739f576 am 0bc58c6b: am 2de63d7c: am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 
* commit '0bc58c6b5c72261b9821df70d38ed4bc708a7596':
  Avoid inspecting packages twice to deduce ABIs for moves / installs.
 2015-06-01 15:45:11 +00:00
John Spurlock
19d133c1b2 am f7043e28: am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 
* commit 'f7043e284a8480df5cdbca26ff75354d2b243bb7':
  Zen: Use account name instead of calendar id in event conditions.
 2015-06-01 15:45:05 +00:00
Selim Cinek
955ff80dfc am 19eee4a4: am 4dbe7c0d: am ff3bf4b1: Increased the falsing treashold for quick settings 
* commit '19eee4a498c84c73ea401d3d6cf95eb640f66ff0':
  Increased the falsing treashold for quick settings
 2015-06-01 15:44:58 +00:00
Dirk Dougherty
69dc59c404 am 9fc33d8d: 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 '9fc33d8d950971435fe61de6c68d20fab5004afe':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
 2015-06-01 15:44:53 +00:00
David Friedman
8d34b769a5 am 1be7fb90: am bc0e7f28: am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another. 
* commit '1be7fb908aa45ffe93279a4e566c994ee8779aa2':
  Docs: Corrects technical content of one sentence, and deletes another.
 2015-06-01 15:44:48 +00:00
Guang Zhu
9d76732b3d am 74ecc15d: am 0ca15144: am 9bb76544: fix NPE in shutdown thread 
* commit '74ecc15db923fdc8c94ac156aa1b6c923173b50a':
  fix NPE in shutdown thread
 2015-06-01 15:44:42 +00:00
Andrew Solovay
ec1d01a3cc am 739b6941: am 74f4e4f1: am 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix 
* commit '739b6941f6a9297c45312b3a1eec4b099d3f6325':
  docs: Quick spelling fix
 2015-06-01 15:44:37 +00:00
Sungsoo Lim
29396bc932 am 26eed049: am f819ac38: am 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev 
* commit '26eed04988d57faff5e0d85a9faaa6c8c15a6002':
  Send a message with data in MediaController.MessageHandler.post()
 2015-06-01 15:44:30 +00:00
Yorke Lee
ebfb515994 am ac8b0b02: am 923df3da: am d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev 
* commit 'ac8b0b024acdb7e0b3003d63fecfb8bf0ffbb869':
  Make ACTION_CONNECTION_SERVICE_CONFIGURE public
 2015-06-01 15:44:24 +00:00
Glenn Kasten
0e23d67c4e am 66127840: am a84e73a7: am ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev 
* commit '66127840c3faa1f832cf252647d6c5fff88bd02b':
  Improve error handling for AudioTrack write with PTS
 2015-06-01 15:44:19 +00:00
Raph Levien
ddcd2215df am 1091defa: am 023973ec: am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev 
* commit '1091defa85b7e31f9b7c67735c19af33268b341d':
  Use getRunAdvance to position cursor
 2015-06-01 15:44:14 +00:00
Alan Viverette
c3cf4b67c7 am 41eeeca2: am 4e419432: am a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev 
* commit '41eeeca272f5250c0a33ef65fb8ffb296324c115':
  Synchronize Theme.Material and Theme.Material light attributes
 2015-06-01 15:44:09 +00:00
Makoto Onuki
24f84d3432 am 7b8612d0: am 8c48834b: am 0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev 
* commit '7b8612d0eae188b5090f60fb4d080d6634182d0c':
  CountryDetector no longer requires location permissions.
 2015-06-01 15:44:03 +00:00
Yohei Yukawa
9b039ef2a9 am 47d691ba: am 92086e06: am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev 
* commit '47d691baf79f863f9ad3091642c7f9944eed3b21':
  Rely on IMM#focusOut() to close input session.
 2015-06-01 15:43:59 +00:00
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
Olawale Ogunwale
995846a431 am d147203b: am ad2be762: Merge "Fix null pointer dereference when security exception occurs" 
* commit 'd147203bc43926caddf953732682fc384ab597cb':
  Fix null pointer dereference when security exception occurs
 2015-06-01 15:33:56 +00:00
Olawale Ogunwale
185a3d7d35 am f9efac12: am 5ef53783: Merge "WindowManagerService not propagating X and Y steps" 
* commit 'f9efac1291d7ada7806215d0f63661d6864e9974':
  WindowManagerService not propagating X and Y steps
 2015-06-01 15:33:50 +00:00