Commit Graph

19065 Commits

Author SHA1 Message Date
Antoan Angelov
2a5a43d61c Merge changes from topic "dpc-migration-atomic"
* changes:
  Notify DO after PO ownership transfer when they belong to affiliated users.
  Tests for owner transfer atomicity.
  Make owner transfer an atomic operation.
2018-01-24 20:11:54 +00:00
Vladislav Kuzkokov
f4e01170b8 Merge "Fix Printing policy in profile owner." 2018-01-24 20:11:31 +00:00
arangelov
b46faf35c8 Notify DO after PO ownership transfer when they belong to affiliated users.
Test: Locally modified TransferDPC to print the callback after manually setting DO, PO and then transfering PO owner.
Bug: 72218214
Change-Id: I6c9af00bcfa703c81d9d5b35fe534c928991ff93
2018-01-24 19:20:37 +00:00
arangelov
91201bdbca Make owner transfer an atomic operation.
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.TransferOwnershipMetadataManagerTest
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/OwnerTransferParamsManagerTest.java
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_noMetadataFile
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_adminAndDeviceMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_deviceNotMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertDeviceOwnership_adminAndDeviceNotMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_noMetadataFile
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_adminAndProfileMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_profileNotMigrated
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testRevertProfileOwnership_adminAndProfileNotMigrated
Bug: 69543005

(cherry picked from commit 5a6d391dedcdec13fcc4cf1770e7bf9fc1be8643)

Change-Id: Ic2d729d48fdb47b0ebd60030b45615b0cec174a2
2018-01-24 19:20:36 +00:00
TreeHugger Robot
ff73b83831 Merge changes Ia3065eb5,I602e8bb0
* changes:
  Update ProgramInfo to match HAL 2.0 changes.
  Implement front-end APIs for announcements.
2018-01-24 19:00:39 +00:00
Dianne Hackborn
994b5ad737 Fix issue #72116995: Add permission guarding Service#startForeground
Now requires permission if targeting P.

Note that this is a separate permission from the existing one
that is required for instant apps to use foreground services.  The
reason for this is that their semantics are different (the instant
apps permission is associated with an app op for control over what
the app is allowed, while the regular app permission is just a
normal permission that is always granted and only there for
auditing of apps), and there are probably going to be cases where
a developer will want to use a foreground service in the full
version of their app but not as an instant app.

Bug: 72116995
Test: atest CtsAppTestCases
Change-Id: If5a79e7ed5ab9e0edc77410315eb4d2df8ac850b
2018-01-24 17:58:24 +00:00
TreeHugger Robot
fa0bfce3ef Merge "Add requireViewById" 2018-01-24 17:48:52 +00:00
TreeHugger Robot
1387aaecc0 Merge "Add an API to fetch the WebView thread." 2018-01-24 17:28:30 +00:00
TreeHugger Robot
d12ad36399 Merge "Add broadcast when notification block state changes" 2018-01-24 15:03:22 +00:00
Gustav Sennton
0167369990 Add an API to fetch the WebView thread.
Some WebView APIs contain checks ensuring apps only use WebView APIs
from one single thread. The WebView Support Library should perform
similar thread checks. To do so we publish an API to get the WebView
thread, so that the support library knows which thread to check against.

Test: Ran the corresponding CTS tests.
Bug: 38220806
Change-Id: Ibab878e211d9594df6d39f99ce130e28fac7f019
2018-01-24 14:39:45 +00:00
Vladislav Kuzkokov
fef75eee1d Fix Printing policy in profile owner.
Sometimes app inside profile can't get package info for its owner.
Instead of relying on calling user id, we make PrintManagerService switch to
system id and pass user that called print() explicitly.

Bug: 72309652
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPrintingPolicy
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPrintingPolicy
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedProfileOwnerTest#testPrintingPolicy
Test: bit FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: Ib97018f56693549fbca506dba6efaadb6dd010b3
2018-01-24 15:24:08 +01:00
Neil Fuller
4cfc02a316 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.
2018-01-24 10:07:48 +00:00
Holly Jiuyu Sun
d201c4dd51 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3 am: 5598f5ab23
am: 687a28d77d

Change-Id: I56abcc7731ca08ed67a5123f826bfbc9ca4f74d0
2018-01-24 09:42:42 +00:00
Cassie Han
a600b31201 Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am: eb9452a08d am: 8e3dcbb5d3
am: b828fa2bfc

