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

701 Commits

Author SHA1 Message Date
Amit Mahajan
fa72516ac9 am ed454542: am 38e48c2f: am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit 'ed4545423b0166f2436adee077d11b85b62ed07a':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-14 17:30:18 +00:00
Amit Mahajan
097c8d6011 am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '1901e175079e3b7242ace7d4b3ec38af3723f91b':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:03:52 +00:00
Amit Mahajan
1901e17507 Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 2014-10-13 19:32:36 +00:00
Mike Lockwood
59a24d6ca9 am 4dd24730: am b3bab92e: am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '4dd247305f4e4f3b3a7a9f52a8d1a9c6641391f3':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 19:17:17 +00:00
Mike Lockwood
8ca4886e43 am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '317f9ce85a492a213b8f1dac477b1aefad55f621':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 18:48:11 +00:00
Amit Mahajan
5742335cbd Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to 
signatureOrSystem.

Bug: 17952946
Change-Id: I4a75da11cb092ca795d0eacf824890eb12c7446a
 2014-10-13 11:38:03 -07:00
Mike Lockwood
6e383350e4 Change RECEIVE_BLUETOOTH_MAP permission to signature or system 
Bug: 17954105
Change-Id: I8b16cab7193c97e5f54d6e4ef33ebf8cda0da197
 2014-10-13 10:00:08 -07:00
Dan Sandler
a3bfb78084 am d23fa0f6: am 97a7fbfb: am 621fa30c: am 9eef8749: am 2200f86f: All (er, L) is finally revealed. 
* commit 'd23fa0f65077ba83d7b9b24805096f2b4532b9da':
  All (er, L) is finally revealed.
 2014-10-08 19:07:18 +00:00
Dan Sandler
9eef874923 am 2200f86f: All (er, L) is finally revealed. 
* commit '2200f86f800876d005f911e6864708fa9772d03a':
  All (er, L) is finally revealed.
 2014-10-08 18:16:01 +00:00
Dan Sandler
2200f86f80 All (er, L) is finally revealed. 
If you exceed 20000 points, please send in a screenshot.

Bug: 15984887
Change-Id: I1164160bfa8e7dca3b9e7d7ca5d50ef9abd38b61
 2014-10-08 04:01:01 +00:00
Dianne Hackborn
22dbaddf58 am 8b718b80: am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '8b718b80e0caf179a174f8417fe4f5b875297de6':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:43:58 +00:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:17:10 +00:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change 
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
 2014-10-03 16:26:04 -07:00
Benson Huang
f75866cba0 am cea4f7ac: am 19766ff9: am 398de894: am 981258e5: [FM] Add FM permission to support FM radio app 
* commit 'cea4f7acb40b495c137e1ac6c9eb57b3ddfa2c34':
  [FM] Add FM permission to support FM radio app
 2014-10-02 13:46:49 +00:00
Benson Huang
981258e5f9 [FM] Add FM permission to support FM radio app 
Add FM permission like KK to support FM radio app.

Change-Id: Ifb76f63e3136a5f88306903fd28e9abbb01e69c9
Signed-off-by: Benson Huang <benson.huang@mediatek.com>

Conflicts:
	data/etc/platform.xml
 2014-10-01 18:39:16 -07:00
Sky Faber
3e3857c4f5 Separate wifi AP added by applications. 
-Add field for tracking user approval of application added networks.
-Add WifiConfig fields for creating/updating application name
-Add permission to allow system apps to modify any network

Bug: 16953082

Change-Id: I12943563ef714c4287e13488578f020d136d006d
 2014-09-26 14:01:37 -07:00
Wink Saville
4b4d685341 am 1ddcdc2d: Merge commit \'e58e59cc\' into fix-merge-conflict 
* commit '1ddcdc2d1cef6387612923ad3f9e73de12727dc1':
  ksd to lmp-sprout-dev
 2014-09-19 03:21:56 +00:00
