Merge tag 'LA.QSSI.12.0.r1-07900.02-qssi.0' into sugisawa-mr1

"LA.QSSI.12.0.r1-07900.02-qssi.0"

Change-Id: Ie8af0b8cc073d2b8a74655a107abe33d6a414ba9

2 files changed, 25 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index fec2adbbe5b3..96557f79a554 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -896,6 +896,13 @@ public class PackageManagerService extends IPackageManager.Stub
     final private HashMap<String, String> mPackagesToBeDisabled = new HashMap<>();
 
     /**
+     * Tracks packages that need to be disabled for QSPA enabled taregts.
+     * List of packages path on the file system.
+     */
+    final private List<String> mPackagesPathToBeDisabledForQSPA = new ArrayList<String>();
+    final private boolean mQspaEnabled = SystemProperties.getBoolean("ro.config.qspa.apps", false);
+
+    /**
      * Tracks new system packages [received in an OTA] that we expect to
      * find updated user-installed versions. Keys are package name, values
      * are package location.
@@ -7415,6 +7422,12 @@ public class PackageManagerService extends IPackageManager.Stub
         readListOfPackagesToBeDisabled();
         t.traceEnd();
 
+        mPackagesPathToBeDisabledForQSPA.add("/system_ext/priv-app/SystemUI");
+        mPackagesPathToBeDisabledForQSPA.add("/system_ext/priv-app/Launcher3QuickStep");
+        mPackagesPathToBeDisabledForQSPA.add("/system/app/PrintSpooler");
+        mPackagesPathToBeDisabledForQSPA.add("/system/priv-app/StatementService");
+        mPackagesPathToBeDisabledForQSPA.add("/product/app/Calendar");
+
         // Create sub-components that provide services / data. Order here is important.
         t.traceBegin("createSubComponents");
 
@@ -12111,6 +12124,15 @@ public class PackageManagerService extends IPackageManager.Stub
                 continue;
             }
 
+            if (mQspaEnabled) {
+                if (mPackagesPathToBeDisabledForQSPA != null &&
+                        mPackagesPathToBeDisabledForQSPA.contains(file.toString())) {
+                    // Ignore entries contained in {@link #mPackagesPathToBeDisabledForQSPA}
+                    Slog.d(TAG, "QSPA enabled ignoring package for install : " + file);
+                    continue;
+                }
+            }
+
             if (mPackagesToBeDisabled.values() != null &&
                     mPackagesToBeDisabled.values().contains(file.toString())) {
                 // Ignore entries contained in {@link #mPackagesToBeDisabled}
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 42c6dd43ebce..19df6345c22a 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -4122,6 +4122,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
      * which controls the visibility and animation of the input method window.
      */
     void updateImeInputAndControlTarget(WindowState target) {
+        if (target != null && target.mActivityRecord != null) {
+            target.mActivityRecord.mImeInsetsFrozenUntilStartInput = false;
+        }
         if (mImeInputTarget != target) {
             ProtoLog.i(WM_DEBUG_IME, "setInputMethodInputTarget %s", target);
             setImeInputTarget(target);