commit 6f72b574288a8196683408a474f8a5ba0bd4f329
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Aug 28 23:15:26 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 28 23:15:26 2017 +0000
tree 023a0472545aa6629316e56f6d66bb024a3decb6
parent ccbb613fa95834a8d70e66a8b6483d4a8283cc96
parent 070b31216aa2a2031f70e485ceac3440b079929f

Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev

src/com/android/settings/development/DevelopmentSettings.java

diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index ce8acc2..c2571ee 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -900,14 +900,17 @@
     }
 
     private void updatePasswordSummary() {
-        try {
-            if (mBackupManager.hasBackupPassword()) {
-                mPassword.setSummary(R.string.local_backup_password_summary_change);
-            } else {
-                mPassword.setSummary(R.string.local_backup_password_summary_none);
+        mPassword.setEnabled(mBackupManager != null);
+        if (mBackupManager != null) {
+            try {
+                if (mBackupManager.hasBackupPassword()) {
+                    mPassword.setSummary(R.string.local_backup_password_summary_change);
+                } else {
+                    mPassword.setSummary(R.string.local_backup_password_summary_none);
+                }
+            } catch (RemoteException e) {
+                // Not much we can do here
             }
-        } catch (RemoteException e) {
-            // Not much we can do here
         }
     }