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

148518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andres Morales
396181b0cb Mark PDBManager as a SystemApi 
This will allow us to XTS test these APIs

Change-Id: Ife942f73580ea24eb6801b079b642d7c67107ab0
 2014-08-13 19:48:08 +00:00
Adrian Roos
15931b1d99 am cf4d504e: Merge "QS UserSwitcher: Update exit guest string" into lmp-dev 
* commit 'cf4d504e708a18bf804191f88ef59c748993e1c7':
  QS UserSwitcher: Update exit guest string
 2014-08-13 19:40:24 +00:00
Adrian Roos
7214a63250 am 009cd491: Merge "Status bar header: Fix Settings shortcut content description" into lmp-dev 
* commit '009cd49180827302ff63c67a83efcbf20a8f424f':
  Status bar header: Fix Settings shortcut content description
 2014-08-13 19:40:19 +00:00
Adrian Roos
ffefed058f am d63b258c: Trust: Insecure unlock also removes disable-trust-on-boot restriction 
* commit 'd63b258c0b40e0177ec8d508281a905ae3dc53ce':
  Trust: Insecure unlock also removes disable-trust-on-boot restriction
 2014-08-13 19:36:05 +00:00
Chulwoo Lee
04bd234142 am f62931dc: Merge "TIF: Enable to build uri for browsableOnly channels" into lmp-dev 
* commit 'f62931dc0f2f44325a47bb7e099734ab8ceeea4d':
  TIF: Enable to build uri for browsableOnly channels
 2014-08-13 19:31:53 +00:00
Adrian Roos
9dbe190099 Trust: Insecure unlock also removes disable-trust-on-boot restriction 
Bug: 16485702
Change-Id: I437f619eb680fa9461a5e0d854db2d9f84dc602c
 2014-08-13 19:31:29 +00:00
Ihab Awad
4368a26040 am 5ba3f456: Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev 
* commit '5ba3f4563231fd81e3e1c7c56eab66fd9d02d570':
  Final structural tweaks to Telecomm API (1/8)
 2014-08-13 19:01:31 +00:00
kmccormick
271e19f3d6 am 625e3f89: am 7b708ec3: am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit '625e3f89f20ff7282e095cd48cfa1da64abb17db':
  Doc Change: Remove obsolete sample link.
 2014-08-13 19:01:27 +00:00
kmccormick
a33ec00e49 am 7b708ec3: am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit '7b708ec3178e30a18e4680a9903a65a13b4c32d2':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:55:37 +00:00
kmccormick
7b708ec317 am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit '0672ea6f3f9f5a8dfcea75b405eb83057746e4e9':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:50:43 +00:00
kmccormick
0672ea6f3f am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit 'a0197180e76bad29a4b6eaed5c43cd922bc1803d':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:43:20 +00:00
ztenghui
ba69a2454b am e629d02b: Bring back the shadow strength tweak 
* commit 'e629d02ba346bf7f14557786ae3171b201cd179f':
  Bring back the shadow strength tweak
 2014-08-13 18:35:12 +00:00
ztenghui
14a4e35208 Bring back the shadow strength tweak 
bug:16712006

Change-Id: Ifc0ecca139d58140b45d7d227536a53069e1d480
 2014-08-13 18:22:42 +00:00
Craig Mautner
c94196c6d2 am 3e8ccb9c: Clean up app following death when creating service 
* commit '3e8ccb9ca4e01ff446c22f932cf4d1ab803f3108':
  Clean up app following death when creating service
 2014-08-13 18:20:43 +00:00
Craig Mautner
4a8dddbf18 Clean up app following death when creating service 
If an app has died, run through the cleanup before relaunching its
service.

Also a little simplifying refactor.

Fixes bug 16979752.

Change-Id: I376cbef2ea00fc626588386317f092cc6dea0bdc
 2014-08-13 18:15:28 +00:00
Craig Mautner
29d8f9103a am 8844c75a: Merge "Disassociate system windows from apps" into lmp-dev 
* commit '8844c75aea3708ab29f7dd3cba4b1b8eaaf799aa':
  Disassociate system windows from apps
 2014-08-13 18:12:40 +00:00
Ying Wang
18eff684be am d364499e: Remvoe build log spam. 
* commit 'd364499e393d31ffffa870590734fb8e3efa89b9':
  Remvoe build log spam.
 2014-08-13 18:08:05 +00:00
Ying Wang
160c6fc1e9 Remvoe build log spam. 
Change-Id: I87a0864d1f4d1c01f660f2bb603b5d0b42e19b53
 2014-08-13 10:59:46 -07: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
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
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
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
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
Lajos Molnar
eed01e068b Merge "media: release allocated strings on error" into lmp-dev 2014-08-13 16:52:03 +00:00
Dianne Hackborn
57839cf0b2 Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into lmp-dev 2014-08-13 16:52:03 +00:00
Dianne Hackborn
9c3e74f1f7 Fix issue #16794553: Duplicate ArrayMap entries in Bundle... 
...can lead to launching of un-exported activities

We now validate the array map after unparcelling to make sure there
are no duplicate keys.

And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values.  There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.

Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
 2014-08-13 17:24:45 -07:00
Jae Seo
67241476f3 Merge "TIF: Create TvInputState only once per each input" into lmp-dev 2014-08-13 16:52:03 +00:00
Jae Seo
9cc28e5175 TIF: Create TvInputState only once per each input 
Also removed mClientTokens which is no longer used.

Bug: 16970763
Change-Id: I4fc276241c33f88ed932ce6c703bdb3f771eb7d4
 2014-08-13 11:06:53 -07: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
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
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
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
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
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
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
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
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