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

1259 Commits

Author SHA1 Message Date
Ajay Panicker
4d657f1e67 Merge "Protect various Bluetooth broadcasts" am: 53ff75bb68 am: 779a1f096c am: 2bad652e56 
am: 6c1035e0c5

Change-Id: I457daf895af6b23a4715f69e95d6f08b337b0b77
 2016-08-18 22:48:48 +00:00
Ajay Panicker
6c1035e0c5 Merge "Protect various Bluetooth broadcasts" am: 53ff75bb68 am: 779a1f096c 
am: 2bad652e56

Change-Id: I342864675beb5083d67c3d74993995936a9af326
 2016-08-18 22:42:18 +00:00
Ajay Panicker
779a1f096c Merge "Protect various Bluetooth broadcasts" 
am: 53ff75bb68

Change-Id: Id4f77ea2092f9a04397fe596ed92f2f30a3235df
 2016-08-18 22:32:09 +00:00
Ajay Panicker
1f5b786ad0 Protect various Bluetooth broadcasts 
Bug: 30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
(cherry picked from commit 9a236066dbf604edfd5f873b4a3b94a200efd628)
 2016-08-18 13:50:13 -07:00
Ajay Panicker
784651fbaa Protect various Bluetooth broadcasts am: 9a236066db am: 003342e425 
am: 90af842f31

Change-Id: I1e1f501ad99f0b8d71bcacb0f22c64a56aaf669e
 2016-08-18 18:50:21 +00:00
Ajay Panicker
9a236066db Protect various Bluetooth broadcasts 
Bug: 30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
 2016-08-18 17:10:58 +00:00
Hugo Benichi
b8a9892344 resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp 
am: 524b2e4f30

Change-Id: Ia0a4544784592ac857e5bd652fee47eec621f3a0
 2016-07-26 15:18:51 +00:00
Hugo Benichi
514da60fb6 Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission 
This patch creates a new permission used by ConnectivityService to give
access to restricted networks without the NET_CAPABILITY_NOT_RESTRICTED
capability bit on.

Bug: 24497316
Change-Id: I5b6c8a9ef14395b2f1ab26cb17b24d7876ec79f1
 2016-07-25 10:24:42 +09:00
TreeHugger Robot
4ed4b434b6 Merge "Track KEY_PERMISSION_CHANGED rename to KEY_ACCESS_CHANGED" 2016-07-22 17:09:28 +00:00
Robin Lee
d3ee847b44 Track KEY_PERMISSION_CHANGED rename to KEY_ACCESS_CHANGED 
Bug: 30298085
Change-Id: I290a7f9c23827f5c9adb55429bd6680a7b751393
 2016-07-22 13:28:54 +00:00
Michael Wright
bc702e5d42 Merge commit \'f8bc27d9683e4089cdfd778dcb61ae67f44665b7\' into manual_merge_f8bc27d 
am: 49bcc5dd80

Change-Id: Iee2a7015eefd6a75be2968ec855334f68ec5f79e
 2016-07-20 18:49:43 +00:00
Michael Wright
1c9977b762 Rename color transform to color mode and persist the value. 
Also, standardize on a set of possible modes for the displays to
enter and separate the configuration of the color mode from the
configuration of the display mode.

Bug: 29044347

Change-Id: I6af0a7d1f11bc72d4cefc380f115c1fb00788864
 2016-07-18 19:49:18 +01:00
Makoto Onuki
d36651717e Merge \\"Cache the default launcher.\\" into nyc-mr1-dev am: cf99263662 
am: 6406be311c

Change-Id: If7d3f5325388242a196d78f8429c4aba65ef041e
 2016-07-15 23:34:53 +00:00
Makoto Onuki
1030520822 Cache the default launcher. 
Originally we always checked with PM for the default launcher,
which would take ~2ms.

Now we cache the result, and clears the cache when (any) preferred
activities change.

Bug 30126557

Change-Id: Iceef288cd372c8bb9b119aa493e5173d894f2302
 2016-07-15 12:57:03 -07:00
Suprabh Shukla
8a6b090fd4 Merge \\"Making timeouts configurable through Settings\\" into nyc-mr1-dev am: 33fa5dfa1d 
am: 087d33febf

Change-Id: If1bb99b356d4b6fdf3471e1ccccc2c6ebf8ace43
 2016-07-08 14:52:26 +00:00
Suprabh Shukla
dbbc7af063 Making timeouts configurable through Settings 
Adding a global setting for timeouts used in retail demo mode.
Also renaming the protected intent ACTION_RESET_DEMO to reflect proper
owner package.

Bug: 29917613
Change-Id: I9a174503626ab28cceb5024a8e63d27612439b92
 2016-07-07 14:12:14 -07:00
Chad Brubaker
6d4f195f1a Merge changes from topics 'handle-storage-update', 'action-storage-changed' 
* changes:
  Update trusted certificates when the trust store is changed
  Deprecate ACTION_STORAGE_CHANGED
 2016-06-30 19:22:19 +00:00
