Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev (6f72b574) · Commits · e / os / android_packages_apps_Settings

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

+10 −7

Original line number	Diff line number	Diff line
		@@ -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();