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

126918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
0839a55bbd am 4377086f: am 9c99c55d: (-s ours) am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front." 
* commit '4377086f9412ab61f67907e9f1d487a45def5ac5':
  DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
 2014-03-28 23:46:06 +00:00
Adam Hampson
88b6ebec9d am 6f9bddc8: am e8609de4: am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 
* commit '6f9bddc846e2915d1b1db2310a785be8ab7c91a6':
  hdmi: cec: add permission name to dump permission denial message
 2014-03-28 23:46:03 +00:00
Aaron Whyte
c693c6a96d am 868f373b: am 23fd13de: am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted 
* commit '868f373b65200ace63b143da60a270bb18903d82':
  Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
 2014-03-28 23:46:00 +00:00
Craig Mautner
4377086f94 am 9c99c55d: (-s ours) am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front." 
* commit '9c99c55d03a66ad5ba47584340c527c0f843bbe8':
  DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
 2014-03-28 23:40:27 +00:00
Adam Hampson
6f9bddc846 am e8609de4: am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 
* commit 'e8609de4fb3635ab7182283e94ac56b48c07463a':
  hdmi: cec: add permission name to dump permission denial message
 2014-03-28 23:40:23 +00:00
Aaron Whyte
868f373b65 am 23fd13de: am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public k 
* commit '23fd13de62762e98c32f2b7525f01f0bcdf416fd':
  Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
 2014-03-28 23:40:13 +00:00
Selim Gurun
98942087da am b4f27c95: Merge "Support for new gTLDs" 
* commit 'b4f27c95bcfd4ceb5ced42efcf20bcd2faa2b626':
  Support for new gTLDs
 2014-03-28 23:38:55 +00:00
Selim Gurun
b4f27c95bc Merge "Support for new gTLDs" 2014-03-28 23:35:10 +00:00
Craig Mautner
9c99c55d03 am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front." 
* commit '9395dab7c38d540bea926307c448d5cc5032ac7d':
  DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
 2014-03-28 23:05:33 +00:00
Fabrice Di Meglio
4d46742820 am c0469c00: Merge "SearchView improvement for IME" 
* commit 'c0469c00bfd0701d8a8bce9e600cf90a0e60ba98':
  SearchView improvement for IME
 2014-03-28 23:04:47 +00:00
Adam Hampson
e8609de4fb am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 
* commit '594c73fc57c99a0bceaa84ccd7524e5038a17ad8':
  hdmi: cec: add permission name to dump permission denial message
 2014-03-28 23:04:01 +00:00
Aaron Whyte
23fd13de62 am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys. 
* commit 'f10d0399bf5f519dff414a9d195a0eaacb37f9b7':
  Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
 2014-03-28 23:03:56 +00:00
Fabrice Di Meglio
c0469c00bf Merge "SearchView improvement for IME" 2014-03-28 23:01:59 +00:00
Yuhao Zheng
d0082eaca1 am 93627ac8: Merge "Wifi hotspot stack initial hook up" 
* commit '93627ac86c3805aaf545501b586bbca4fbc259e9':
  Wifi hotspot stack initial hook up
 2014-03-28 23:01:16 +00:00
Chris Craik
402272b7e7 am 5db60e0e: Merge "Support shadows on the root RenderNode" 
* commit '5db60e0eb7dc80034f75dafcb8b16b99f5c6e6d5':
  Support shadows on the root RenderNode
 2014-03-28 23:01:13 +00:00
Alan Viverette
916e86161a am e1e06ce8: Merge "Make Widget.Holo.Light.Button.Borderless style public" 
* commit 'e1e06ce84bc3c71a9e1ebb4f55ea68c19d2b9dfb':
  Make Widget.Holo.Light.Button.Borderless style public
 2014-03-28 23:01:10 +00:00
Fabrice Di Meglio
2182f2aaf4 SearchView improvement for IME 
- fix IME not closing when not having a SearchableInfo

Change-Id: I3e6e168be1e26138fe0ceb967bbd12fa35db0903
 2014-03-28 15:56:51 -07:00
