Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Loading boost: use the existing GAME_LOADING power mode, and deactivate it on a timer." into tm-dev

Browse Source
This commit is contained in:
Jim Blackler
2022-05-03 08:48:42 +00:00
committed by Android (Google) Code Review
parent ec77a90abc c40c497fba
commit 70853212e7
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/app/GameManagerService.java
View File

@@ -121,7 +121,10 @@ public final class GameManagerService extends IGameManagerService.Stub {
static final int REMOVE_SETTINGS = 2; static final int REMOVE_SETTINGS = 2;
static final int POPULATE_GAME_MODE_SETTINGS = 3; static final int POPULATE_GAME_MODE_SETTINGS = 3;
static final int SET_GAME_STATE = 4; static final int SET_GAME_STATE = 4;
static final int CANCEL_GAME_LOADING_MODE = 5;
static final int WRITE_SETTINGS_DELAY = 10 * 1000; // 10 seconds static final int WRITE_SETTINGS_DELAY = 10 * 1000; // 10 seconds
static final int LOADING_BOOST_MAX_DURATION = 5 * 1000; // 5 seconds
static final PackageOverride COMPAT_ENABLED = new PackageOverride.Builder().setEnabled(true) static final PackageOverride COMPAT_ENABLED = new PackageOverride.Builder().setEnabled(true)
.build(); .build();
static final PackageOverride COMPAT_DISABLED = new PackageOverride.Builder().setEnabled(false) static final PackageOverride COMPAT_DISABLED = new PackageOverride.Builder().setEnabled(false)
@@ -299,6 +302,10 @@ public final class GameManagerService extends IGameManagerService.Stub {
} }
break; break;
} }
case CANCEL_GAME_LOADING_MODE: {
mPowerManagerInternal.setPowerMode(Mode.GAME_LOADING, false);
break;
}
} }
} }
} }
@@ -1028,9 +1035,22 @@ public final class GameManagerService extends IGameManagerService.Stub {
if (gameMode == GameManager.GAME_MODE_UNSUPPORTED) { if (gameMode == GameManager.GAME_MODE_UNSUPPORTED) {
return; return;
} }
final int loadingBoostDuration = getLoadingBoostDuration(packageName, userId); int loadingBoostDuration = getLoadingBoostDuration(packageName, userId);
if (loadingBoostDuration != -1) { if (loadingBoostDuration != -1) {
mPowerManagerInternal.setPowerBoost(Mode.GAME_LOADING, loadingBoostDuration); if (loadingBoostDuration == 0 || loadingBoostDuration > LOADING_BOOST_MAX_DURATION) {
loadingBoostDuration = LOADING_BOOST_MAX_DURATION;
}
if (mHandler.hasMessages(CANCEL_GAME_LOADING_MODE)) {
// The loading mode has already been set and is waiting to be unset. It is not
// required to set the mode again and we should replace the queued cancel
// instruction.
mHandler.removeMessages(CANCEL_GAME_LOADING_MODE);
} else {
mPowerManagerInternal.setPowerMode(Mode.GAME_LOADING, true);
}
mHandler.sendMessageDelayed(
mHandler.obtainMessage(CANCEL_GAME_LOADING_MODE), loadingBoostDuration);
} }
} }