commit 50fc743a26258c1c9b3c7dc0e9180c6f67798c6a
author Tyler Gunn <tgunn@google.com> Mon Apr 10 20:42:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 10 20:42:16 2017 +0000
tree f0a0db47abd94c82ed1751be66831c9e3fd2bf04
parent 023aa9b8fc8eafba08d6a322ab2df991073e8970
parent 8b6aa681fec6a311b82d6e125acd34e28f79b1e3

Fix null pointer exception when checking whether to hide VVM settings.
am: 8b6aa681fe

Change-Id: Iab8e2af27e75ebae655f427107736f1d30488544

src/com/android/phone/CallFeaturesSetting.java

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) {