summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andy Yu <chingtangyu@google.com> 2022-08-22 20:05:55 -0700
committer Andy Yu <chingtangyu@google.com> 2022-08-23 13:32:39 -0700
commitcdaea590ffe9666a6dc74836fd7a854748d0d3cc (patch)
tree094392baf41c4ba0d61cac8e59359f6c7a55ad22
parent5f5153d7fc89f3ae0c546700913db75bc42d513c (diff)
Set default metadata/XML/attribute set value before parsing
Make sure all game mode and game intervention allow flags are set properly before parsing from metadata, xml file and attribute set. Bug: 243455130 Test: atest GameManagerServiceTests Change-Id: Id71d89974b545cabdab34f808a9576b3711c4774
-rw-r--r--services/core/java/com/android/server/app/GameManagerService.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java
index 1302e226eba3..134e2061c090 100644
--- a/services/core/java/com/android/server/app/GameManagerService.java
+++ b/services/core/java/com/android/server/app/GameManagerService.java
@@ -502,6 +502,14 @@ 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);
@@ -511,12 +519,6 @@ 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) {