commit | 2a9a71481c9a4319da8c6f6f817ffa50369fa824 | [log] [tgz] |
---|---|---|
author | Tyler Gunn <tgunn@google.com> | Thu Apr 06 16:01:59 2017 -0700 |
committer | Tyler Gunn <tgunn@google.com> | Mon Apr 10 17:53:14 2017 +0000 |
tree | aab17f2458c38005ff033fd75815c6d8d5c1737e | |
parent | 3c3c1a9ee79e022555929214e0091996c5c4a9e3 [diff] |
Fix null pointer exception when checking whether to hide VVM settings. VVM code assumes there is always metadata in an InCallService manifest definition, where this may not be the case. Test: Manual Bug: 37103034 Merged-In: Ia0609e150f7805ae4239045007cad40e23cee3fa Change-Id: Ia0609e150f7805ae4239045007cad40e23cee3fa
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java index f7db0f2..275c57c 100644 --- a/src/com/android/phone/CallFeaturesSetting.java +++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -367,6 +367,9 @@ try { Bundle metadata = getPackageManager() .getApplicationInfo(defaultDialer, PackageManager.GET_META_DATA).metaData; + if (metadata == null) { + return; + } if (!metadata .getBoolean(TelephonyManager.METADATA_HIDE_VOICEMAIL_SETTINGS_MENU, false)) { if (DBG) {