commit 4652e8a10663adb280e41e059156a15c162f5ae5
author Treehugger Robot <android-build-prod@system.gserviceaccount.com> Wed Jan 22 01:09:01 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 22 01:09:01 2020 +0000
tree b7eb15db19a0a92faa03c9e0448c7a5c2c41fb7b
parent a6645d56cf40b59ace17da2446613e765f47e9ae
parent 23be390d40097cc5fcff0fee16915ee7bc0e5d7d

Merge "Changing app classification logic from manifest-based to WLC-based" into q-keystone-qcom-dev

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
index 10842ac..70bcc62 100644
--- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
@@ -1,5 +1,6 @@
 package com.android.server.wm;
 
+import android.app.ActivityManager;
 import static android.app.ActivityManager.START_SUCCESS;
 import static android.app.ActivityManager.START_TASK_TO_FRONT;
 import static android.app.ActivityManager.processStateAmToProto;
@@ -791,8 +792,15 @@
 
         Log.i(TAG, sb.toString());
 
-        int isGame = mLaunchedActivity.isAppInfoGame();
         if (mUxPerf !=  null) {
+            int isGame;
+
+            if (ActivityManager.isLowRamDeviceStatic()) {
+                isGame = mLaunchedActivity.isAppInfoGame();
+            } else {
+                isGame = (mUxPerf.perfGetFeedback(BoostFramework.VENDOR_FEEDBACK_WORKLOAD_TYPE,
+                                        mLaunchedActivity.packageName) == BoostFramework.WorkloadType.GAME) ? 1 : 0;
+            }
             mUxPerf.perfUXEngine_events(BoostFramework.UXE_EVENT_GAME, 0, info.packageName, isGame);
         }