Merge 893c591b3b2514c051406b57e475641951695675 on remote branch

Change-Id: I585bee232b14f4b698d4719616c96d6cc279386b

3 files changed, 45 insertions, 0 deletions

diff --git a/core/java/android/util/BoostFramework.java b/core/java/android/util/BoostFramework.java
index 1afe18cc95b6..ba73942a98a7 100644
--- a/core/java/android/util/BoostFramework.java
+++ b/core/java/android/util/BoostFramework.java
@@ -101,6 +101,9 @@ public class BoostFramework {
     public static final int VENDOR_HINT_TAP_EVENT = 0x00001043;
     public static final int VENDOR_HINT_DRAG_START = 0x00001051;
     public static final int VENDOR_HINT_DRAG_END = 0x00001052;
+    //Ime Launch Boost Hint
+    public static final int VENDOR_HINT_IME_LAUNCH_EVENT = 0x0000109F;
+
     //feedback hints
     public static final int VENDOR_FEEDBACK_WORKLOAD_TYPE = 0x00001601;
     public static final int VENDOR_FEEDBACK_LAUNCH_END_POINT = 0x00001602;
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index e6f103e6d53b..fede0dfa94db 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -67,6 +67,7 @@ import android.os.Trace;
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.text.style.SuggestionSpan;
+import android.util.BoostFramework;
 import android.util.Log;
 import android.util.Pools.Pool;
 import android.util.Pools.SimplePool;
@@ -270,6 +271,11 @@ public final class InputMethodManager {
      */
     private static final String SUBTYPE_MODE_VOICE = "voice";
 
+    //Perf
+    static BoostFramework mPerfBoost = null;
+    static boolean IME_BOOST_ENABLED = false;
+    static boolean isImeBoostPropertyRead = false;
+
     /**
      * Ensures that {@link #sInstance} becomes non-{@code null} for application that have directly
      * or indirectly relied on {@link #sInstance} via reflection or something like that.
@@ -586,6 +592,20 @@ public final class InputMethodManager {
             ImeTracing.getInstance().triggerClientDump(
                     "InputMethodManager.DelegateImpl#startInput", InputMethodManager.this,
                     null /* icProto */);
+
+            if (isImeBoostPropertyRead == false) {
+                mPerfBoost = new BoostFramework();
+
+                if (mPerfBoost != null) {
+                    IME_BOOST_ENABLED = Boolean.parseBoolean(mPerfBoost.perfGetProp("ro.vendor.qti.sys.fw.use_ime_boost", "false"));
+                }
+                isImeBoostPropertyRead = true;
+            }
+
+            if (IME_BOOST_ENABLED == true && mPerfBoost != null) {
+                mPerfBoost.perfEvent(BoostFramework.VENDOR_HINT_IME_LAUNCH_EVENT, null);
+            }
+
             synchronized (mH) {
                 mCurrentTextBoxAttribute = null;
                 mCompletions = null;
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 70ecaa7a458c..3014b89651a1 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.
@@ -7400,6 +7407,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");
 
@@ -12061,6 +12074,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}