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

Commit 634b8ec6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Nullability of PermissionControllerService#onBind"

parents ac7f38fa 051f3380

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5667,7 +5667,7 @@ package android.permission { 
  public abstract class PermissionControllerService extends android.app.Service {

    ctor public PermissionControllerService();

    method public final void attachBaseContext(android.content.Context);

    method public final android.os.IBinder onBind(android.content.Intent);

    method @NonNull public final android.os.IBinder onBind(android.content.Intent);

    method public abstract int onCountPermissionApps(@NonNull java.util.List<java.lang.String>, int);

    method @NonNull public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(@NonNull String);

    method @NonNull public abstract java.util.List<android.permission.RuntimePermissionUsageInfo> onGetPermissionUsages(boolean, long);

core/java/android/permission/PermissionControllerService.java

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public abstract class PermissionControllerService extends Service { 
            @NonNull String permission, @PermissionGrantState int grantState);



    @Override

    public final IBinder onBind(Intent intent) {

    public final @NonNull IBinder onBind(Intent intent) {

        return new IPermissionController.Stub() {

            @Override

            public void revokeRuntimePermissions(