Yuhao Zheng
93627ac86c Merge "Wifi hotspot stack initial hook up" 2014-03-28 22:49:51 +00:00
Chris Craik
5db60e0eb7 Merge "Support shadows on the root RenderNode" 2014-03-28 22:33:56 +00:00
Adam Hampson
594c73fc57 Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 2014-03-28 22:22:52 +00:00
Alan Viverette
e1e06ce84b Merge "Make Widget.Holo.Light.Button.Borderless style public" 2014-03-28 22:22:22 +00:00
Aaron Whyte
f10d0399bf Made secure-adb's new-public-key activity configurable. 
Some devices do not have lockscreens themselves, so the plan is to have them
do RPCs to companion devices that can have lockscreens, for allowing or
rejecting unwhitelisted adb public keys.

Change-Id: I6f7504313074e6748c0bd467a29ac3a311036f4d
 2014-03-28 22:21:55 +00:00
Alan Viverette
ec861f32bc Make Widget.Holo.Light.Button.Borderless style public 
Change-Id: I44c1e092fc886821561130ef9d57c2e11d195011
 2014-03-28 15:20:49 -07:00
Craig Mautner
9395dab7c3 am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front." 
* commit 'ff3362f0d8378d616f39cbcf8b86b6f03e7d30b9':
  DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
 2014-03-28 22:16:33 +00:00
Svetoslav
cdde86e7fb am aaa11421: Disable node tree consistency check on user builds. 
* commit 'aaa114215bd1e0a2f526e97571fc5fefcd81cb48':
  Disable node tree consistency check on user builds.
 2014-03-28 22:13:54 +00:00
Chris Craik
b265e2ca50 Support shadows on the root RenderNode 
bug:13211941

Cleans up some of the RenderNode method naming

Also removes unnecessary clip/save/restores, clipping shadows
predictably, as drawn by the parent, before drawing (and clipping,
etc.) the shadow casting child.

Change-Id: I795115e1fb869bbbdd7be43e279b97490fecc7e0
 2014-03-28 14:43:22 -07:00
Svetoslav
aaa114215b Disable node tree consistency check on user builds. 
Change-Id: I6ec8cfc41fefc12e4c8fb6f39715831f072cb074
 2014-03-28 13:43:12 -07:00
Craig Mautner
ff3362f0d8 Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front." 2014-03-28 20:23:34 +00:00
John Spurlock
4d31bd5f7d am 80676064: am ec27a7ca: (-s ours) am 5579ec33: DO NOT MERGE Enhance the NotificationListenerService api. 
* commit '8067606499c5906047df646df310fe4292d499a0':
  DO NOT MERGE Enhance the NotificationListenerService api.
 2014-03-28 19:13:28 +00:00
John Spurlock
8067606499 am ec27a7ca: (-s ours) am 5579ec33: DO NOT MERGE Enhance the NotificationListenerService api. 
* commit 'ec27a7caf3c26506013c49ce1bbe78559bc73b4a':
  DO NOT MERGE Enhance the NotificationListenerService api.
 2014-03-28 19:07:36 +00:00
John Spurlock
ec27a7caf3 am 5579ec33: DO NOT MERGE Enhance the NotificationListenerService api. 
* commit '5579ec33eb317a19ad80929169b2b329b147d98b':
  DO NOT MERGE Enhance the NotificationListenerService api.
 2014-03-28 19:01:10 +00:00
Dan Sandler
8b8290dd16 am 6c3051c4: Merge "Introduce CATEGORY_NOTIFICATION_PREFERENCES." 
* commit '6c3051c4224e72e58e217d9080c9ce3599ff5740':
  Introduce CATEGORY_NOTIFICATION_PREFERENCES.
 2014-03-28 18:54:52 +00:00
Dan Sandler
6c3051c422 Merge "Introduce CATEGORY_NOTIFICATION_PREFERENCES." 2014-03-28 18:51:19 +00:00
Chris Craik
99ce4bda78 am 08c96b55: Merge "Disable shadow overdraw avoidance in the inverse clip case" 
* commit '08c96b5515f061f61e13b348f6022ce7c586e4c4':
  Disable shadow overdraw avoidance in the inverse clip case
 2014-03-28 18:05:10 +00:00