Change-Id: I086a958cab93dcbc47103e5d0c7d91dba5aab412
2018-01-24 09:37:29 +00:00
Rahul Frias
bbf96b1af1 Merge "Add new values to KeyRequestType" 2018-01-24 07:36:14 +00:00
Dmitry Dementyev
8df0200e84 Merge "Unhide RecoverableKeyStoreLoader API." 2018-01-24 07:25:15 +00:00
TreeHugger Robot
192e0870b3 Merge "Add APIs to manipulate Override APN." 2018-01-24 06:54:17 +00:00
yuemingw
e3d9c099e5 Add APIs to manipulate Override APN.
Add APIs to add, update, query and remove Override APN. Add APIs to enable
Override APNs or query if Override APNs are currently enabled.

Bug: 68208301
Test: cts test in b/68208416

Change-Id: I65ebbb948d2ac4e31a73e1e761e32dc8ba1502c3
2018-01-24 06:13:57 +00:00
TreeHugger Robot
6154427d0c Merge "Added STORAGE_VOLUME_ACCESS_SETTINGS intent." 2018-01-24 06:09:21 +00:00
TreeHugger Robot
dc6a1c4b8a Merge "Propagate location mode properly from SettingsProvider" 2018-01-24 05:55:42 +00:00
Holly Jiuyu Sun
8fd5b7e1c3 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." 2018-01-24 05:08:19 +00:00
Cassie Han
eb9452a08d Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." 2018-01-24 04:55:32 +00:00
TreeHugger Robot
667b5f7f6d Merge "Add new refresh key constant." 2018-01-24 04:19:20 +00:00
Dmitry Dementyev
f8ae5deba2 Unhide RecoverableKeyStoreLoader API.
Bug: 66499222
Test: GTS tests under development
Change-Id: I4285beaa26bc94d92f6213a34eb1e41ad0994d7a
2018-01-23 19:42:17 -08:00
TreeHugger Robot
064f16638b Merge "Add API to expose signing certificate proof-of-rotation." 2018-01-24 03:00:27 +00:00
Benedict Wong
cf8f8026b5 Merge "Expose applyTunnelModeTransform as a system API" am: d056f32bd9 am: c2253ff48d
am: 9aaff41725

Change-Id: Ia1f81f5696814f5b9479882e1102a5f8508a4512
2018-01-24 02:58:17 +00:00
Kevin Chyn
179e117cbe Merge changes from topic "fingerprint-dialog"
* changes:
  Add Fingerprint Dialog to SysUI
  Add FingerprintDialog API and related plumbing
2018-01-24 02:07:54 +00:00
Maggie Wang
d2c4f7f610 Merge "Deprecate location modes" 2018-01-24 01:47:54 +00:00
Benedict Wong
d056f32bd9 Merge "Expose applyTunnelModeTransform as a system API" 2018-01-24 01:42:30 +00:00
Xiangyu/Malcolm Chen
592ae5cb9f Merge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c am: dae9a8e839
am: c240b8c25f

Change-Id: Ie866867f99c8699703b6d12d0af78fbff5d5f59b
2018-01-24 01:36:58 +00:00
Yuichiro Hanada
c1415f3e3c Add new refresh key constant.
Bug: 64149858
Bug: 64662317
Test: Builds and manual tests with Chromebook.

Change-Id: I865d657ee7d78b5e45f642e786d26a65a14f49e1
2018-01-24 09:11:49 +09:00
Jason Monk
f7be12dc75 Merge "Expose permission-related Slice APIs" 2018-01-23 23:41:58 +00:00
Xiangyu/Malcolm Chen
afd65d9d1c Merge "Add TransportType in AccessNetworkConstants.java" 2018-01-23 23:39:10 +00:00
Holly Jiuyu Sun
2f87d7b2ee Add getUiccSlots() and switchSlots() in TelephonyManager.
Bug: 71914112
Test: test on phone
Change-Id: Ib7e9e40e5ecda48bdcd1f332dc7d6c422c08d942
2018-01-23 15:26:34 -08:00
Benedict Wong
e0d448f31e Expose applyTunnelModeTransform as a system API
Simple change to expose systemAPI for applyTunnelModeTransform

Bug: 36033193
Test: All CTS, unit tests passing
Change-Id: I2d857c048bc0dc80c3949387f946b1f5adf0527e
2018-01-23 23:25:54 +00:00
Jorim Jaggi
555c6fcd96 Merge "Add API to set divider color in code" 2018-01-23 23:16:40 +00:00
Cassie
866f494dc2 Move android.provider.Telephony.SECRET_CODE to Telephony.Intents.
Bug: 69616728
Test: Basic telephony sanity
Change-Id: Ia053f9be082ceb139a284598ee2398a25daa7e08
2018-01-23 15:06:53 -08:00
Sudheer Shanka
811c3765be Merge "Add DPM API to block apps from using metered data." 2018-01-23 23:02:40 +00:00
Jason Monk
d71d0fc508 Merge "Remove old slice APIs for color" 2018-01-23 23:01:54 +00:00
Kevin Chyn
aae4a15a22 Add FingerprintDialog API and related plumbing
This commit adds the plumbing which sends the signals from the API
to the component in SysUI. The dialog will be implemented in another
CL in this topic.

