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

Commit 2f692631 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Make methods used by PermissionController @SystemApi 

The PermissonController is going to become a mainline module, hence it
has to compile against @SystemApi. Hence all APIs needed have to be
upgraded.

Bug: 110953302
Test: Built
Change-Id: I329e062040bdb6dc20fd65baf71e025338d01c4e
parent 2d21d77e

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,7 @@ package android.content.pm { 
  public class PackageItemInfo {

    method public deprecated java.lang.CharSequence loadSafeLabel(android.content.pm.PackageManager);

    method public java.lang.CharSequence loadSafeLabel(android.content.pm.PackageManager, float, int);

    method public static void setForceSafeLabels(boolean);

    field public static final int SAFE_LABEL_FLAG_FIRST_LINE = 4; // 0x4

    field public static final int SAFE_LABEL_FLAG_SINGLE_LINE = 2; // 0x2

    field public static final int SAFE_LABEL_FLAG_TRIM = 1; // 0x1
@@ -4185,6 +4186,7 @@ package android.permissionpresenterservice { 
    method public final void attachBaseContext(android.content.Context);

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

    method public abstract java.util.List<android.content.pm.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(java.lang.String);

    method public abstract void onRevokeRuntimePermission(java.lang.String, java.lang.String);

    field public static final java.lang.String SERVICE_INTERFACE = "android.permissionpresenterservice.RuntimePermissionPresenterService";

  }

core/java/android/content/pm/PackageItemInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.FloatRange; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.content.res.XmlResourceParser;

import android.graphics.drawable.Drawable;

import android.os.Bundle;
@@ -104,7 +103,7 @@ public class PackageItemInfo { 
    private static volatile boolean sForceSafeLabels = false;



    /** {@hide} */

    @UnsupportedAppUsage

    @SystemApi

    public static void setForceSafeLabels(boolean forceSafeLabels) {

        sForceSafeLabels = forceSafeLabels;

    }

core/java/android/permissionpresenterservice/RuntimePermissionPresenterService.java

+0 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.permissionpresenterservice;



import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.app.Service;

import android.content.Context;

import android.content.Intent;
@@ -78,10 +77,7 @@ public abstract class RuntimePermissionPresenterService extends Service { 
     *

     * @param packageName The package for which to revoke

     * @param permissionName The permission to revoke

     *

     * @hide

     */

    @UnsupportedAppUsage

    public abstract void onRevokeRuntimePermission(String packageName, String permissionName);



    @Override