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

149274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sandeep Siddhartha
9caf4f9da7 am 40d28dd1: am bd3a24b1: Fix delete clause for sound model DB 
* commit '40d28dd13c0b7d16cb0eb27ab37fae1bdaf102c3':
  Fix delete clause for sound model DB
 2014-08-13 18:03:58 +00:00
destradaa
fa3f594bda am 84e1d77c: am fa0ddb7b: Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev 
* commit '84e1d77cc8ec8ad1c8f2c6f07eeeb1f1ff62da27':
  Update FlpHardwareProvider native layer, to stop raising FatalErrors.
 2014-08-13 18:03:53 +00:00
Dianne Hackborn
453c1ba472 am 5c95bce5: am 604f5487: Merge "Fix some IntentFilter docs." into lmp-dev 
* commit '5c95bce5aa5dd15d933e1daa954864337d5e1f4b':
  Fix some IntentFilter docs.
 2014-08-13 17:56:05 +00:00
Sandeep Siddhartha
200a0dac54 am bd3a24b1: Fix delete clause for sound model DB 
* commit 'bd3a24b16033217901b16a639fd2a606368400e1':
  Fix delete clause for sound model DB
 2014-08-13 17:55:34 +00:00
destradaa
f1076d123b am fa0ddb7b: Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev 
* commit 'fa0ddb7b8ab4ab741de9ed689b625f704f89ca35':
  Update FlpHardwareProvider native layer, to stop raising FatalErrors.
 2014-08-13 17:55:30 +00:00
Sandeep Siddhartha
a31413a325 Fix delete clause for sound model DB 
Since UUIDs contain '-'s they need to be wrapped within quotes

Bug: 16985919
Change-Id: I624a512ca7fc2494a7737b5465c94a9e161dec88
 2014-08-13 10:52:17 -07:00
Dianne Hackborn
0ecfe3fc7b am 604f5487: Merge "Fix some IntentFilter docs." into lmp-dev 
* commit '604f5487105c9650fa1bc2907b8f666b227e359d':
  Fix some IntentFilter docs.
 2014-08-13 17:51:20 +00:00
ztenghui
7358bd66dc am 7fec32e6: am cd65c61f: Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal"" 
* commit '7fec32e6f2be63f8ac23a4040eb857ac747d48cf':
  Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
 2014-08-13 17:48:37 +00:00
Stephen Hines
42a33d5bbf am b75dc06b: am 4179e889: Merge "Revert "Collapse code paths for single- and multi-input kernels."" 
* commit 'b75dc06bbe2fdff1a4c9baa69eb92a849c22715d':
  Revert "Collapse code paths for single- and multi-input kernels."
 2014-08-13 17:43:00 +00:00
ztenghui
6ea12eaa2c am cd65c61f: Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal"" 
* commit 'cd65c61ff84ef4fb7d53076b1b32e792a8ba4dbc':
  Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
 2014-08-13 17:42:40 +00:00
Stephen Hines
b75dc06bbe am 4179e889: Merge "Revert "Collapse code paths for single- and multi-input kernels."" 
* commit '4179e88963456946fe6e580f2211341cc8ccba5c':
  Revert "Collapse code paths for single- and multi-input kernels."
 2014-08-13 17:39:12 +00:00
Stephen Hines
c27ebda05e am 5aaeb8e8: am 24a2ee66: Merge "Collapse code paths for single- and multi-input kernels." 
* commit '5aaeb8e89eb0afd710ba9586f5e314b76e806116':
  Collapse code paths for single- and multi-input kernels.
 2014-08-13 17:34:59 +00:00
Adrian Roos
a42bf4c31b am 38afacab: am 6b3fc443: Dismiss bouncer when onTrustInitiatedByUser fires 
* commit '38afacabc5ee4fb29e6d1271643dc0f76fbae94b':
  Dismiss bouncer when onTrustInitiatedByUser fires
 2014-08-13 17:33:13 +00:00
Adrian Roos
6bac42b3e1 am 259cac63: am 1ce3f5c0: QS Brightness Mirror: Also mirror setMax 
* commit '259cac63a4e3824b7fe9299919417320242d72f8':
  QS Brightness Mirror: Also mirror setMax
 2014-08-13 17:33:06 +00:00
Adrian Roos
68d7c72920 am 6b3fc443: Dismiss bouncer when onTrustInitiatedByUser fires 
* commit '6b3fc443c31726ae316e1774181c11e097fb2ea1':
  Dismiss bouncer when onTrustInitiatedByUser fires
 2014-08-13 17:28:49 +00:00