Chris Craik
08c96b5515 Merge "Disable shadow overdraw avoidance in the inverse clip case" 2014-03-28 18:00:03 +00:00
Anders Kristensen
4c0ef1ccea am 83ee4429: am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes." 
* commit '83ee4429f13896c82f3f29c8164888f1f6fe8309':
  Remove duplicate call disconnect codes.
 2014-03-28 17:47:11 +00:00
Anders Kristensen
83ee4429f1 am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes." 
* commit '7bce23f733cfaa1028e553852ff7762d7b32a893':
  Remove duplicate call disconnect codes.
 2014-03-28 17:40:52 +00:00
Robin Lee
10dbf33e7e am 0756e4e4: Merge "Fix privilege escalation for preferred activities" 
* commit '0756e4e42e36e649c858eca1f6c6c05d3422a8c8':
  Fix privilege escalation for preferred activities
 2014-03-28 17:38:12 +00:00
Zhijun He
121e13957c am ecc5c8a4: Merge "Camera2: Fix availableTestPatternModes type" 
* commit 'ecc5c8a4a8590e0ea4aa82b5af8e87e6c2882fae':
  Camera2: Fix availableTestPatternModes type
 2014-03-28 17:38:08 +00:00
Robin Lee
0756e4e42e Merge "Fix privilege escalation for preferred activities" 2014-03-28 17:35:35 +00:00
Zhijun He
ecc5c8a4a8 Merge "Camera2: Fix availableTestPatternModes type" 2014-03-28 17:33:08 +00:00
Anders Kristensen
7bce23f733 am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes." 
* commit 'aee03bb1a1077427c918ad9fea5fdd1ab204f60e':
  Remove duplicate call disconnect codes.
 2014-03-28 17:31:33 +00:00
Anders Kristensen
aee03bb1a1 am 49c06150: Merge "Remove duplicate call disconnect codes." 
* commit '49c061501dbcff0dd6f6621afa76136d0857622a':
  Remove duplicate call disconnect codes.
 2014-03-28 17:27:18 +00:00
ztenghui
093f39c126 am 1c97a526: Merge "Add RevealAnimator" 
* commit '1c97a5266a2cae8177721cab83c62436321e3b41':
  Add RevealAnimator
 2014-03-28 17:22:59 +00:00
Anders Kristensen
49c061501d Merge "Remove duplicate call disconnect codes." 2014-03-28 17:19:57 +00:00
ztenghui
1c97a5266a Merge "Add RevealAnimator" 2014-03-28 17:19:07 +00:00
Zhijun He
a486624a6d Camera2: Fix availableTestPatternModes type 
Also fixed the typo in android.control.mode related
with scene mode.

Change-Id: I5e311bac4694e1ccfc8d3210fbf8b40e1b31ecef
 2014-03-28 10:09:09 -07:00
Robin Lee
5c921daa72 Fix privilege escalation for preferred activities 
Passing in the name of an actual admin should be enough to pass the
security check as it was. This is now fixed as the caller is not
given the opportunity to spoof its own name any more.

Change-Id: Id8be4ca4c8bf3751a1ee8125cf119fa100c81d22
 2014-03-28 15:09:49 +00:00
John Spurlock
5579ec33eb DO NOT MERGE Enhance the NotificationListenerService api. 
Add to NotificationListenerService:
 - getActiveNotificationKeys() : String[]
 - getActiveNotifications(String[] keys) : StatusBarNotification[]
 - cancelNotifications(String[] keys) : void
 - onListenerConnected(String[] keys) : void

Add to StatusBarNotification:
 - getKey() : String

Bug:13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
 2014-03-28 10:19:00 -04:00
John Spurlock
ca4761661a am 0e14f2d4: Merge "Remove obsolete MultiWaveView" 
* commit '0e14f2d45557527242f27ce7de9027e6ccaa45d6':
  Remove obsolete MultiWaveView
 2014-03-28 13:13:50 +00:00