From 86cdfe1edad0848fed8fc5587bb39b19d689d590 Mon Sep 17 00:00:00 2001
From: Andy Yu <chingtangyu@google.com>
Date: Wed, 24 Aug 2022 20:35:38 +0000
Subject: [PATCH] Revert "Set default metadata/XML/attribute set value before
 parsing"

This reverts commit cdaea590ffe9666a6dc74836fd7a854748d0d3cc.

Reason for revert: cherry-picking a new patchset of ag/19706773

Change-Id: I56dd5962c58d80e0f5d53a235e131f2b20854408
---
 .../com/android/server/app/GameManagerService.java | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java
index 134e2061c090a..1302e226eba31 100644
--- a/services/core/java/com/android/server/app/GameManagerService.java
+++ b/services/core/java/com/android/server/app/GameManagerService.java
@@ -502,14 +502,6 @@ public final class GameManagerService extends IGameManagerService.Stub {
 
         GamePackageConfiguration(PackageManager packageManager, String packageName, int userId) {
             mPackageName = packageName;
-
-            // set flag default values
-            mPerfModeOptedIn = false;
-            mBatteryModeOptedIn = false;
-            mAllowDownscale = true;
-            mAllowAngle = true;
-            mAllowFpsOverride = true;
-
             try {
                 final ApplicationInfo ai = packageManager.getApplicationInfoAsUser(packageName,
                         PackageManager.GET_META_DATA, userId);
@@ -519,6 +511,12 @@ public final class GameManagerService extends IGameManagerService.Stub {
                         mBatteryModeOptedIn = ai.metaData.getBoolean(METADATA_BATTERY_MODE_ENABLE);
                         mAllowDownscale = ai.metaData.getBoolean(METADATA_WM_ALLOW_DOWNSCALE, true);
                         mAllowAngle = ai.metaData.getBoolean(METADATA_ANGLE_ALLOW_ANGLE, true);
+                    } else {
+                        mPerfModeOptedIn = false;
+                        mBatteryModeOptedIn = false;
+                        mAllowDownscale = true;
+                        mAllowAngle = true;
+                        mAllowFpsOverride = true;
                     }
                 }
             } catch (NameNotFoundException e) {