1032 Commits

Author SHA1 Message Date
Svetoslav Ganov
aad093b675 Merge "Allow verifier to grant permissions" into mnc-dr-dev am: cfa233eefb am: 22d7f4c2ed am: 6423c0a29b
am: bd4168540f

* commit 'bd4168540f009c71af1242e5b7866146c8724d6f':
  Allow verifier to grant permissions
2015-11-02 20:00:13 +00:00
Svetoslav Ganov
22d7f4c2ed Merge "Allow verifier to grant permissions" into mnc-dr-dev
am: cfa233eefb

* commit 'cfa233eefb5b77c96a3239a5a51f381a7f0722c9':
  Allow verifier to grant permissions
2015-11-02 19:38:22 +00:00
Svetoslav
7bddf5aa06 Allow verifier to grant permissions
bug:25329324

Change-Id: I2ac01a983ad812df7725a0499a8d9b470a7ea481
2015-10-29 17:02:43 -07:00
John Reck
0529672a8c resolve merge conflicts of a1b8d77ca3 to master.
Change-Id: Ia78c6d31687542dfaba20b177e774333cfb1edb5
2015-10-29 09:05:53 -07:00
Svetoslav Ganov
35151fbc8b Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
am: 2658cb002a

* commit '2658cb002abae9341c9a82bfeaed764ba5bf97c8':
  Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:16:46 +00:00
Svetoslav Ganov
2658cb002a Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev 2015-10-29 01:10:46 +00:00
Svetoslav
01af6a42a6 Make SYSTEM_ALERT_WINDOW development permission
bug:25329324

Change-Id: I0086464846bab9424764dd0d726692d96a0f1207
2015-10-27 18:12:06 -07:00
Paul Jensen
b6d8f81b10 Merge "Remove dead ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN" 2015-10-26 15:15:33 +00:00
Lorenzo Colitti
67fb3d7358 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 am: bdc458048a am: bb8f652372
am: 8ecad265b6

* commit '8ecad265b6db57f78dd142e974057c91f69489ed':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
2015-10-22 06:33:09 +00:00
Lorenzo Colitti
bdc458048a Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
am: 809dcade99

* commit '809dcade9906001f6aa51a68aa783e20bb1d7c0d':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
2015-10-22 06:18:43 +00:00
Lorenzo Colitti
809dcade99 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev 2015-10-22 06:15:05 +00:00
Lorenzo Colitti
d542705066 Reinstate CHANGE_NETWORK_STATE as a normal permission.
This is a partial revert of http://ag/738523 , but not a full
revert because M apps that have gone through the WRITE_SETTINGS
route to obtain permission to change network state should
continue to have permission to do so.

Specifically:

1. Change the protection level of CHANGE_NETWORK_STATE back from
   "signature|preinstalled|appop|pre23" to "normal". This allows
   apps that declare CHANGE_NETWORK_STATE in their manifest to
   acquire it, even if they target the M SDK or above.
2. Change the ConnectivityManager permission checks so that they
   first check CHANGE_NETWORK_STATE, and then ask Settings
   if the app has the WRITE_SETTINGS runtime permission.
3. Slightly simplify the code in the Settings provider code that
   deals specifically with the ability to change network state.
4. Make the ConnectivityService permissions checks use the
   ConnectivityManager code to avoid code duplication.
5. Update the ConnectivityManager public Javadoc to list both
   CHANGE_NETWORK_STATE and WRITE_SETTINGS.

Bug: 21588539
Bug: 23597341
Change-Id: Ic06a26517c95f9ad94183f6d126fd0de45de346e
2015-10-22 08:33:45 +09:00
Michael Wright
244f776855 resolve merge conflicts of f013c3f111 to master.
Change-Id: I2045187f8fa948a1733cb9a2cdc0a69ae97b5907
2015-10-20 23:48:55 +01:00
Michael Wright
bab2b42445 resolve merge conflicts of 57a5cba606 to cw-e-dev.
Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff
2015-10-20 17:06:27 +01:00
Paul Jensen
627bc36eb7 Remove dead ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN
I centralized all the provisioning APN logic in Telephony back in
89e0f09 so this intent is now unused.

