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

2017-08-28 23:15:26 +00:00
parent ccbb613fa9 070b31216a
commit 6f72b57428
1 changed files with 10 additions and 7 deletions
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -900,6 +900,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
    }

    private void updatePasswordSummary() {
+        mPassword.setEnabled(mBackupManager != null);
+        if (mBackupManager != null) {
            try {
                if (mBackupManager.hasBackupPassword()) {
                    mPassword.setSummary(R.string.local_backup_password_summary_change);
@@ -910,6 +912,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                // Not much we can do here
            }
        }
+    }

    private void writeBtHciSnoopLogOptions() {
        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();