Merge branch 'aosp-13' into 13-wip

This commit is contained in:
MrSluffy
2023-09-21 21:54:56 +08:00
1558 changed files with 103738 additions and 36700 deletions
@@ -24,12 +24,14 @@ import android.content.pm.PackageInstaller.SessionInfo;
import android.content.pm.PackageManager;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.WorkerThread;
import com.android.launcher3.logging.FileLog;
import com.android.launcher3.model.ItemInstallQueue;
import com.android.launcher3.pm.InstallSessionHelper;
import com.android.launcher3.testing.shared.TestProtocol;
import com.android.launcher3.util.Executors;
import com.patrykmichalik.opto.core.PreferenceExtensionsKt;
@@ -54,6 +56,9 @@ public class SessionCommitReceiver extends BroadcastReceiver {
private static void processIntent(Context context, Intent intent) {
if (!isEnabled(context)) {
// User has decided to not add icons on homescreen.
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.MISSING_PROMISE_ICON, LOG + " not enabled");
}
return;
}
@@ -62,6 +67,9 @@ public class SessionCommitReceiver extends BroadcastReceiver {
if (!PackageInstaller.ACTION_SESSION_COMMITTED.equals(intent.getAction())
|| info == null || user == null) {
// Invalid intent.
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.MISSING_PROMISE_ICON, LOG + " invalid intent");
}
return;
}
@@ -71,6 +79,14 @@ public class SessionCommitReceiver extends BroadcastReceiver {
|| info.getInstallReason() != PackageManager.INSTALL_REASON_USER
|| packageInstallerCompat.promiseIconAddedForId(info.getSessionId())) {
packageInstallerCompat.removePromiseIconId(info.getSessionId());
if (TestProtocol.sDebugTracing) {
int id = info.getSessionId();
Log.d(TestProtocol.MISSING_PROMISE_ICON, LOG
+ ", TextUtils.isEmpty=" + TextUtils.isEmpty(info.getAppPackageName())
+ ", info.getInstallReason()=" + info.getInstallReason()
+ ", INSTALL_REASON_USER=" + PackageManager.INSTALL_REASON_USER
+ ", icon added=" + packageInstallerCompat.promiseIconAddedForId(id));
}
return;
}
@@ -84,7 +100,8 @@ public class SessionCommitReceiver extends BroadcastReceiver {
}
public static boolean isEnabled(Context context) {
if (PreferenceExtensionsKt.firstBlocking(PreferenceManager2.getInstance(context).getLockHomeScreen())) return false;
if (PreferenceExtensionsKt.firstBlocking(PreferenceManager2.getInstance(context).getLockHomeScreen()))
return false;
return Utilities.getPrefs(context).getBoolean(ADD_ICON_PREFERENCE_KEY, true);
}
}