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

126846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Glenn Kasten
5b8fd44365 AudioTrack and AudioRecord JNI cleanup 
Rename nbChannels to our conventional channelCount,
which should make code searches easier.

Change-Id: I3c2791db302558a15bc8be198b6f3d482e0e0055
 2014-03-28 15:44:45 -07:00
Glenn Kasten
2fbf25b50f Fix warnings 
Change-Id: Ie00f6c58a944e2db0539f1119d2983a483b6f10c
 2014-03-28 15:42:29 -07:00
Chris Craik
5db60e0eb7 Merge "Support shadows on the root RenderNode" 2014-03-28 22:33:56 +00:00
Alan Viverette
351f0c1d26 Remove unthemed drawable cache, since canApplyTheme != isThemed 
Change-Id: I460673bfa491e67ea239f8ebb03898a0633e7565
 2014-03-28 15:25:27 -07: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
Glenn Kasten
167d1a2771 Fix typo 
Change-Id: I7c2fb560b8d8778afad237aadd97e8e94dd865e7
 2014-03-28 15:22:11 -07: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
Glenn Kasten
c806050a07 Synchronize channel masks in AudioFormat with system/audio.h 
AudioFormat channel mask comments

Change-Id: I8b43cb58cd9d3a33bf02aa0455bbfc16ed29f9ae
 2014-03-28 15:16:50 -07:00
Jeff Hao
d648e5f7ba am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater." 
* commit 'e9b4fd0718c00a504602453185de676618beed4b':
  Mark constructor as accessible in LayoutInflater.
 2014-03-28 22:16:41 +00:00
Craig Mautner
155e313340 am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off." 
* commit 'd511bc17d614b1291f1b85f84180c1db157d2790':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
 2014-03-28 22:16:38 +00:00
Michael Wright
6a14146b37 am e328056d: Merge "Add support for additional international keyboard mappings" 
* commit 'e328056ddcba0edd0e49b4697dfcc84f3658cb39':
  Add support for additional international keyboard mappings
 2014-03-28 22:16:35 +00: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
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
Jeff Hao
e9b4fd0718 Merge "Mark constructor as accessible in LayoutInflater." 2014-03-28 21:41:21 +00:00
Svetoslav
aaa114215b Disable node tree consistency check on user builds. 
Change-Id: I6ec8cfc41fefc12e4c8fb6f39715831f072cb074
 2014-03-28 13:43:12 -07:00
Craig Mautner
d511bc17d6 Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off." 2014-03-28 20:27:33 +00:00
Michael Wright
e328056ddc Merge "Add support for additional international keyboard mappings" 2014-03-28 20:26:08 +00: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
Michael Wright
d08c864784 Add InputDevice#supportsSource(int). 
This mirrors the InputEvent#isFromSource API.

Change-Id: Ie4869cc52d22d49a71d4d3e22f1ae38b16367395
 2014-03-28 12:59:34 -07: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
6c3051c422 Merge "Introduce CATEGORY_NOTIFICATION_PREFERENCES." 2014-03-28 18:51:19 +00:00
Jeff Hao
e3abd2ccbe Mark constructor as accessible in LayoutInflater. 
Needed to bypass new access checks for fields, methods, and
constructors.

Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
 2014-03-28 11:33:53 -07:00
Chris Craik
08c96b5515 Merge "Disable shadow overdraw avoidance in the inverse clip case" 2014-03-28 18:00:03 +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
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
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
Robert Craig
172d38bcda Change when the SELinux relabel of /data/data occurs. 
Perform the relabel of the /data/data/<pkg> directories
when the app is being scanned by the PMS. The impetus
for this change was that the data directories of forward
locked apps were receiving the wrong label during an
OTA. Because the PMS doesn't actually scan forward locked
apps til later in the boot process, the prior restorecon
call was actually applying the default label of
system_data_file for all such apps. By performing a
restorecon on each individual app as they are entered into
the PMS we can handle them correctly. This mechanism also
allows us to pass down the seinfo tag as part of the
restorecon call which drops our need to rely on the contents
of packages.list.

Change-Id: Ie440cba2c96f0907458086348197e1506d31c1b6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-03-28 12:24:29 -04: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
0e14f2d455 Merge "Remove obsolete MultiWaveView" 2014-03-28 13:11:09 +00:00
John Spurlock
a4294297d4 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: Idd9605dad8f942d68b4b32ab9625faf6c8642db9
 2014-03-28 08:47:01 -04:00
Selim Cinek
ba6ae57f64 Merge "Improved expansion logic of NotificationStackScroller" 2014-03-28 12:19:01 +00:00
Selim Cinek
fab078b01f Improved expansion logic of NotificationStackScroller 
Expansion of a notification with a single finger is now possible
if the NotificationStackScroller has not started scrolling yet.

Change-Id: I96b622632b448915526dd08cc2e4771d404b096f
 2014-03-28 12:00:55 +00:00
Wei Wang
45e1bcdac3 am 0d68a52a: am 9d3e0996: Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev 
* commit '0d68a52ad32bb2c07314721b19e7973df6045d34':
  Add comment of using same callback for start/stop advertising.
 2014-03-28 05:35:38 +00:00
Scott Main
d19320afbf am ebfb9c72: am d27f82f9: am a3a4d466: am 83d6ae28: fix broken links 
* commit 'ebfb9c7253140531847af4a6f1c7acd64e0a4af5':
  fix broken links
 2014-03-28 05:35:16 +00:00
Jeff Sharkey
0d7f7a736e am 0a42e5fa: am 2d8f330f: am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit '0a42e5fa293fd945959b26af144030571083b22f':
  Enlarge space allowed for internal downloads.
 2014-03-28 05:27:02 +00:00