Edward Jee
f067f8fb16 am 84d05ed5: am 8a20c56f: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit '84d05ed5a229186c7859013327887f6af7ef4a29':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 09:12:33 +00:00
Edward Jee
d796159bbb am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit 'c172b2090317b158974bc73d8baa141449a1d784':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 08:44:13 +00:00
Edward Jee
1bbfcc2fdc Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 2014-09-16 01:19:19 +00:00
Wink Saville
02e3979d62 Merge commit 'e58e59cc' into fix-merge-conflict 
* commit 'e58e59cc':
  ksd to lmp-sprout-dev

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/SubInfoRecord.java
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ISub.aidl
	telephony/java/com/android/internal/telephony/TelephonyIntents.java

Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd
 2014-09-15 12:40:02 -07:00
John Spurlock
613d076fa5 am 56e64b2a: am 88c61af5: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '56e64b2a589a09786caa1eb1d9bfa59292a227f2':
  Zen: Make condition providers available via @SystemApi.
 2014-09-11 14:13:24 +00:00
John Spurlock
7456ae83e8 am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '3a972844e934b1031d73bfb114d84a7d2f8d4b19':
  Zen: Make condition providers available via @SystemApi.
 2014-09-10 13:45:09 +00:00
John Spurlock
bf4e41747d Zen: Make condition providers available via @SystemApi. 
Bug:16819503
Change-Id: Ibd7004f7a0928d3f14f9ccd55088cf645d5285e2
 2014-09-10 09:13:54 -04:00
Adam Lesinski
0a2cfc6296 am 2feb9c9a: am 2413aa58: am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '2feb9c9a5153136d6d0f4d32859113fc1ebe6a4f':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-10 01:10:00 +00:00
Adam Lesinski
7137ee38cb am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '38bd55ffd7084d744e4e814593056e1e12ebfb00':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-10 00:17:53 +00:00
Edward Jee
8dd30aadaf Adds APIs for Bluetooth PBAP and MAP access permission. 
Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.

However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.

Bug: 17158953
Change-Id: I3771f03eaea3f57cf60d93ab9fd41c9eb3e1e99c
 2014-09-09 15:10:01 -07:00
Adam Lesinski
6590d7c75c Make UsageStats API default on only for the system 
This changes the PACKAGE_USAGE_STATS permission to be
a signature only permission, meaning that only apps
signed with the system signature have access to the
UsageStats API enabled by default.

Bug:17428130
Change-Id: I79ba54d7102c770ea2490f014a1f6736f0f46b3a
 2014-09-09 20:30:33 +00:00
Jean-Michel Trivi
067a1780f5 am c16a3a6c: am c256b10b: am aa82a6c7: Merge "Update the broadcasts reserved to the system" into lmp-dev 
* commit 'c16a3a6ca2235554c4232651fca4c84af5ceded9':
  Update the broadcasts reserved to the system
 2014-09-05 22:10:08 +00:00
Jean-Michel Trivi
91488f464d am aa82a6c7: Merge "Update the broadcasts reserved to the system" into lmp-dev 
* commit 'aa82a6c7adc6de4ec3f843328f7bb207aa6540ec':
  Update the broadcasts reserved to the system
 2014-09-05 21:47:31 +00:00
Jean-Michel Trivi
26d6ff0b24 Update the broadcasts reserved to the system 
The action value for all AUDIO*PLUG broadcasts has been changed
 from "android.intent" to "android.media". This value needs to
 be updated in the core manifest too as part of the broadcasts
 that only the system can send.

Bug 17289385

Change-Id: Ibc0f4139c28ce863f85efc24ff0fcb81ab12ce21
 2014-09-03 14:20:41 -07:00
Wink Saville
05e6dde3a0 ksd to lmp-sprout-dev 
Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-09-01 05:38:31 +00:00
Christofer Åkersten
070bf912a2 am c957fa3b: am 8ddbb2cf: am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev 
* commit 'c957fa3bcc42ebed337582f98c8ebb8f2d1148e5':
  Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS
 2014-08-27 03:26:37 +00:00
Sungsoo Lim
9dd43afbb9 Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS 
Bug: 16948874
Change-Id: If44aaa7085705e8a2f55c71dae61bf6ac0cdfc09
 2014-08-26 13:56:42 -07:00
Jeff Brown
4b40c24877 am d35615ce: am fdfd79f2: am 6a276cec: Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 
* commit 'd35615ce7a0ffd477d0dae8d098813d62e92a7db':
  Poke interactive hint from userActivity and add @SystemApi.
 2014-08-25 08:22:48 +00:00