Adrian Roos
a9308d8f1e am 1ce3f5c0: QS Brightness Mirror: Also mirror setMax 
* commit '1ce3f5c037b7ee03cd2e9aba27830b635430bd9e':
  QS Brightness Mirror: Also mirror setMax
 2014-08-13 17:28:45 +00:00
ztenghui
eceec05d4c Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal"" 
This reverts commit d0a9544a772c906ed68793209d1e4a809174cca2.
 2014-08-13 17:25:15 +00:00
kmccormick
a47f052279 am 398c25c4: am 440b696e: am 91917623: am 37bdcbbb: am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit '398c25c4499282b2745bd91d3e1a9a4b5b68c551':
  Doc Change: remove obsolete links.
 2014-08-13 17:25:14 +00:00
Adrian Roos
2bb8bfd1e8 Dismiss bouncer when onTrustInitiatedByUser fires 
Also modifies the SampleTrustAgent to allow testing of the feature
and adds the initiatedByUser flag to the dumpsys output.

Bug: 16840500
Change-Id: I4c08ddcdcbd0ab02c694a1873f73cb9a250f98d7
 2014-08-13 17:24:36 +00:00
Adrian Roos
959409b86f QS Brightness Mirror: Also mirror setMax 
Follow-up to Ic1f934f9ddbb582453b4b52a4b4402c71ac79654

Bug: 15408618
Change-Id: I3ea82f011f366fe34be2ff07546a7f46c1c3dc55
 2014-08-13 17:23:19 +00:00
kmccormick
db387fe269 am 440b696e: am 91917623: am 37bdcbbb: am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit '440b696eab4d6a0a596553fa8a137e92385b7c9b':
  Doc Change: remove obsolete links.
 2014-08-13 17:20:47 +00:00
destradaa
2abc32c18b am d5f85ed7: am 02281fbb: Merge "Add additional logging around AGPS IP Address handling." into lmp-dev 
* commit 'd5f85ed7a6e2dafe8f3fafed3b779515915c39ad':
  Add additional logging around AGPS IP Address handling.
 2014-08-13 17:17:07 +00:00
kmccormick
ca17708880 am 91917623: am 37bdcbbb: am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit '919176239fd68a801cf4af8c9ba959f1fb574bd8':
  Doc Change: remove obsolete links.
 2014-08-13 17:15:36 +00:00
destradaa
4f74fee2fe am 02281fbb: Merge "Add additional logging around AGPS IP Address handling." into lmp-dev 
* commit '02281fbb59d2e22633caa8b55fb50ed23d1cba5e':
  Add additional logging around AGPS IP Address handling.
 2014-08-13 17:12:06 +00:00
kmccormick
919176239f am 37bdcbbb: am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit '37bdcbbba2db31f0efb8aa900ba7ce81a710e08c':
  Doc Change: remove obsolete links.
 2014-08-13 17:09:15 +00:00
kmccormick
37bdcbbba2 am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit 'bcdbe1a0fcb9c24cdc4ee402f29f279ef2b9e7fa':
  Doc Change: remove obsolete links.
 2014-08-13 17:05:01 +00:00
Stephen Hines
5aaeb8e89e am 24a2ee66: Merge "Collapse code paths for single- and multi-input kernels." 
* commit '24a2ee660aa216d45b06304303c1efa01f011024':
  Collapse code paths for single- and multi-input kernels.
 2014-08-13 17:02:31 +00:00
Stephen Hines
24a2ee660a Merge "Collapse code paths for single- and multi-input kernels." 2014-08-13 16:51:59 +00:00
Torne (Richard Coles)
17c1e3dd3f am 31a91904: am eafbb2f8: Merge "Add trace events to WebView startup." into lmp-dev 
* commit '31a91904feab4701666d59285f23cd280cb4c50d':
  Add trace events to WebView startup.
 2014-08-13 16:39:07 +00:00
Torne (Richard Coles)
6922227615 am eafbb2f8: Merge "Add trace events to WebView startup." into lmp-dev 
* commit 'eafbb2f8a04cf8cba37e5fd2828dcb904b0a424c':
  Add trace events to WebView startup.
 2014-08-13 16:34:06 +00:00
Robert Ly
946e6882dd am 5651dab7: am 683306d4: am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '5651dab74639906cb8782bfaf6450ebfbe5ec7e4':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:26:49 +00:00
Robert Ly
aa38054c19 am 683306d4: am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '683306d449a42a26300a3a09c5bbe83518b34c05':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:22:05 +00:00
Robert Ly
b369ff7b38 am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '84f00277b11a0324f0dd08054b119f2a61f1e646':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:17:49 +00:00
Robert Ly
84f00277b1 am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '9ada140fc1a8cb6dabc0b0951249cb7a46578c37':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:12:37 +00:00
Robert Ly
9ada140fc1 am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit 'efbbb18241c8b74a2813b48af2aeff8f03fbe8e7':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:07:40 +00:00
Jean-Michel Trivi
114e293143 am 94dc549b: am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 
* commit '94dc549b6fe45fd4bde0bedf035fb34eb4b797b8':
  Add support for AudioAttributes in android.media.Ringtone
 2014-08-13 16:07:32 +00:00
