Merge "Check READ_PHONE_STATE for isVoicemailAvailable()" (599705c2) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/main/impl/OldMainActivityPeer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -372,7 +372,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
		private static boolean isVoicemailAvailable(
		Context context, PhoneAccountHandle defaultUserSelectedAccount) {

		if (!TelecomUtil.hasReadPhoneStatePermission(context)) {
		if (!PermissionsUtil.hasReadPhoneStatePermissions(context)) {
		LogUtil.i(
		"OldMainActivityPeer.isVoicemailAvailable",
		"No read phone permisison or not the default dialer.");

+6 −0

Original line number	Diff line number	Diff line
		@@ -275,15 +275,21 @@ public abstract class TelecomUtil {
		&& hasPermission(context, Manifest.permission.WRITE_VOICEMAIL));
		}

		/** @deprecated use {@link com.android.dialer.util.PermissionsUtil} */
		@Deprecated
		public static boolean hasModifyPhoneStatePermission(Context context) {
		return isDefaultDialer(context)
		\|\| hasPermission(context, Manifest.permission.MODIFY_PHONE_STATE);
		}

		/** @deprecated use {@link com.android.dialer.util.PermissionsUtil} */
		@Deprecated
		public static boolean hasReadPhoneStatePermission(Context context) {
		return isDefaultDialer(context) \|\| hasPermission(context, Manifest.permission.READ_PHONE_STATE);
		}

		/** @deprecated use {@link com.android.dialer.util.PermissionsUtil} */
		@Deprecated
		public static boolean hasCallPhonePermission(Context context) {
		return isDefaultDialer(context) \|\| hasPermission(context, Manifest.permission.CALL_PHONE);
		}