From 5fd8e37603fbd65a4d555a3c90ab6018314e4ee3 Mon Sep 17 00:00:00 2001 From: Yuichi Araki Date: Fri, 9 Sep 2016 10:32:54 +0900 Subject: AppRestriction: Remove bundle restriction Bundle restrictions are no longer allowed in app restrictions schema. This removes the bundle restriction "profile" from both AppRestrictionSchema and AppRestrictionEnforcer. Bug: 31361481 Change-Id: I9bc20ad24891127a00728d8af0edadacfec79d37 (cherry picked from commit ceda4554de5c10ea45018f8b3d00941cabf875c2) --- .../apprestrictionenforcer/SetupProfileFragment.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/SetupProfileFragment.java') diff --git a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/SetupProfileFragment.java b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/SetupProfileFragment.java index 4dbd9305..29c36d41 100644 --- a/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/SetupProfileFragment.java +++ b/admin/AppRestrictionEnforcer/Application/src/main/java/com/example/android/apprestrictionenforcer/SetupProfileFragment.java @@ -18,6 +18,7 @@ package com.example.android.apprestrictionenforcer; import android.app.Activity; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; @@ -28,6 +29,7 @@ import android.widget.Toast; import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE; import static android.app.admin.DevicePolicyManager.EXTRA_DEVICE_ADMIN; import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME; +import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME; /** * This {@link Fragment} handles initiation of managed profile provisioning. @@ -74,9 +76,14 @@ public class SetupProfileFragment extends Fragment implements View.OnClickListen return; } Intent intent = new Intent(ACTION_PROVISION_MANAGED_PROFILE); - intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME, - activity.getApplicationContext().getPackageName()); - intent.putExtra(EXTRA_DEVICE_ADMIN, EnforcerDeviceAdminReceiver.getComponentName(activity)); + if (Build.VERSION.SDK_INT >= 24) { + intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME, + EnforcerDeviceAdminReceiver.getComponentName(activity)); + } else { + intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME, + activity.getApplicationContext().getPackageName()); + intent.putExtra(EXTRA_DEVICE_ADMIN, EnforcerDeviceAdminReceiver.getComponentName(activity)); + } if (intent.resolveActivity(activity.getPackageManager()) != null) { startActivityForResult(intent, REQUEST_PROVISION_MANAGED_PROFILE); activity.finish(); -- cgit v1.2.3