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

Commit 437a4f2e authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Remove INSTALLER_V2 permission since the API is finalized in S." into sc-dev am: a1ec6ad5 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0eb30a923e8e5040ed3bcf1937eacb0e6eec4248
parents aa3eebd4 a1ec6ad5

core/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -2464,10 +2464,10 @@ package android.content.pm { 
  }















  public static class PackageInstaller.Session implements java.io.Closeable {













    method @RequiresPermission("com.android.permission.USE_INSTALLER_V2") public void addFile(int, @NonNull String, long, @NonNull byte[], @Nullable byte[]);













    method public void addFile(int, @NonNull String, long, @NonNull byte[], @Nullable byte[]);















    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void commitTransferred(@NonNull android.content.IntentSender);













    method @Nullable @RequiresPermission("com.android.permission.USE_INSTALLER_V2") public android.content.pm.DataLoaderParams getDataLoaderParams();













    method @RequiresPermission("com.android.permission.USE_INSTALLER_V2") public void removeFile(int, @NonNull String);













    method @Nullable public android.content.pm.DataLoaderParams getDataLoaderParams();













    method public void removeFile(int, @NonNull String);















  }





























  public static class PackageInstaller.SessionInfo implements android.os.Parcelable {









@@ -2488,7 +2488,7 @@ package android.content.pm {













  public static class PackageInstaller.SessionParams implements android.os.Parcelable {















    method @RequiresPermission(android.Manifest.permission.ALLOCATE_AGGRESSIVE) public void setAllocateAggressive(boolean);















    method @Deprecated public void setAllowDowngrade(boolean);













    method @RequiresPermission(allOf={android.Manifest.permission.INSTALL_PACKAGES, "com.android.permission.USE_INSTALLER_V2"}) public void setDataLoaderParams(@NonNull android.content.pm.DataLoaderParams);













    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setDataLoaderParams(@NonNull android.content.pm.DataLoaderParams);















    method public void setDontKillApp(boolean);















    method public void setEnableRollback(boolean);















    method public void setEnableRollback(boolean, int);

































core/java/android/content/pm/PackageInstaller.java



+1
−6




























Original line number
Diff line number
Diff line








@@ -1173,7 +1173,6 @@ public class PackageInstaller {













         * {@hide}















         */















        @SystemApi













        @RequiresPermission(android.Manifest.permission.USE_INSTALLER_V2)















        public @Nullable DataLoaderParams getDataLoaderParams() {















            try {















                DataLoaderParamsParcel data = mSession.getDataLoaderParams();










@@ -1213,7 +1212,6 @@ public class PackageInstaller {













         * {@hide}















         */















        @SystemApi













        @RequiresPermission(android.Manifest.permission.USE_INSTALLER_V2)















        public void addFile(@FileLocation int location, @NonNull String name, long lengthBytes,















                @NonNull byte[] metadata, @Nullable byte[] signature) {















            try {









@@ -1237,7 +1235,6 @@ public class PackageInstaller {













         * {@hide}















         */















        @SystemApi













        @RequiresPermission(android.Manifest.permission.USE_INSTALLER_V2)















        public void removeFile(@FileLocation int location, @NonNull String name) {















            try {















                mSession.removeFile(location, name);










@@ -2050,9 +2047,7 @@ public class PackageInstaller {













         * {@hide}















         */















        @SystemApi













        @RequiresPermission(allOf = {













                Manifest.permission.INSTALL_PACKAGES,













                Manifest.permission.USE_INSTALLER_V2})













        @RequiresPermission(Manifest.permission.INSTALL_PACKAGES)















        public void setDataLoaderParams(@NonNull DataLoaderParams dataLoaderParams) {















            this.dataLoaderParams = dataLoaderParams;















        }

































core/res/AndroidManifest.xml



+0
−11




























Original line number
Diff line number
Diff line








@@ -3982,17 +3982,6 @@













    <permission android:name="com.android.permission.INSTALL_EXISTING_PACKAGES"















        android:protectionLevel="signature|privileged" />





























    <!-- Allows an application to use the package installer v2 APIs.













         <p>The package installer v2 APIs are still a work in progress and we're













         currently validating they work in all scenarios.













         <p>Not for use by third-party applications.













         TODO(b/152310230): use this permission to protect only Incremental installations













         once the APIs are confirmed to be sufficient.













         @hide













    -->













    <permission android:name="com.android.permission.USE_INSTALLER_V2"













        android:protectionLevel="signature|verifier" />





























    <!-- Allows an application to use System Data Loaders.















         <p>Not for use by third-party applications.















         @hide

































data/etc/privapp-permissions-platform.xml



+0
−2




























Original line number
Diff line number
Diff line








@@ -406,8 +406,6 @@ applications that come with the platform













        <permission name="android.permission.SET_WALLPAPER" />















        <permission name="android.permission.SET_WALLPAPER_COMPONENT" />















        <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" />













        <!-- Permissions required for Incremental CTS tests -->













        <permission name="com.android.permission.USE_INSTALLER_V2"/>















        <permission name="android.permission.LOADER_USAGE_STATS"/>















        <!-- Permission required to test system only camera devices. -->















        <permission name="android.permission.SYSTEM_CAMERA" />

































packages/Shell/AndroidManifest.xml



+0
−2




























Original line number
Diff line number
Diff line








@@ -84,8 +84,6 @@













    <uses-permission android:name="android.permission.READ_INPUT_STATE" />















    <uses-permission android:name="android.permission.SET_ORIENTATION" />















    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />













    <!--  TODO(b/152310230): remove once APIs are confirmed to be sufficient -->













    <uses-permission android:name="com.android.permission.USE_INSTALLER_V2" />















    <uses-permission android:name="com.android.permission.USE_SYSTEM_DATA_LOADERS" />















    <uses-permission android:name="android.permission.MOVE_PACKAGE" />















    <uses-permission android:name="android.permission.KEEP_UNINSTALLED_PACKAGES" />