Fix crash in developer settings when backup is not available

When backup feature is disabled, Developer Settings dialog does
not come up due to a crash.

Disable Backup Password option in the preference screen.

Bug: 64725174
Test: Developer settings dialog comes up and Backup password is
      disabled on Polaris

Change-Id: I4f4546c4e97d2e5128ec65c0532691d9799b4c8f
This commit is contained in:
Alex Vakulenko
2017-08-25 17:44:36 -07:00
parent 77bd8c3a73
commit 070b31216a

View File

@@ -892,14 +892,17 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
} }
private void updatePasswordSummary() { private void updatePasswordSummary() {
try { mPassword.setEnabled(mBackupManager != null);
if (mBackupManager.hasBackupPassword()) { if (mBackupManager != null) {
mPassword.setSummary(R.string.local_backup_password_summary_change); try {
} else { if (mBackupManager.hasBackupPassword()) {
mPassword.setSummary(R.string.local_backup_password_summary_none); 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
} }
} }