From 1b146c23062b13b81d875a1283e345bd90ec4da6 Mon Sep 17 00:00:00 2001 From: arangelov Date: Fri, 22 Mar 2019 16:18:29 +0000 Subject: [PATCH] Remove PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE This constant is no longer part of the admin integrated flow. Bug: 129135684 Test: compiled code Change-Id: I81f3d4dc2bfb0ee456bd902ca6de212b4e9b5c10 --- api/current.txt | 1 - core/java/android/app/admin/DevicePolicyManager.java | 7 ------- 2 files changed, 8 deletions(-) diff --git a/api/current.txt b/api/current.txt index 8ff63c07594de..d3f825a0732ab 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6952,7 +6952,6 @@ package android.app.admin { field public static final int PRIVATE_DNS_SET_NO_ERROR = 0; // 0x0 field public static final int PROVISIONING_MODE_FULLY_MANAGED_DEVICE = 1; // 0x1 field public static final int PROVISIONING_MODE_MANAGED_PROFILE = 2; // 0x2 - field public static final int PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE = 3; // 0x3 field public static final int RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT = 2; // 0x2 field public static final int RESET_PASSWORD_REQUIRE_ENTRY = 1; // 0x1 field public static final int SKIP_SETUP_WIZARD = 1; // 0x1 diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 20e85e6793f15..4c6d97d33d3bd 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2226,7 +2226,6 @@ public class DevicePolicyManager { * * *

The target activity may also return the account that needs to be migrated from primary @@ -2253,7 +2252,6 @@ public class DevicePolicyManager { *

*/ public static final String EXTRA_PROVISIONING_MODE = @@ -2269,11 +2267,6 @@ public class DevicePolicyManager { */ public static final int PROVISIONING_MODE_MANAGED_PROFILE = 2; - /** - * The provisioning mode for managed profile on a fully managed device. - */ - public static final int PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE = 3; - /** * Activity action: Starts the administrator to show policy compliance for the provisioning. */