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 am: 6f72b57428

Browse Source 
am: f76056c576

Change-Id: Ibd4c1b1ddcd83e77a9c2a14d7aa6c92f5088e6c4
This commit is contained in:
Alex Vakulenko
2017-08-29 00:19:21 +00:00
committed by android-build-merger
parent 0617d139e0 f76056c576
commit 1dec9aa3fd
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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