Merge "Add LightsRequest.Builder#setLight back to SystemApi as Deprecated." into sc-dev (466661da) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -3450,6 +3450,10 @@ package android.hardware.lights {
		field @Deprecated public static final int LIGHT_TYPE_MICROPHONE = 8; // 0x8
		}

		public static final class LightsRequest.Builder {
		method @Deprecated @NonNull public android.hardware.lights.LightsRequest.Builder setLight(@NonNull android.hardware.lights.Light, @NonNull android.hardware.lights.LightState);
		}

		}

		package android.hardware.location {

+15 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.hardware.lights;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.util.SparseArray;

		import com.android.internal.util.Preconditions;
		@@ -93,6 +94,20 @@ public final class LightsRequest {
		return this;
		}

		/**
		* Overrides the color and intensity of a given light.
		*
		* @param light the light to modify
		* @param state the desired color and intensity of the light *
		* @deprecated Use {@link #addLight(Light, LightState)} instead.
		* @hide
		*/
		@SystemApi
		@Deprecated
		public @NonNull Builder setLight(@NonNull Light light, @NonNull LightState state) {
		return addLight(light, state);
		}

		/**
		* Removes the override for the color and intensity of a given light.
		*