Chad Brubaker
4de59ef323 Deprecate ACTION_STORAGE_CHANGED 
ACTION_STORAGE_CHANGED is too noisy and fires on too many events. It has
been split into ACTION_KEYCHAIN_CHANGED for
addition/modification/removal of user certificates and keys,
ACTION_TRUST_STORE_CHANGED for changes the the user added and system CA
stores on the device and ACTION_KEY_ACCESS_CHANGED for changes to key
grants.

ACTION_STORAGE_CHANGED will only be sent to applications targeting N
and below. Applications targeting future releases should use the new
broadcasts.

Bug:28450538
Change-Id: I34ff838e9858db65f7308ca2b0f7d652c48fae17
 2016-06-30 09:23:15 -07:00
Ajay Panicker
d9feb6cc54 Protect REFRESH_BATCHED_SCAN broadcast am: 58dd0cd65e 
am: 925464f986

Change-Id: I4e92385b88d143016cd9b9d9b1243b3fc1367cd1
 2016-06-28 23:53:06 +00:00
Ajay Panicker
58dd0cd65e Protect REFRESH_BATCHED_SCAN broadcast 
Bug: 29754520
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
 2016-06-28 23:20:37 +00:00
Pavel Zhamaitsiak
bb6e981027 Merge \\"Move IMS-related protected broadcasts to packages/services/Telephony\\" into nyc-mr1-dev am: 9b464f651b 
am: 960187cfd7

Change-Id: Ie13deb46a8ee9201087a00fc9318cfa9462dcd98
 2016-06-15 23:14:43 +00:00
Pavel Zhamaitsiak
022b6fe928 Move IMS-related protected broadcasts to packages/services/Telephony 
Bug: 29228175
Change-Id: I03bf54dde0ae1a40eda7fde655124a1d2a901442
 2016-06-15 13:21:54 -07:00
Ricky Wai
84d2c0de2e resolve merge conflicts of 6f1ed20 to nyc-mr1-dev 
Change-Id: I9fe1e50f99382cbd8cd90f77ef99d081b472bb81
 2016-06-13 15:36:45 +01:00
Ricky Wai
d9250075fc resolve merge conflicts of 8513817 to nyc-mr1-dev-plus-aosp 
am: 66d2b4175c

Change-Id: I8297caccca3704e683cf5f9577d029a692df97ea
 2016-06-13 14:19:34 +00:00
Ricky Wai
66d2b4175c resolve merge conflicts of 8513817 to nyc-mr1-dev-plus-aosp 
Change-Id: I1b3fbe77722b34ca754667ba3e9b9c3753002c29
 2016-06-13 15:11:31 +01:00
Ricky Wai
6f1ed200b3 Merge "Disable quiet mode after UserManager.trySetQuietModeDisabled() is unlocked" into nyc-dev 2016-06-13 13:12:48 +00:00
Sudheer Shanka
2f04769131 Merge \\\"Reduce shell power over user management.\\\" into nyc-dev am: 1b4124fc95 am: 0979d718c5 
am: c1befac360

Change-Id: Ia608e9ce2a2c842971c5424fea8823069a5f6449
 2016-06-10 21:59:26 +00:00
Sudheer Shanka
c1befac360 Merge \\"Reduce shell power over user management.\\" into nyc-dev am: 1b4124fc95 
am: 0979d718c5

Change-Id: I63bb1c87e01b3536096a508046dba9de8b88bb59
 2016-06-10 21:43:38 +00:00
Sudheer Shanka
a2ef5c89c0 Merge \"Reduce shell power over user management.\" into nyc-dev 
am: 1b4124fc95

Change-Id: Ia54f3ad9a8594e101407db6b52b378ae8bec72a2
 2016-06-10 21:39:22 +00:00
TreeHugger Robot
1b4124fc95 Merge "Reduce shell power over user management." into nyc-dev 2016-06-10 21:33:28 +00:00
Sudheer Shanka
f5cea03eb0 Reduce shell power over user management. 
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.

Bug: 29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
 2016-06-10 13:05:18 -07:00
Svet Ganov
cd32a04f66 Merge \\\"Protect the android.intent.action.CALL_PRIVILEGED broadcast\\\" into nyc-dev am: c94872e940 am: 08504b5e0d 
am: 22b24425a6

Change-Id: I81be49b8396538273d1254fe14065625ece31160
 2016-06-10 00:03:48 +00:00
Stuart Scott
86d71144d4 Merge \\"Add UCE Service Down protected broadcast\\" into nyc-mr1-dev am: 3e03d02f76 
am: 5cdb347384

Change-Id: I9b2365f99397d5312a8012c9c394919f76f3fcd5
 2016-06-10 00:01:19 +00:00
Svet Ganov
08504b5e0d Merge \"Protect the android.intent.action.CALL_PRIVILEGED broadcast\" into nyc-dev 
am: c94872e940

