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

Commit 700feef8 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Shortcut permissions for default text classifier 

- Add two shortcut related permissions as SystemAPI for the default
text classifier.

- The default text classifier package name still comes from the
system resource.

Bug: 73083596
Bug: 71555985
Test: atest CtsPermission2TestCases
Test: Manual test with a test package, with the following in config.xml
<string name="config_defaultTextClassifierPackage" translatable="false">com.example.android.pm.shortcutlauncherdemo</string>

Change-Id: I19081d9d6ba0b33eb25d19aa55b4fe2f26a75897
parent f9a02975

api/current.txt

+5 −3
Original line number Diff line number Diff line
@@ -11388,6 +11388,8 @@ package android.content.pm { 
    ctor public PermissionInfo();

    ctor public PermissionInfo(android.content.pm.PermissionInfo);

    method public int describeContents();

    method public int getProtection();

    method public int getProtectionFlags();

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

    field public static final android.os.Parcelable.Creator<android.content.pm.PermissionInfo> CREATOR;

    field public static final int FLAG_COSTS_MONEY = 1; // 0x1
@@ -11404,8 +11406,8 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_SETUP = 2048; // 0x800

    field public static final deprecated int PROTECTION_FLAG_SYSTEM = 16; // 0x10

    field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200

    field public static final int PROTECTION_MASK_BASE = 15; // 0xf

    field public static final int PROTECTION_MASK_FLAGS = 65520; // 0xfff0

    field public static final deprecated int PROTECTION_MASK_BASE = 15; // 0xf

    field public static final deprecated int PROTECTION_MASK_FLAGS = 65520; // 0xfff0

    field public static final int PROTECTION_NORMAL = 0; // 0x0

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

    field public static final deprecated int PROTECTION_SIGNATURE_OR_SYSTEM = 3; // 0x3
@@ -11413,7 +11415,7 @@ package android.content.pm { 
    field public int flags;

    field public java.lang.String group;

    field public java.lang.CharSequence nonLocalizedDescription;

    field public int protectionLevel;

    field public deprecated int protectionLevel;

  }















  public final class ProviderInfo extends android.content.pm.ComponentInfo implements android.os.Parcelable {

























api/system-current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -10,6 +10,7 @@ package android {













    field public static final java.lang.String ACCESS_MTP = "android.permission.ACCESS_MTP";















    field public static final java.lang.String ACCESS_NETWORK_CONDITIONS = "android.permission.ACCESS_NETWORK_CONDITIONS";















    field public static final java.lang.String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS";













    field public static final java.lang.String ACCESS_SHORTCUTS = "android.permission.ACCESS_SHORTCUTS";















    field public static final java.lang.String ACCESS_SURFACE_FLINGER = "android.permission.ACCESS_SURFACE_FLINGER";















    field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";















    field public static final java.lang.String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";










@@ -179,6 +180,7 @@ package android {













    field public static final java.lang.String TETHER_PRIVILEGED = "android.permission.TETHER_PRIVILEGED";















    field public static final java.lang.String TV_INPUT_HARDWARE = "android.permission.TV_INPUT_HARDWARE";















    field public static final java.lang.String TV_VIRTUAL_REMOTE_CONTROLLER = "android.permission.TV_VIRTUAL_REMOTE_CONTROLLER";













    field public static final java.lang.String UNLIMITED_SHORTCUTS_API_CALLS = "android.permission.UNLIMITED_SHORTCUTS_API_CALLS";















    field public static final java.lang.String UPDATE_APP_OPS_STATS = "android.permission.UPDATE_APP_OPS_STATS";















    field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS";















    field public static final java.lang.String UPDATE_LOCK = "android.permission.UPDATE_LOCK";










@@ -1085,6 +1087,7 @@ package android.content.pm {













  public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {















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















    field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000













    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000















    field public int requestRes;















  }

















































api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -215,6 +215,7 @@ package android.content.pm {













  }































  public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {













    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000















    field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000















  }

















































core/java/android/app/ApplicationPackageManager.java



+9
−0




























Original line number
Diff line number
Diff line








@@ -2802,4 +2802,13 @@ public class ApplicationPackageManager extends PackageManager {













            return mArtManager;















        }















    }



























    @Override













    public String getSystemTextClassifierPackageName() {













        try {













            return mPM.getSystemTextClassifierPackageName();













        } catch (RemoteException e) {













            throw e.rethrowAsRuntimeException();













        }













    }















}
























core/java/android/content/pm/IPackageManager.aidl



+2
−0




























Original line number
Diff line number
Diff line








@@ -660,4 +660,6 @@ interface IPackageManager {













    boolean hasSigningCertificate(String packageName, in byte[] signingCertificate, int flags);































    boolean hasUidSigningCertificate(int uid, in byte[] signingCertificate, int flags);



























    String getSystemTextClassifierPackageName();















}