Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Add STATE_USER_PROFILE_FINALIZED as an additional user state"""

Browse Source
This commit is contained in:
Antoan Angelov
2020-10-28 12:23:32 +00:00
committed by Android (Google) Code Review
parent 8b1dd7bfc3 f4a0efd1a0
commit 6206a46b15
5 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -918,6 +918,7 @@ package android.app.admin {
field public static final int PROVISIONING_TRIGGER_QR_CODE = 2; // 0x2
field public static final int PROVISIONING_TRIGGER_UNSPECIFIED = 0; // 0x0
field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4
field public static final int STATE_USER_PROFILE_FINALIZED = 5; // 0x5
field public static final int STATE_USER_SETUP_COMPLETE = 2; // 0x2
field public static final int STATE_USER_SETUP_FINALIZED = 3; // 0x3
field public static final int STATE_USER_SETUP_INCOMPLETE = 1; // 0x1

12
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -1829,6 +1829,15 @@ public class DevicePolicyManager {
@SystemApi
public static final int STATE_USER_PROFILE_COMPLETE = 4;
/**
* Management setup on a managed profile.
* <p>This is used as an intermediate state after {@link #STATE_USER_PROFILE_COMPLETE} once the
* work profile has been created.
* @hide
*/
@SystemApi
public static final int STATE_USER_PROFILE_FINALIZED = 5;
/**
* @hide
*/
@@ -1837,7 +1846,8 @@ public class DevicePolicyManager {
STATE_USER_SETUP_INCOMPLETE,
STATE_USER_SETUP_COMPLETE,
STATE_USER_SETUP_FINALIZED,
STATE_USER_PROFILE_COMPLETE
STATE_USER_PROFILE_COMPLETE,
STATE_USER_PROFILE_FINALIZED
})
@Retention(RetentionPolicy.SOURCE)
public @interface UserProvisioningState {}

1
non-updatable-api/system-current.txt
View File

@@ -866,6 +866,7 @@ package android.app.admin {
field public static final int PROVISIONING_TRIGGER_QR_CODE = 2; // 0x2
field public static final int PROVISIONING_TRIGGER_UNSPECIFIED = 0; // 0x0
field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4
field public static final int STATE_USER_PROFILE_FINALIZED = 5; // 0x5
field public static final int STATE_USER_SETUP_COMPLETE = 2; // 0x2
field public static final int STATE_USER_SETUP_FINALIZED = 3; // 0x3
field public static final int STATE_USER_SETUP_INCOMPLETE = 1; // 0x1

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -7894,7 +7894,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// Current user has a managed-profile, but current user is not managed, so
// rather than moving to finalized state, go back to unmanaged once
// profile provisioning is complete.
if (newState == DevicePolicyManager.STATE_USER_UNMANAGED) {
if (newState == DevicePolicyManager.STATE_USER_PROFILE_FINALIZED) {
return;
}
break;

2
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
View File

@@ -2814,7 +2814,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
exerciseUserProvisioningTransitions(CALLER_USER_HANDLE,
DevicePolicyManager.STATE_USER_PROFILE_COMPLETE,
DevicePolicyManager.STATE_USER_UNMANAGED);
DevicePolicyManager.STATE_USER_PROFILE_FINALIZED);
}
public void testSetUserProvisioningState_managedProfileFromSetupWizard_managedProfile()