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

Commit 0a4e9a5f authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android Build Coastguard Worker
Browse files

Always restart apps if base.apk gets updated. 

Bug: 219044664
Fixes: 219044664
Test: atest PackageManagerShellCommandTest
Change-Id: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
Merged-In: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
(cherry picked from commit a5dd59db)
Merged-In: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
parent 919bfb6f

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

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



    boolean isStaged();

    int getInstallFlags();

}

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

+12 −0
Original line number Diff line number Diff line
@@ -1188,6 +1188,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

         * {@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 Diff line number Diff line
@@ -91,6 +91,7 @@ import android.system.OsConstants; 
import android.system.StructStat;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.EventLog;

import android.util.ExceptionUtils;

import android.util.MathUtils;

import android.util.Slog;
@@ -1711,6 +1712,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                    resolveInheritedFile(baseDexMetadataFile);

                }

                baseApk = existingBase;

            } 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
@@ -2142,6 +2148,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        return params.isStaged;

    }



    @Override

    public int getInstallFlags() {

        return params.installFlags;

    }



    @Override

    public int[] getChildSessionIds() {

        final int[] childSessionIds = mChildSessionIds.copyKeys();