commit 9dc2bea5e35cf8f59d05240c061cd00d74be6f7b
author Xiaohui Chen <xiaohuic@google.com> Wed Oct 14 11:42:04 2015 -0700
committer Xiaohui Chen <xiaohuic@google.com> Mon Oct 19 15:15:14 2015 -0700
tree 3feb3ae052d5a5401b080b56310900e7bfde3870
parent d3fb75eaae74cd94e25de82ff029168f59344500

clean up USER_OWNER in telephony service

Change-Id: I188c7fe3e38691979b5431a4efc68b5206d1c02e

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 00c9170..895c685 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -30,6 +30,7 @@
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -171,9 +172,9 @@
         super.onCreate(icicle);
         if (DBG) log("onCreate: Intent is " + getIntent());
 
-        // Make sure we are running as the primary user.
-        if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
-            Toast.makeText(this, R.string.call_settings_primary_user_only,
+        // Make sure we are running as an admin user.
+        if (!UserManager.get(this).isAdminUser()) {
+            Toast.makeText(this, R.string.call_settings_admin_user_only,
                     Toast.LENGTH_SHORT).show();
             finish();
             return;