Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ef0faf authored by Chris Ye's avatar Chris Ye
Browse files

Add LightsRequest.Builder#setLight back to SystemApi as Deprecated. 

LightRequest.Builder#setLight was renamed to
LightRequest.Builder#addLight, as metalava check enforce the check for a
getter. ApiChecker CTS test still check the method with API 28, 29, 30 and will fail on:
 missing_method: android.hardware.lights.LightsRequest.Builder#setLight(android.hardware.lights.Light, android.hardware.lights.LightState)  Error: No method with correct signature found.
Add the method back to SystemApi and annotate it as deprecated.

Bug: 181019981
Test: atest android.signature.cts.api.system.SignatureTest#testSignature
Change-Id: Id05f11ad77c01e26e62eaece78ffc875ec5e72df
parent 4973cb86

core/api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -3440,6 +3440,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 {

































core/java/android/hardware/lights/LightsRequest.java



+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.















         *