diff options
| author | Yuichi Araki <yaraki@google.com> | 2014-07-03 13:55:05 +0900 |
|---|---|---|
| committer | Yuichi Araki <yaraki@google.com> | 2014-09-17 14:34:40 +0900 |
| commit | 22a32c459910f4b7344b4406637c556b0d8a4b90 (patch) | |
| tree | 234778ff93d703690573d04eb3bbcbbd0d22bbec /admin/BasicManagedProfile | |
| parent | 9071ad8dbabe1a7a44b4577265221256da92fcad (diff) | |
| download | android-22a32c459910f4b7344b4406637c556b0d8a4b90.tar.gz | |
BasicManagedProfile: Use setProfileName instead of
EXTRA_PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME.
Bug: 15982954
Change-Id: I0a7a6ffc88f33549f9fd88355ff6e59451ac9f3c
(cherry picked from commit d42ce01c255df0fbec0504f4801f54b7f122a573)
Diffstat (limited to 'admin/BasicManagedProfile')
3 files changed, 6 insertions, 3 deletions
diff --git a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java index c4c5a936..deed2f63 100644 --- a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java +++ b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java @@ -18,6 +18,7 @@ package com.example.android.basicmanagedprofile; import android.app.Activity; import android.app.admin.DevicePolicyManager; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -45,8 +46,11 @@ public class EnableProfileActivity extends Activity implements View.OnClickListe private void enableProfile() { DevicePolicyManager manager = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE); + ComponentName componentName = BasicDeviceAdminReceiver.getComponentName(this); + // This is the name for the newly created managed profile. + manager.setProfileName(componentName, getString(R.string.profile_name)); // We enable the profile here. - manager.setProfileEnabled(BasicDeviceAdminReceiver.getComponentName(this)); + manager.setProfileEnabled(componentName); } @Override diff --git a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java index d15b53c9..7da6e02d 100644 --- a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java +++ b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java @@ -26,7 +26,6 @@ import android.view.ViewGroup; 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; /** @@ -76,7 +75,6 @@ public class SetupProfileFragment extends Fragment implements View.OnClickListen Intent intent = new Intent(ACTION_PROVISION_MANAGED_PROFILE); intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME, activity.getApplicationContext().getPackageName()); - intent.putExtra(EXTRA_DEVICE_ADMIN, BasicDeviceAdminReceiver.getComponentName(activity)); if (intent.resolveActivity(activity.getPackageManager()) != null) { startActivityForResult(intent, REQUEST_PROVISION_MANAGED_PROFILE); activity.finish(); diff --git a/admin/BasicManagedProfile/Application/src/main/res/values/strings.xml b/admin/BasicManagedProfile/Application/src/main/res/values/strings.xml index 916cdb35..eedba239 100644 --- a/admin/BasicManagedProfile/Application/src/main/res/values/strings.xml +++ b/admin/BasicManagedProfile/Application/src/main/res/values/strings.xml @@ -29,5 +29,6 @@ <string name="toggle_chrome">Chrome in this profile:</string> <string name="set_chrome_restrictions">Set Chrome restrictions</string> <string name="icon">Icon</string> + <string name="profile_name">Sample Managed Profile</string> </resources> |