Add Settings switch to disable Game default frame rate
This patch adds a new toggle under Developer settings. It defaults to off, meaning game default frame rate is not disabled. Users can choose to togge it on to disable game default frame rate. When a user toggles this switch, it calls to GameManagerService to update the frame rate of games that are currently in the foreground and coming games. screenshots: https://screenshot.googleplex.com/8jTWyNBhJm7zC4x https://screenshot.googleplex.com/5junmXtuHnRxyL2 Bug: 286084594 Bug: 306266471 Test: m; flash Test: atest SettingsRoboTests:GameDefaultFrameRatePReferenceControllerTest Change-Id: Ide843f61e57e244d6e1fc30f93b2358b2bcb655b
This commit is contained in:
Andy Yu
@@ -688,6 +688,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
||||
controllers.add(new HardwareLayersUpdatesPreferenceController(context));
|
||||
controllers.add(new DebugGpuOverdrawPreferenceController(context));
|
||||
controllers.add(new DebugNonRectClipOperationsPreferenceController(context));
|
||||
controllers.add(new GameDefaultFrameRatePreferenceController(context));
|
||||
controllers.add(new ForceDarkPreferenceController(context));
|
||||
controllers.add(new EnableBlursPreferenceController(context));
|
||||
controllers.add(new ForceMSAAPreferenceController(context));
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
/*
|
||||
* Copyright (C) 2023 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.development;
|
||||
|
||||
import android.annotation.NonNull;
|
||||
import android.os.SystemProperties;
|
||||
/**
|
||||
* Wrapper interface to access {@link SystemProperties}.
|
||||
*
|
||||
* @hide
|
||||
*/
|
||||
|
||||
public interface DevelopmentSystemPropertiesWrapper {
|
||||
/**
|
||||
* Get the String value for the given {@code key}.
|
||||
*
|
||||
* @param key the key to lookup
|
||||
* @param def the default value in case the property is not set or empty
|
||||
* @return if the {@code key} isn't found, return {@code def} if it isn't null, or an empty
|
||||
* string otherwise
|
||||
*/
|
||||
@NonNull
|
||||
String get(@NonNull String key, @NonNull String def);
|
||||
/**
|
||||
* Set the value for the given {@code key} to {@code val}.
|
||||
*
|
||||
* @throws IllegalArgumentException if the {@code val} exceeds 91 characters
|
||||
* @throws RuntimeException if the property cannot be set, for example, if it was blocked by
|
||||
* SELinux. libc will log the underlying reason.
|
||||
*/
|
||||
void set(@NonNull String key, @NonNull String val);
|
||||
|
||||
/**
|
||||
* Get the Integer value for the given {@code key}.
|
||||
*
|
||||
* @param key the key to lookup
|
||||
* @param def the default value in case the property is not set or empty
|
||||
* @return if the {@code key} isn't found, return {@code def} if it isn't null, not parsable
|
||||
* or an empty string otherwise
|
||||
*/
|
||||
@NonNull
|
||||
int getInt(@NonNull String key, @NonNull int def);
|
||||
|
||||
/**
|
||||
* Get the boolean value for the given {@code key}.
|
||||
*
|
||||
* @param key the key to lookup
|
||||
* @param def the default value in case the property is not set or empty
|
||||
* @return if the {@code key} isn't found, return {@code def}.
|
||||
*/
|
||||
boolean getBoolean(@NonNull String key, @NonNull boolean def);
|
||||
}
|
||||
@@ -0,0 +1,146 @@
|
||||
/*
|
||||
* Copyright (C) 2023 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.development;
|
||||
|
||||
|
||||
import android.app.IGameManagerService;
|
||||
import android.content.Context;
|
||||
import android.os.RemoteException;
|
||||
import android.os.ServiceManager;
|
||||
import android.os.SystemProperties;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.TwoStatePreference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.flags.Flags;
|
||||
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||
|
||||
public class GameDefaultFrameRatePreferenceController extends DeveloperOptionsPreferenceController
|
||||
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
|
||||
private static final String TAG = "GameDefFrameRatePrefCtr";
|
||||
private static final String DISABLE_GAME_DEFAULT_FRAME_RATE_KEY =
|
||||
"disable_game_default_frame_rate";
|
||||
private final IGameManagerService mGameManagerService;
|
||||
static final String PROPERTY_DEBUG_GFX_GAME_DEFAULT_FRAME_RATE_DISABLED =
|
||||
"debug.graphics.game_default_frame_rate.disabled";
|
||||
|
||||
private final DevelopmentSystemPropertiesWrapper mSysProps;
|
||||
private int mGameDefaultFrameRateValue;
|
||||
|
||||
@VisibleForTesting
|
||||
static class Injector {
|
||||
public DevelopmentSystemPropertiesWrapper createSystemPropertiesWrapper() {
|
||||
return new DevelopmentSystemPropertiesWrapper() {
|
||||
@Override
|
||||
public String get(String key, String def) {
|
||||
return SystemProperties.get(key, def);
|
||||
}
|
||||
@Override
|
||||
public boolean getBoolean(String key, boolean def) {
|
||||
return SystemProperties.getBoolean(key, def);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInt(String key, int def) {
|
||||
return SystemProperties.getInt(key, def);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void set(String key, String val) {
|
||||
SystemProperties.set(key, val);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public GameDefaultFrameRatePreferenceController(Context context) {
|
||||
super(context);
|
||||
mGameManagerService = IGameManagerService.Stub.asInterface(
|
||||
ServiceManager.getService(Context.GAME_SERVICE));
|
||||
|
||||
mSysProps = new Injector().createSystemPropertiesWrapper();
|
||||
|
||||
mGameDefaultFrameRateValue = mSysProps.getInt(
|
||||
"ro.surface_flinger.game_default_frame_rate_override", 60);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
GameDefaultFrameRatePreferenceController(Context context,
|
||||
IGameManagerService gameManagerService,
|
||||
Injector injector) {
|
||||
super(context);
|
||||
mGameManagerService = gameManagerService;
|
||||
mSysProps = injector.createSystemPropertiesWrapper();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return DISABLE_GAME_DEFAULT_FRAME_RATE_KEY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
final boolean isDisabled = (Boolean) newValue;
|
||||
try {
|
||||
mGameManagerService.toggleGameDefaultFrameRate(!isDisabled);
|
||||
updateGameDefaultPreferenceSetting();
|
||||
} catch (RemoteException e) {
|
||||
// intentional no-op
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private void updateGameDefaultPreferenceSetting() {
|
||||
final boolean isDisabled =
|
||||
mSysProps.getBoolean(PROPERTY_DEBUG_GFX_GAME_DEFAULT_FRAME_RATE_DISABLED,
|
||||
false);
|
||||
((TwoStatePreference) mPreference).setChecked(isDisabled);
|
||||
mPreference.setSummary(mContext.getString(
|
||||
R.string.disable_game_default_frame_rate_summary,
|
||||
mGameDefaultFrameRateValue));
|
||||
}
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
super.updateState(preference);
|
||||
updateGameDefaultPreferenceSetting();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return Flags.developmentGameDefaultFrameRate();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDeveloperOptionsSwitchDisabled() {
|
||||
super.onDeveloperOptionsSwitchDisabled();
|
||||
final TwoStatePreference preference = (TwoStatePreference) mPreference;
|
||||
if (preference.isChecked()) {
|
||||
// When the developer option is disabled, we should set everything
|
||||
// to off, that is, enabling game default frame rate.
|
||||
try {
|
||||
mGameManagerService.toggleGameDefaultFrameRate(true);
|
||||
} catch (RemoteException e) {
|
||||
// intentional no-op
|
||||
}
|
||||
}
|
||||
preference.setChecked(false);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,3 +1,6 @@
|
||||
# GameDefaultFrameRatePreferenceController
|
||||
per-file GameDefaultFrameRatePreferenceController.java=file:platform/frameworks/base:/GAME_MANAGER_OWNERS
|
||||
|
||||
# ShowHdrSdrRatioPreferenceController
|
||||
per-file ShowHdrSdrRatioPreferenceController.java=file:platform/frameworks/native:/services/surfaceflinger/OWNERS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user