Merge "Add check to catch settings NPE" into main (d60bf6d5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioDeviceBroker.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -2799,6 +2799,10 @@ public class AudioDeviceBroker {
		return;
		}
		final SettingsAdapter settingsAdapter = mAudioService.getSettings();
		if (settingsAdapter == null) {
		Log.e(TAG, "No settings adapter when saving AdiDeviceState: " + deviceSettings);
		return;
		}
		try {
		boolean res = settingsAdapter.putSecureStringForUser(mAudioService.getContentResolver(),
		Settings.Secure.AUDIO_DEVICE_INVENTORY,
		@@ -2814,6 +2818,12 @@ public class AudioDeviceBroker {
		private String readDeviceSettings() {
		final SettingsAdapter settingsAdapter = mAudioService.getSettings();
		final ContentResolver contentResolver = mAudioService.getContentResolver();
		if (settingsAdapter == null \|\| contentResolver == null) {
		// should not happen, throw Exception for stack trace
		Log.e(TAG, "No settings adapter or content resolver to read device settings",
		new Exception("readDeviceSettings_NPE"));
		return "";
		}
		return settingsAdapter.getSecureStringForUser(contentResolver,
		Settings.Secure.AUDIO_DEVICE_INVENTORY, UserHandle.USER_CURRENT);
		}