Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always restart apps if base.apk gets updated." into rvc-dev am: fe30ac3f0a

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

Change-Id: I4cca0da70a5f0bc9bd9d60b863d6b4bcbd601ab2
This commit is contained in:
TreeHugger Robot
2022-03-09 06:56:58 +00:00
committed by Automerger Merge Worker
parent c759e6a989 fe30ac3f0a
commit f8bc3f97ed
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/pm/IPackageInstallerSession.aidl
View File

@@ -51,4 +51,5 @@ interface IPackageInstallerSession {
int getParentSessionId(); int getParentSessionId();
boolean isStaged(); boolean isStaged();
int getInstallFlags();
} }

12
core/java/android/content/pm/PackageInstaller.java
View File

@@ -1358,6 +1358,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.

11
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -119,6 +119,7 @@ import android.system.OsConstants;
import android.system.StructStat; import android.system.StructStat;
import android.text.TextUtils; import android.text.TextUtils;
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;
@@ -2223,6 +2224,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
resolveInheritedFile(baseDexMetadataFile); resolveInheritedFile(baseDexMetadataFile);
} }
baseApk = existingBase; 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 // Inherit splits if not overridden
@@ -2676,6 +2682,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);