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

Commit fccb9247 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Always restart apps if base.apk gets updated." into sc-v2-dev am: 95819b31 

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

Change-Id: I77782a0b88a943902fe66cac657075472028a928
parents 20f8025a 95819b31

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -55,4 +55,5 @@ interface IPackageInstallerSession { 
    int getParentSessionId();

    int getParentSessionId();





    boolean isStaged();

    boolean isStaged();

    int getInstallFlags();

}
 
}

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -1431,6 +1431,18 @@ public class PackageInstaller { 
            }

            }

        }

        }





        /**

         * @return Session's {@link SessionParams#installFlags}.

         * @hide

         */

        public int getInstallFlags() {

            try {

                return mSession.getInstallFlags();

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

        }



        /**

        /**

         * @return the session ID of the multi-package session that this belongs to or

         * @return the session ID of the multi-package session that this belongs to or

         * {@link SessionInfo#INVALID_ID} if it does not belong to a multi-package session.

         * {@link SessionInfo#INVALID_ID} if it does not belong to a multi-package session.

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,7 @@ import android.system.StructStat; 
import android.text.TextUtils;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.EventLog;

import android.util.ExceptionUtils;

import android.util.ExceptionUtils;

import android.util.MathUtils;

import android.util.MathUtils;

import android.util.Slog;

import android.util.Slog;
@@ -3097,6 +3098,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            if (mResolvedBaseFile == null) {

            if (mResolvedBaseFile == null) {

                mResolvedBaseFile = new File(appInfo.getBaseCodePath());

                mResolvedBaseFile = new File(appInfo.getBaseCodePath());

                inheritFileLocked(mResolvedBaseFile);

                inheritFileLocked(mResolvedBaseFile);

            } else if ((params.installFlags & PackageManager.INSTALL_DONT_KILL_APP) != 0) {

                EventLog.writeEvent(0x534e4554, "219044664");



                // Installing base.apk. Make sure the app is restarted.

                params.setDontKillApp(false);

            }

            }





            // Inherit splits if not overridden.

            // Inherit splits if not overridden.
@@ -3742,6 +3748,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        return params.isStaged;

        return params.isStaged;

    }

    }





    @Override

    public int getInstallFlags() {

        return params.installFlags;

    }



    @Override

    @Override

    public DataLoaderParamsParcel getDataLoaderParams() {

    public DataLoaderParamsParcel getDataLoaderParams() {

        mContext.enforceCallingOrSelfPermission(Manifest.permission.USE_INSTALLER_V2, null);

        mContext.enforceCallingOrSelfPermission(Manifest.permission.USE_INSTALLER_V2, null);