From dc1e04035b438570fba85b245ef8f5463dda0be3 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 15 Aug 2016 12:32:20 -0700 Subject: [PATCH] Hide default phone preference when there is no phone app. Bug: 29859821 Change-Id: Ia6de0de04d74f4f947243f38ac2bd190ae586401 (cherry picked from commit bc6fc60683082dea6e91872e029787a0039e4cb5) --- .../settings/applications/DefaultPhonePreference.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/applications/DefaultPhonePreference.java b/src/com/android/settings/applications/DefaultPhonePreference.java index 5689c838335..e1512743774 100644 --- a/src/com/android/settings/applications/DefaultPhonePreference.java +++ b/src/com/android/settings/applications/DefaultPhonePreference.java @@ -82,9 +82,13 @@ public class DefaultPhonePreference extends AppListPreference implements SelfAva return false; } - final UserManager um = - (UserManager) context.getSystemService(Context.USER_SERVICE); - return !um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS); + final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); + final boolean hasUserRestriction = + um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS); + final CharSequence[] entries = getEntries(); + return !hasUserRestriction + && entries != null + && entries.length > 0; } public static boolean hasPhonePreference(String pkg, Context context) {