diff options
author | roldenburg <roldenburg@google.com> | 2017-08-23 11:04:01 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-08-30 21:28:26 +0000 |
commit | d9d2c230091a5d3cd9b571f0435cd8222c596eef (patch) | |
tree | 5b610f1bee2b9b2291d34c31bd228cfe41b98790 /java | |
parent | 51c6582e664703c2571d7539f2f0f491ebff34e5 (diff) |
Fix crash when missing phone permission but requesting to show device id
This is not a new crash but it is an easy fix
Bug: 63711832
Test: manual (removed permission, verified crash, added check, verified no crash)
PiperOrigin-RevId: 166224971
Change-Id: Ic24d8c4b6654ea8ef9a4e5439fd863c1f4e8307b
Diffstat (limited to 'java')
-rw-r--r-- | java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java index e9fbd555f..7ff0d084a 100644 --- a/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java +++ b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java @@ -16,6 +16,7 @@ package com.android.dialer.dialpadview; +import android.Manifest; import android.app.Activity; import android.app.AlertDialog; import android.app.DialogFragment; @@ -49,6 +50,7 @@ import com.android.dialer.common.LogUtil; import com.android.dialer.compat.telephony.TelephonyManagerCompat; import com.android.dialer.oem.MotorolaUtils; import com.android.dialer.telecom.TelecomUtil; +import com.android.dialer.util.PermissionsUtil; import java.util.ArrayList; import java.util.List; @@ -288,6 +290,9 @@ public class SpecialCharSequenceMgr { // TODO: Use TelephonyCapabilities.getDeviceIdLabel() to get the device id label instead of a // hard-coded string. static boolean handleDeviceIdDisplay(Context context, String input) { + if (!PermissionsUtil.hasPermission(context, Manifest.permission.READ_PHONE_STATE)) { + return false; + } TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); |