Jeff Brown
d7761be23d Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 2014-08-23 00:23:41 +00:00
Amith Yamasani
6be3d49339 am 21ecfce5: am 0c581229: am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev 
* commit '21ecfce5be747dd676cc0b5f0452408fd9280766':
  Show a user switching dialog before starting the user switch
 2014-08-22 21:45:13 +00:00
Amith Yamasani
7805a10c86 Show a user switching dialog before starting the user switch 
switchUser() now first shows a dialog and the dialog calls
startUserInForeground to do the actual switch.

Bug: 16661752
Change-Id: Ie4e2e9eec8bf7c2116694072ea8555b8254a0e13
 2014-08-22 13:00:22 -07:00
Jeff Brown
0a57112354 Poke interactive hint from userActivity and add @SystemApi. 
Previously we only poked the interactive hint for input events that
were dispatched through the regular input system.  However, when
using a car dock in projection mode input events are directly
delivered to apps by other system components, bypassing user activity.
So now we poke the interactive hint on all user activity.

Added an @SystemApi version of userActivity.

Added a new signature|system permission called USER_ACTIVITY
to allow system apps to poke userActivity.  For now it seems
prudent to keep DEVICE_POWER signature only.

Bug: 17043684
Change-Id: Ia84bd03083065b8938a9853c08901fbf71b2e56b
 2014-08-21 22:36:45 -07:00
Tyler Gunn
369fcc5e79 am e4df8728: am 084c98b4: am d324e32f: Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev 
* commit 'e4df8728312f9d289c096ba804816e3091c2a125':
  Exposing in-call API to other implementing classes. (1/4)
 2014-08-19 16:52:26 +00:00
Michael Wright
198ca696fb am 7814d9f0: am 4bbb811f: am 504960cb: Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 
* commit '7814d9f05d202625280210269c89655013dce3de':
  Add callbacks for MediaProjection start / stop.
 2014-08-19 00:48:21 +00:00
Michael Wright
d86ecd26d7 Add callbacks for MediaProjection start / stop. 
Also, enforce that there is only one valid MediaProjection at a time.

Bug: 16488053
Change-Id: Id05445d798c98cb208bc4dab186296392e15d30b
 2014-08-17 16:06:56 -07:00
Jeff Brown
b135d06cb8 Remove incomplete media router API. (DO NOT MERGE) 
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
 2014-08-19 20:08:52 -07:00
Tyler Gunn
50cddeca1f Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev 2014-08-16 03:51:48 +00:00
Tyler Gunn
2ac401093e Exposing in-call API to other implementing classes. (1/4) 
- Adding service_interface constant to InCallService.

Bug: 16133960
Change-Id: I4ace89bc3300428d2c56ed43e47ccd12a9f9748a
 2014-08-18 16:23:10 -07:00
Tyler Gunn
19caa123d6 am 3ec54522: am 5c0aa11d: am fbcb50db: Merge "Add BIND_CONNECTION_SERVICE permission." into lmp-dev 
* commit '3ec545229af4be3a45583170a2509d9ad4161c04':
  Add BIND_CONNECTION_SERVICE permission.
 2014-08-16 00:45:11 +00:00
Tyler Gunn
0dae9a4cfa Add BIND_CONNECTION_SERVICE permission. 
- Added system permission.
- Added enforcement in ConnectionService API class.

Bug: 16171070
Change-Id: Idbd26a31e8f6bb59d3e881a1e5885a44026f2fbd
 2014-08-15 15:55:20 -07:00
Doug Zongker
af8b11ae2a am 8c26c4c8: am a9c87471: am 2b13359a: Merge "@hide RECOVERY permission" into lmp-dev 
* commit '8c26c4c8f4784e3f8acce3a97f36e8c136d48349':
  @hide RECOVERY permission
 2014-08-14 23:43:12 +00:00
Doug Zongker
183415e521 @hide RECOVERY permission 
Bug: 16959027
Change-Id: I99fbdf24d5e8bce4beb32fa872e0caa6bfdbe1e9
 2014-08-12 10:20:00 -07:00
Chelsea Derrick
c216c473eb Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]" 
This reverts commit 41158d90a69cae2a9c4ced0e04f235e8cfef5259.

Bug: 16871063
Change-Id: I93623be92f2de41789b16827867f3f95bf0480c5
 2014-08-11 12:51:18 -07:00