Jean-Michel Trivi
9dfce1e648 am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 
* commit 'f181197f9729dbb629c1383efd5faa3f3e0e4558':
  Add support for AudioAttributes in android.media.Ringtone
 2014-08-13 15:59:47 +00:00
Raph Levien
06324495db am 89b0dc88: am c2a5903e: Merge "Resolve invalid Typeface style to default" into lmp-dev 
* commit '89b0dc88c0cc1d65370dc53050b5bfbcbb0827af':
  Resolve invalid Typeface style to default
 2014-08-13 15:37:58 +00:00
Raph Levien
179c9a2e29 am c2a5903e: Merge "Resolve invalid Typeface style to default" into lmp-dev 
* commit 'c2a5903ecd76afdc33a088ce55620dc73e7c9d68':
  Resolve invalid Typeface style to default
 2014-08-13 15:33:14 +00:00
John Spurlock
401851159c am 5f5a53d4: am f69796cf: Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev 
* commit '5f5a53d4ef5ae248814df733dc32f24f80530f33':
  Send LED signal up to SystemUI regardless of setting.
 2014-08-13 15:19:54 +00:00
John Spurlock
4d02366538 am f69796cf: Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev 
* commit 'f69796cffc86e4a5136abd55f46f461c6f5ba2e7':
  Send LED signal up to SystemUI regardless of setting.
 2014-08-13 15:15:10 +00:00
Jorim Jaggi
728f39f578 am 119b3c40: am 36abea42: Merge "Lockscreen launch animations" into lmp-dev 
* commit '119b3c40078d532dce4b1de56f4645b6ea587874':
  Lockscreen launch animations
 2014-08-13 14:13:41 +00:00
Jorim Jaggi
bbc461f62a am 36abea42: Merge "Lockscreen launch animations" into lmp-dev 
* commit '36abea426c76463185d2befa8e459a7cefe2bbc9':
  Lockscreen launch animations
 2014-08-13 14:09:35 +00:00
Selim Cinek
49ef812f71 am 7ff730f7: am e2116c44: Merge "Reuse existing TouchHelpers on rotation" into lmp-dev 
* commit '7ff730f770a510e2809f34075a8b88949133daa8':
  Reuse existing TouchHelpers on rotation
 2014-08-13 14:07:22 +00:00
Selim Cinek
3a51f54ac2 am e2116c44: Merge "Reuse existing TouchHelpers on rotation" into lmp-dev 
* commit 'e2116c44bd7f290698f889c356e49746c7677909':
  Reuse existing TouchHelpers on rotation
 2014-08-13 14:01:55 +00:00
Selim Cinek
7f6e8cfe7f am 52f1b0d2: am 5aeb57d5: Merge "Reset the notification expanded states on screen off" into lmp-dev 
* commit '52f1b0d2cf423d2e3612b50941a8ee7f0db1cbff':
  Reset the notification expanded states on screen off
 2014-08-13 13:55:22 +00:00
Selim Cinek
bf65204d2d am 5aeb57d5: Merge "Reset the notification expanded states on screen off" into lmp-dev 
* commit '5aeb57d5a568ab975d96cd29e24d18d38ff997f8':
  Reset the notification expanded states on screen off
 2014-08-13 13:51:10 +00:00
Lorenzo Colitti
0da5e91b90 am ac292abc: am 22ecb7de: Switch RouteInfo to use IpPrefix instead of LinkAddress. 
* commit 'ac292abc8f367da4f0098873dfbf58c6f04cb03f':
  Switch RouteInfo to use IpPrefix instead of LinkAddress.
 2014-08-13 13:12:08 +00:00
Lorenzo Colitti
29fc0ba18a am 22ecb7de: Switch RouteInfo to use IpPrefix instead of LinkAddress. 
* commit '22ecb7de88e2afb20afd09a8219b924a36850d4b':
  Switch RouteInfo to use IpPrefix instead of LinkAddress.
 2014-08-13 13:08:20 +00:00
Lorenzo Colitti
1806b1fc25 Switch RouteInfo to use IpPrefix instead of LinkAddress. 
This addresses a TODO and also makes it possible to create
routes to destinations that are not valid LinkAddresses, such as
multicast addresses.

Bug: 16875580
Change-Id: Id4c77b00dc3064bf27d78cdcbbe035e645748cfe
 2014-08-13 21:17:20 +09:00