Bug:24451710
Change-Id: I401ac3e46442c8921545c88fee228873261ebd2b
2015-10-15 08:30:54 -04:00
Michael Wright
9209c9cd9a Add SystemUI component to watch for keyboard attachment.
Add a new SystemUI component to watch for keyboard attachment /
detachment. If the config specifies the name of a keyboard that is
packaged with the device, then SystemUI will ask the user if they
would like to enable BT (if disabled) and then attempt to pair to the
device.

Bug: 22876536
Change-Id: I786db35524d49706d5e61d8b8bc71194d50113f3
2015-10-12 15:21:37 +01:00
Julia Reynolds
41da2f777f Merge "Allow signature apps to modify notification policies." 2015-09-28 19:21:28 +00:00
Julia Reynolds
6ee2617832 Allow signature apps to modify notification policies.
Bug: 22977552
Change-Id: Ib2bc3a55a904011218bb3adb19998cc4a0b7e709
2015-09-28 15:03:52 -04:00
Julia Reynolds
7581121ba5 Merge "Revert "Allow signature apps to modify notification policies."" 2015-09-28 18:55:41 +00:00
Julia Reynolds
3a0ee8f963 Revert "Allow signature apps to modify notification policies."
This reverts commit 39a8c353a8f723e5e67bc846f8fa96d580c4abbb.

Change-Id: I9a9a5fcc76202f5d2b3b175e5d5b9361604285d8
2015-09-28 18:55:28 +00:00
Julia Reynolds
b487ffeef7 Merge "Allow signature apps to modify notification policies." 2015-09-28 18:51:48 +00:00
Julia Reynolds
39a8c353a8 Allow signature apps to modify notification policies.
Bug: 22977552
Change-Id: I7bfd2fe7bcb2e14b9eb7281acbb8a35dbc2ec93e
2015-09-28 14:48:42 -04:00
Billy Lau
b4a6d9847b am 337c069a: am 81451c1c: am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '337c069ac897db69f239c1927ddaf9225a7a6fef':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
2015-09-28 17:54:33 +00:00
Billy Lau
cb4bafb4c9 am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '86e153d5f0614c9f3da137fd0b815a398598928b':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
2015-09-28 17:31:48 +00:00
Billy Lau
86e153d5f0 am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit 'f360bbca969f60ee968240d22bc0b1f1e5e17218':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
2015-09-28 17:24:25 +00:00
Bryce Lee
535570a7ce am 979a22ea: am 6ad696c3: am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
* commit '979a22eaf9c62637c02ebd6f92ef6ea2888aa5be':
  Add ThermalObserver system service to capture thermal state uevents.
2015-09-27 15:11:22 +00:00
Bryce Lee
bc58f59da6 Add ThermalObserver system service to capture thermal state uevents.
Bug: 21445745
Change-Id: I980d60b66ca51942a1fd62502d6cf1f09208fc3a
2015-09-25 16:43:01 -07:00
Michael Wright
a62e8a8d39 Make android.hardware.usb.action.USB_ACCESSORY_DETACHED...
a protected broadcast.

The broadcast "android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
was accidentally included twice, changed the extra copy to
"android.hardware.usb.action.USB_ACCESSORY_DETACHED".

Bug: 24188595
Change-Id: I8863c336f70796b2a15633595648b594864e84e2
2015-09-24 15:58:15 +01:00
Justin Harrison
c0f2bc0f0e am 46db0f22: am 08b00423: am 1f463957: am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '46db0f2215ad6e969418d1fedd1578445b46588f':
  Add support for setting color transforms
2015-09-19 18:14:55 +00:00
Justin Harrison
1f46395702 am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '91f2123b2a6d534372ab9b7c8e6ac0c62cf33ae6':
  Add support for setting color transforms
2015-09-19 00:29:40 +00:00
Michael Wright
58e829f71d Add support for setting color transforms
Bug: 24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
2015-09-18 23:37:28 +00:00
Billy Lau
369b7ca4fb Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Previously, when CHANGE_NETWORK_STATE's protection level was raised to
signature from normal, the documentation was not changed. This CL
addresses the documentation to reflect the correct protection level.

