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

121171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
2e59bd7885 am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 
* commit '41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
  Replace individual methods with a consolidated CEC nativeSendmessage
 2014-03-31 01:44:51 +00:00
Jinsuk Kim
41eaa32c10 Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 2014-03-31 01:40:30 +00:00
Wink Saville
80b4e09849 am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:17:38 +00:00
Wink Saville
44b43a51c7 am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:11:27 +00:00
Wink Saville
1e4cad8198 Merge "GlobalActions: Fix Airplane Mode on/off issue" 2014-03-30 00:15:22 +00:00
Wei Wang
1b09c97d8a am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
  Callback on correct method when status is unsuccessful.
 2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful. 
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
 2014-03-29 01:42:41 +00:00
Michael Wright
5d7db503bd am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
  Add InputDevice#supportsSource(int).
 2014-03-29 00:59:49 +00:00
Michael Wright
4669cfff1e am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev 
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
 2014-03-29 00:59:46 +00:00
Michael Wright
e9eb58c9a0 Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1 Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev 
* changes:
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
 2014-03-29 00:56:00 +00:00
nagarw
c3b7e6fd44 GlobalActions: Fix Airplane Mode on/off issue 
Issue: Unable to turn off Airplane mode from power button
       after phone reboot

Fix: Initialize mHasTelephony before the PhoneStateListener is
     registered to the TelephonyManager so that correct value
     of mHasTelephony is reflected when onServiceStateChanged
     callback is called.

Bug: 13697360
Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d
 2014-03-28 16:54:58 -07:00
Jeff Hao
f1354dd206 am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater." 
* commit 'd648e5f7ba26fc835c0448740f33c49874d51a3b':
  Mark constructor as accessible in LayoutInflater.
 2014-03-28 23:05:46 +00:00
Craig Mautner
1872ce3e7a am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off." 
* commit '155e3133407e590f18e7e16eddc6fc743f35b0fd':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
 2014-03-28 23:05:42 +00:00
Michael Wright
c9b937bbfa am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings" 
* commit '6a14146b379b33a6bf947f02b2550fa97c5619b6':
  Add support for additional international keyboard mappings
 2014-03-28 23:05:36 +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
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
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
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
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
Jeff Hao
e9b4fd0718 Merge "Mark constructor as accessible in LayoutInflater." 2014-03-28 21:41:21 +00: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
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
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
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
Ricardo Cervera
7abf5cdc95 docs: Updated the link to buy a Nexus phone. Bug: 13671312 
Change-Id: Ie16f3a86e58af8367e065d444c497fe4c920b2ed
 2014-03-28 10:15:24 -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
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
Wei Wang
0d68a52ad3 am 9d3e0996: Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev 
* commit '9d3e099699c3b6cd0f4bed344607d6a5acd75c1c':
  Add comment of using same callback for start/stop advertising.
 2014-03-28 04:07:55 +00:00
Wei Wang
9d3e099699 Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev 2014-03-28 04:04:47 +00:00
Scott Main
ebfb9c7253 am d27f82f9: am a3a4d466: am 83d6ae28: fix broken links 
* commit 'd27f82f92af7de43dedb077f82b1024496d501b8':
  fix broken links
 2014-03-28 03:29:05 +00:00
Scott Main
d27f82f92a am a3a4d466: am 83d6ae28: fix broken links 
* commit 'a3a4d46609ebb1470d24c7d77662a8b16440765c':
  fix broken links
 2014-03-28 03:23:18 +00:00
Scott Main
a3a4d46609 am 83d6ae28: fix broken links 
* commit '83d6ae2804e280bd1e0980faf4e3090d240eb5f5':
  fix broken links
 2014-03-28 03:15:10 +00:00
Scott Main
83d6ae2804 fix broken links 
Change-Id: I5964804c219ef02cd5f380bf752061ff7a022d61
 2014-03-27 20:07:48 -07:00
Wei Wang
f3f52b1b4c Add comment of using same callback for start/stop advertising. 
Change-Id: Ice268e83e4f2ceb5053a0e03f73b877f548bd13b
 2014-03-27 19:34:46 -07:00
Deepanshu Gupta
ee1187a94f Fix a bug in Nine Patch library. [DO NOT MERGE] 
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.

Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
(cherry-picked from 8a892279bd1b212311f4200f306a317985463918)
 2014-03-27 19:00:28 -07:00
Jeff Sharkey
0a42e5fa29 am 2d8f330f: am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit '2d8f330fe709d405915ebb1fa2673e575e19112e':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:56:08 +00:00
Brian Carlstrom
301ffc4177 am bd877cb6: am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit 'bd877cb67f09277679007bc705e28ee4a2eda02f':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:50:53 +00:00
Jeff Sharkey
2d8f330fe7 am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads. 
* commit 'a686d16d5924d2afe06586110e7dca33ecad535c':
  Enlarge space allowed for internal downloads.
 2014-03-28 01:49:21 +00:00
Brian Carlstrom
bd877cb67f am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE" 
* commit '69511ada3cc833f341bd7df006de0f8c44848eb8':
  Revert "Remove doSingleCrunch call DO NOT MERGE"
 2014-03-28 01:45:14 +00:00