From 938468da6f5c225ebb161a68bd949c9cf3261892 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Tue, 24 Oct 2017 14:05:52 -0700 Subject: Rename the new bubble package name from "bubble" to "newbubble". It fixes AOSP for package name conflict. Test: manual PiperOrigin-RevId: 173298696 Change-Id: Id10ebe0bcf029e61f65cf6580c7198abd8395081 --- .../android/dialer/interactions/PhoneNumberInteraction.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'java/com/android/dialer/interactions') diff --git a/java/com/android/dialer/interactions/PhoneNumberInteraction.java b/java/com/android/dialer/interactions/PhoneNumberInteraction.java index 9692dae0f..ac744cce7 100644 --- a/java/com/android/dialer/interactions/PhoneNumberInteraction.java +++ b/java/com/android/dialer/interactions/PhoneNumberInteraction.java @@ -15,6 +15,7 @@ */ package com.android.dialer.interactions; +import android.Manifest.permission; import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; @@ -227,15 +228,10 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener { // It's possible for a shortcut to have been created, and then permissions revoked. To avoid a // crash when the user tries to use such a shortcut, check for this condition and ask the user // for the permission. - String[] deniedPhonePermissions = - PermissionsUtil.getPermissionsCurrentlyDenied( - mContext, PermissionsUtil.allPhoneGroupPermissionsUsedInDialer); - if (deniedPhonePermissions.length > 0) { - LogUtil.i( - "PhoneNumberInteraction.startInteraction", - "Need phone permissions: " + Arrays.toString(deniedPhonePermissions)); + if (!PermissionsUtil.hasPhonePermissions(mContext)) { + LogUtil.i("PhoneNumberInteraction.startInteraction", "Need phone permissions: CALL_PHONE"); ActivityCompat.requestPermissions( - (Activity) mContext, deniedPhonePermissions, REQUEST_CALL_PHONE); + (Activity) mContext, new String[] {permission.CALL_PHONE}, REQUEST_CALL_PHONE); return; } -- cgit v1.2.3