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

Commit 7e0016c1 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Fix [AndroidFrameworkRequiresPermission] build warnings for... 

Merge "Fix [AndroidFrameworkRequiresPermission] build warnings for add(remove)KeyguardLockedStateListener." into tm-dev am: 788fe7cd

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

Change-Id: Ib55513ded11740d2a849b14d9f653aed3a018bb8
parents fc84fccd 788fe7cd

core/java/android/view/IWindowManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -201,7 +201,12 @@ interface IWindowManager 
    boolean isKeyguardSecure(int userId);

    void dismissKeyguard(IKeyguardDismissCallback callback, CharSequence message);



    @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest"

            + ".permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE)")

    void addKeyguardLockedStateListener(in IKeyguardLockedStateListener listener);



    @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest"

            + ".permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE)")

    void removeKeyguardLockedStateListener(in IKeyguardLockedStateListener listener);



    // Requires INTERACT_ACROSS_USERS_FULL permission