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

Commit 347cc531 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix extra constant value" into tm-qpr-dev am: e325d366 am: eb123d6d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20738446



Change-Id: Ia7ad2f7560447439ff70bef138c806ca3b4598b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42d1bc28 eb123d6d

core/java/android/service/controls/ControlsProviderService.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public abstract class ControlsProviderService extends Service { 
     * @hide

     */

    public static final String EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS =

            "android.service.controls.EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS";

            "android.service.controls.extra.EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS";



    /**

     * @hide