Bug: 67497360

Test: Modify Settings to use the new API
Test: FingerprintDialogImpl is able to notify FingerprintDialog clients
      of user events
Test: System dialog is dismissed when client application is killed
      unexpectedly
Test: Open FP settings, lock device, authenticate, authenticate. Repeat

Change-Id: Id28ec9691646bed765dc069cceb4678d9f6db92e
2018-01-23 14:54:48 -08:00
Jeff Sharkey
5dd54fdfb6 Merge "Expose existing SubscriptionPlan APIs." 2018-01-23 22:39:11 +00:00
TreeHugger Robot
ba685389af Merge "Keystore APIs for Import Wrapped Key, Strongbox, 3DES" 2018-01-23 22:28:30 +00:00
Android Build Merger (Role)
c1bfc90fba Merge "Merge "Combined flags of data service requests into one reason param" am: 7d441c9b27 am: 28f64b869c am: eeac3b9d62" 2018-01-23 22:09:40 +00:00
Jack Yu
2376cbe33f Merge "Combined flags of data service requests into one reason param" am: 7d441c9b27 am: 28f64b869c
am: eeac3b9d62

Change-Id: I6b33b760ff26e1aaf7fdf3929ca71c7c14d78b36
2018-01-23 22:09:11 +00:00
Julia Reynolds
0d1e3990c6 Merge "Remove settings intent" 2018-01-23 22:08:32 +00:00
Felipe Leme
d82096eca3 Added STORAGE_VOLUME_ACCESS_SETTINGS intent.
Applications typically use this action to ask the user to revert the
"Do not ask again" status of directory access requested made by
StorageVolume.createAccessIntent(directory).

Test: atest CtsAppSecurityHostTestCases:ScopedDirectoryAccessTest#testResetDoNotAskAgain
Test: adb shell am start -a android.settings.STORAGE_VOLUME_ACCESS_SETTINGS

Bug: 63720392

Change-Id: I1ed1a018a54013d88260e11ef9646aaed3a3a318
2018-01-23 14:02:35 -08:00
Rahul Frias
8f761ba1cd Add new values to KeyRequestType
Two additional KeyRequestTypes have been added, None and Update. None
indicates that no key request is needed as keys have already been
loaded. Update indicates that while keys have previously been loaded,
an additional (non-renewal) license request is needed.

Bug: 70335058
Change-Id: Id8575fd4c8e8d71009373235a3944b4ec47849da
2018-01-23 13:45:17 -08:00
Makoto Onuki
8e49825e80 Propagate location mode properly from SettingsProvider
Bug: 72240163
Bug: 72037769
Test: atest $ANDROID_BUILD_TOP/cts/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverLocationTest.java

Change-Id: I7bad1547aaad30aa5c47ef813cbfc14dad4a5cce
2018-01-23 11:54:51 -08:00
Treehugger Robot
7d441c9b27 Merge "Combined flags of data service requests into one reason param" 2018-01-23 19:43:25 +00:00
Maggie
aa080f9676 Deprecate location modes
1. Mark public fields as deprecated: LOCATION_MODE, LOCATION_MODE_HIGH_ACCURACY, LOCATION_MODE_SENSORS_ONLY,
LOCATION_MODE_BATTERY_SAVING, LOCATION_MODE_OFF.

2. Add new public  methods to LocationManager:
setLocationEnabled(boolean)
isLocationEnabled()
setLocationProviderEnabled(String, boolean)

3. Remove LOCATION_PREVIOUS_MODE and constant
LOCATION_MODE_PREVIOUS. Refactor code that references
LOCATION_MODE_PREVIOUS to use LocationManager.setLocationEnabled or
LOCATION_MODE_HIGH_ACCURACY.

4. Mark deprecated fields and methods as removed: LOCATION_PROVIDERS_ALLOWED, setLocationProviderEnabled(), isLocationProviderEnabled()

5. Refactor logic in Settings app and Quick Settings to call
LocationManager.setLocationEnabled() instead of setting location mode.

Bug: 70990911
Test: Manual
Change-Id: Ia49b385f8b6a358b62291983eb0146af0ecf8e02
2018-01-23 10:45:49 -08:00