Change-Id: I722d5bfbed781c28db5da59f303c2579123d8e6e
 2016-06-09 22:52:26 +00:00
Svetoslav Ganov
c94872e940 Merge "Protect the android.intent.action.CALL_PRIVILEGED broadcast" into nyc-dev 2016-06-09 22:44:51 +00:00
Stuart Scott
aa587546ec Add UCE Service Down protected broadcast 
bug:29173516
Change-Id: I1c5743962dbca9c482ce7d87f6fe570a3249f3fe
 2016-06-09 12:58:31 -07:00
Ricky Wai
b1dd80bcfe Disable quiet mode after UserManager.trySetQuietModeDisabled() is unlocked 
Bug: 29150970
Change-Id: Ie04cec116564147272896e4a5ca076bbc08e60b1
 2016-06-09 17:08:52 +01:00
Svet Ganov
c69266dec6 Protect the android.intent.action.CALL_PRIVILEGED broadcast 
bug:29178416

Change-Id: I5e8f1e5423d0dd59cc532a45142b2401f5e5a45b
 2016-06-08 22:15:35 -07:00
Amith Yamasani
9f62bf9370 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp 
am: b8ab1d3b12

Change-Id: I9f4879ae27560ade8fa4e6124908c3dced68feb1
 2016-06-08 19:03:36 +00:00
Amith Yamasani
b8ab1d3b12 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp 
Change-Id: Id4b3de71842eedd49684b367ed993f44f2f91970
 2016-06-08 11:50:57 -07:00
Amith Yamasani
211b5b10f6 resolve merge conflicts of 718f321 to nyc-mr1-dev 
Change-Id: I0021aa5be1822082d8ff026cafa8c8b6b56b90b5
 2016-06-08 18:43:46 +00:00
Amith Yamasani
d2b21047c8 Add a separate read permission for oem unlock state 
New privileged permission READ_OEM_UNLOCK_STATE added
for system privileged apps.

Changing the unlock state still requires the old
permission OEM_UNLOCK_STATE, which is signature protected.

Bug: 28953956
Change-Id: Iedd2ad1d2d1dc3ae91122d7c406e3ee623a47d61
 2016-06-03 14:33:26 -07:00
Suprabh Shukla
d97d8cc0ca Merge "Adding Reset Demo Notification" into nyc-mr1-dev am: 1b9f13d7bc 
am: 6e215f895b

* commit '6e215f895beb16e822d689f179a7458611d6395a':
  Adding Reset Demo Notification

Change-Id: I18fae0829c3b3c83025e95a73d6e4cabdda1ad71
 2016-05-28 00:59:27 +00:00
Suprabh Shukla
4ec430e062 Adding Reset Demo Notification 
RetailDemoMOdeService adds a notification which allows user to wipe
current session and start a fresh demo session.

Bug: 27280140
Change-Id: I59dd82d236287206a2ca747210b3423fdc62c185
 2016-05-27 15:34:54 -07:00
Dianne Hackborn
ea833e898e Merge "Fix issue #28931042: wtf in system server" into nyc-dev am: 7a1aa92610 am: 9bebd9edb0 
am: caf8c3c160

* commit 'caf8c3c160952aff4b4197c1e0282489583a942d':
  Fix issue #28931042: wtf in system server

Change-Id: I86bf73a1294ccf4ef7ef63188e72942b17e61b0c
 2016-05-25 00:30:46 +00:00
Dianne Hackborn
a8e6f875bc Fix issue #28931042: wtf in system server 
More broadcasts (from telephony) that should be protected.

Also put a little more information in the wtf message to
help determine where broadcasts from out of the system process
are coming from.

Change-Id: Ie3df25c883482ca54c7a7c5db57ca609950f5cbc
 2016-05-24 15:35:27 -07:00
Sudheer Shanka
99e4de3194 Merge "Merge "Update docs for DELETE_PACKAGES permission." into nyc-dev am: 0e351a945b am: ca8ecc0be1" into nyc-mr1-dev-plus-aosp 
am: b73a4a6678

* commit 'b73a4a6678aa508f1ddfa3260af5a7cbf52ac7cb':
  Update docs for DELETE_PACKAGES permission.

Change-Id: I511f13b5258f23a56bd1f30ce14a98b1e65572b8
 2016-05-10 20:39:14 +00:00
Sudheer Shanka
0e351a945b Merge "Update docs for DELETE_PACKAGES permission." into nyc-dev 2016-05-10 20:28:37 +00:00
Sudheer Shanka
eaa6c6b540 Update docs for DELETE_PACKAGES permission. 
Bug: 28302564
Change-Id: I283b8a5490a189fc90f64aec3278b87a430c2623
 2016-05-09 11:44:00 -07:00
Ajay Panicker
04a7cfcf73 Merge "List the CONNECTION_STATE_CHANGED broadcast for MAP as protected" 2016-05-06 23:18:51 +00:00