PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 6f72b57428

Change-Id: I96f26ec23db34ff642a11cbcdef888fa9e5072bf
This commit is contained in:
Alex Vakulenko
2017-08-28 23:45:19 +00:00
committed by android-build-merger
parent f54f8e3d5a 6f72b57428
commit f76056c576
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -900,14 +900,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
} }
} }