Merge "Merge "Fix NPE when store brightness and displayDevice is null" am:... (ed5d17dc) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/PersistentDataStore.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -306,8 +306,11 @@ final class PersistentDataStore {
		}

		public boolean setBrightness(DisplayDevice displayDevice, float brightness) {
		if (displayDevice == null \|\| !displayDevice.hasStableUniqueId()) {
		return false;
		}
		final String displayDeviceUniqueId = displayDevice.getUniqueId();
		if (!displayDevice.hasStableUniqueId() \|\| displayDeviceUniqueId == null) {
		if (displayDeviceUniqueId == null) {
		return false;
		}
		final DisplayState state = getDisplayState(displayDeviceUniqueId, true);