PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Skip item infos that fail session info verification." into sc-dev am: e00d88e32a am: f6ae45e46d" into sc-v2-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2021-06-15 21:30:43 +00:00
committed by Android (Google) Code Review
parent 229a79d76e b2e31227cf
commit b59f7bc97b
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/model/AddWorkspaceItemsTask.java
+3 -2
View File
@@ -130,8 +130,9 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {
packageName); packageName);
if (!packageInstaller.verifySessionInfo(sessionInfo)) { if (!packageInstaller.verifySessionInfo(sessionInfo)) {
FileLog.d(LOG, "Item info failed session info verification: " FileLog.d(LOG, "Item info failed session info verification. "
+ workspaceInfo); + "Skipping : " + workspaceInfo);
continue;
} }
List<LauncherActivityInfo> activities = launcherApps List<LauncherActivityInfo> activities = launcherApps
src/com/android/launcher3/pm/InstallSessionHelper.java
+18 -14
View File
@@ -217,7 +217,8 @@ public class InstallSessionHelper {
void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) { void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) {
if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get() if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()
&& SessionCommitReceiver.isEnabled(mAppContext) && SessionCommitReceiver.isEnabled(mAppContext)
&& verifySessionInfo(sessionInfo)) { && verifySessionInfo(sessionInfo)
&& !promiseIconAddedForId(sessionInfo.getSessionId())) {
FileLog.d(LOG, "Adding package name to install queue: " FileLog.d(LOG, "Adding package name to install queue: "
+ sessionInfo.getAppPackageName()); + sessionInfo.getAppPackageName());
@@ -234,25 +235,28 @@ public class InstallSessionHelper {
&& sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
&& sessionInfo.getAppIcon() != null && sessionInfo.getAppIcon() != null
&& !TextUtils.isEmpty(sessionInfo.getAppLabel()) && !TextUtils.isEmpty(sessionInfo.getAppLabel())
&& !promiseIconAddedForId(sessionInfo.getSessionId())
&& !new PackageManagerHelper(mAppContext).isAppInstalled( && !new PackageManagerHelper(mAppContext).isAppInstalled(
sessionInfo.getAppPackageName(), getUserHandle(sessionInfo)); sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));
if (sessionInfo != null) { if (sessionInfo != null) {
Bitmap appIcon = sessionInfo.getAppIcon(); Bitmap appIcon = sessionInfo.getAppIcon();
FileLog.d(LOG, String.format( if (Utilities.IS_DEBUG_DEVICE) {
"Verifying session info. Valid: %b, Session verified: %b, Install reason valid:" FileLog.d(LOG, String.format(
+ " %b, App icon: %s, App label: %s, Promise icon added: %b, " "Verifying session info. Valid: %b,"
+ "App installed: %b.", + " Session verified: %b,"
validSessionInfo, + " Install reason valid: %b,"
verify(sessionInfo) != null, + " App icon: %s,"
sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER, + " App label: %s,"
appIcon == null ? "null" : IOUtils.toBase64String(appIcon), + " App installed: %b.",
sessionInfo.getAppLabel(), validSessionInfo,
promiseIconAddedForId(sessionInfo.getSessionId()), verify(sessionInfo) != null,
new PackageManagerHelper(mAppContext).isAppInstalled( sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER,
sessionInfo.getAppPackageName(), getUserHandle(sessionInfo)))); appIcon == null ? "null" : IOUtils.toBase64String(appIcon),
sessionInfo.getAppLabel(),
new PackageManagerHelper(mAppContext).isAppInstalled(
sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))));
}
} else { } else {
FileLog.d(LOG, "Verifying session info failed: session info null."); FileLog.d(LOG, "Verifying session info failed: session info null.");
} }