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

Commit 3846f7b5 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Expose setInstallFlagAllowTest testAPI" into sc-dev

parents 874dc67f dbaaacd5

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package android { 
    field public static final String CONTROL_DEVICE_STATE = "android.permission.CONTROL_DEVICE_STATE";

    field public static final String FORCE_DEVICE_POLICY_MANAGER_LOGS = "android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS";

    field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";

    field public static final String INSTALL_TEST_ONLY_PACKAGE = "android.permission.INSTALL_TEST_ONLY_PACKAGE";

    field public static final String KEEP_UNINSTALLED_PACKAGES = "android.permission.KEEP_UNINSTALLED_PACKAGES";

    field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";

    field public static final String MANAGE_ACTIVITY_TASKS = "android.permission.MANAGE_ACTIVITY_TASKS";
@@ -815,6 +816,7 @@ package android.content.pm { 
  }



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

    method public void setInstallFlagAllowTest();

    method public void setInstallerPackageName(@Nullable String);

  }

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

+8 −0
Original line number Diff line number Diff line
@@ -1986,6 +1986,14 @@ public class PackageInstaller { 
            }

        }



        /**

         * @hide

         */

        @TestApi

        public void setInstallFlagAllowTest() {

            installFlags |= PackageManager.INSTALL_ALLOW_TEST;

        }



        /**

         * Set the installer package for the app.

         *

services/core/java/com/android/server/pm/PackageInstallerService.java

+5 −1
Original line number Diff line number Diff line
@@ -584,12 +584,16 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 


            params.installFlags &= ~PackageManager.INSTALL_FROM_ADB;

            params.installFlags &= ~PackageManager.INSTALL_ALL_USERS;

            params.installFlags &= ~PackageManager.INSTALL_ALLOW_TEST;

            params.installFlags |= PackageManager.INSTALL_REPLACE_EXISTING;

            if ((params.installFlags & PackageManager.INSTALL_VIRTUAL_PRELOAD) != 0

                    && !mPm.isCallerVerifier(callingUid)) {

                params.installFlags &= ~PackageManager.INSTALL_VIRTUAL_PRELOAD;

            }

            if (mContext.checkCallingOrSelfPermission(

                    Manifest.permission.INSTALL_TEST_ONLY_PACKAGE)

                    != PackageManager.PERMISSION_GRANTED) {

                params.installFlags &= ~PackageManager.INSTALL_ALLOW_TEST;

            }

        }



        String originatingPackageName = null;