Change-Id: I0a4d2fcef5f30c58b38250865543e72b5eb1ab06
2015-09-18 10:19:54 +01:00
Lorenzo Colitti
51c61ee23a am fd183706: am 22262f31: am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit 'fd18370675f8794807747a18276dd7385e25f06e':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
2015-09-09 01:04:38 +00:00
Lorenzo Colitti
0bc356687e am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.
2015-09-09 00:26:53 +00:00
Lorenzo Colitti
7b70036abc Add a PACKET_KEEPALIVE_OFFLOAD permission.
Bug: 23884210
Change-Id: I0f9207ac9b9c07c676f64f2748905e523e891501
2015-09-09 00:16:55 +09:00
Michael Wright
56dafdb5ae am 7f7ffa37: am 87e4c951: am 59c1a0e1: am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '7f7ffa3722ef90a7bf5611221c4a4c9d06823a38':
  Add TabletModeChangedListener for SystemUI.
2015-09-03 17:37:10 +00:00
Michael Wright
59c1a0e1cb am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
* commit '8ae90587a510f72a176119b1f23add8bc36285b9':
  Add TabletModeChangedListener for SystemUI.
2015-09-03 14:10:05 +00:00
Michael Wright
8ae90587a5 Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 2015-09-03 14:00:52 +00:00
Julia Reynolds
8ef94501f0 Merge "Allow third party condition providers." 2015-08-26 18:46:26 +00:00
Fyodor Kupolov
4f5de340c9 Renamed primaryUserOnly to systemUserOnly
In the split mode, broadcast receivers and activities marked as
systemUserOnly will be running as system. This is a non-functional change for
non-split system user mode.

Bug: 22958572
Change-Id: I0f7d4f4a81275bc326bf630a776c695e8b5291a6
2015-08-25 18:26:49 -07:00
Julia Reynolds
b0a773f6b3 Allow third party condition providers.
Bug: 22977552
Change-Id: I3d8689f52daa9376496e14997a6dd7862fb3ade6
2015-08-25 15:01:22 -04:00
Michael Wright
39e5e94744 Add TabletModeChangedListener for SystemUI.
Bug: 23256614
Change-Id: I6e5d636c24a84846cfad84da800911a469689dda
2015-08-21 17:12:22 +01:00
Svetoslav Ganov
dec9a216d2 am f18cbd76: am c9dec164: am e96b80f3: am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev
* commit 'f18cbd760142e627ab6c9672e4aca3a29d05d9ee':
  Add missing removed permissions to the platform manifest
2015-08-21 13:07:38 +00:00
Svetoslav Ganov
e96b80f3de am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev
* commit '446c00a2919da5b4ea0bdf08f72ac4f95125ea45':
  Add missing removed permissions to the platform manifest
2015-08-21 12:49:42 +00:00
Svetoslav Ganov
446c00a291 am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev
* commit 'cb59747de7222bc7310162c4174f7b460c34adef':
  Add missing removed permissions to the platform manifest
2015-08-21 12:41:29 +00:00
Svet Ganov
f1418ae65b Add missing removed permissions to the platform manifest
We need to keep in the manifest as normal hidden permissions
all removed dangerous ones to ensure backwards compatibility
as apps may be gating operations based on whether they have
a removed permission.

bug:23377184

Change-Id: I105bd646c4594d85c501f53a10ea393ee50046bc
2015-08-20 07:08:26 -07:00
Nicolas Prevot
741abfc120 Fix cross-profile intent filters with system-user split.
Don't assume that the parent is always the user owner.

BUG:23105562
Change-Id: Ia98ed608e2b6d1d82d95a73110134d85274c6abf
2015-08-20 12:14:37 +00:00
Jim Miller
4ea5152bd8 am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit '849b9e58d6775a393f7d86a6305b658c6af9d16f':
  Reset fingerprint lockout timer when strong auth is used.
2015-08-19 02:21:58 +00:00
Jim Miller
7ef772713f am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
  Reset fingerprint lockout timer when strong auth is used.
2015-08-18 23:18:36 +00:00
Jim Miller
e0507bbbf9 Reset fingerprint lockout timer when strong auth is used.
Fixes bug 22565462

Change-Id: I4842877839845e7fe103396d8ca8104928568c04
2015-08-18 13:01:31 -07:00