diff options
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/GameManager.java | 1 | ||||
| -rw-r--r-- | core/java/android/app/GameModeConfiguration.java | 18 | ||||
| -rw-r--r-- | core/tests/GameManagerTests/src/android/app/GameModeConfigurationTest.java | 4 |
4 files changed, 11 insertions, 14 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index eb2d2ca89588..e4b71378cef3 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -826,7 +826,6 @@ package android.app { method public int describeContents(); method public int getFpsOverride(); method public float getScalingFactor(); - method @NonNull public android.app.GameModeConfiguration.Builder toBuilder(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.app.GameModeConfiguration> CREATOR; field public static final int FPS_OVERRIDE_NONE = 0; // 0x0 @@ -834,6 +833,7 @@ package android.app { public static final class GameModeConfiguration.Builder { ctor public GameModeConfiguration.Builder(); + ctor public GameModeConfiguration.Builder(@NonNull android.app.GameModeConfiguration); method @NonNull public android.app.GameModeConfiguration build(); method @NonNull public android.app.GameModeConfiguration.Builder setFpsOverride(int); method @NonNull public android.app.GameModeConfiguration.Builder setScalingFactor(float); diff --git a/core/java/android/app/GameManager.java b/core/java/android/app/GameManager.java index 2f51b174113c..c6fa064a6b0f 100644 --- a/core/java/android/app/GameManager.java +++ b/core/java/android/app/GameManager.java @@ -287,6 +287,7 @@ public final class GameManager { * <p> * The caller must have {@link android.Manifest.permission#MANAGE_GAME_MODE}. * + * @param packageName The package name of the game to update * @param gameModeConfig The configuration to use for game mode interventions * @hide */ diff --git a/core/java/android/app/GameModeConfiguration.java b/core/java/android/app/GameModeConfiguration.java index b081e82e19b0..d8be814374ff 100644 --- a/core/java/android/app/GameModeConfiguration.java +++ b/core/java/android/app/GameModeConfiguration.java @@ -62,10 +62,16 @@ public final class GameModeConfiguration implements Parcelable { */ @SystemApi public static final class Builder { - /** Constructs a new Builder for a game mode’s configuration */ + /** Constructs a new Builder for a game mode’s configuration. */ public Builder() { } + /** Constructs a new builder by copying from an existing game mode configuration. */ + public Builder(@NonNull GameModeConfiguration configuration) { + mFpsOverride = configuration.mFpsOverride; + mScalingFactor = configuration.mScalingFactor; + } + /** * Sets the scaling factor used for game resolution downscaling. * <br> @@ -156,16 +162,6 @@ public final class GameModeConfiguration implements Parcelable { return mFpsOverride; } - /** - * Converts and returns the game mode config as a new builder. - */ - @NonNull - public GameModeConfiguration.Builder toBuilder() { - return new GameModeConfiguration.Builder() - .setFpsOverride(mFpsOverride) - .setScalingFactor(mScalingFactor); - } - @Override public boolean equals(Object obj) { if (obj == this) { diff --git a/core/tests/GameManagerTests/src/android/app/GameModeConfigurationTest.java b/core/tests/GameManagerTests/src/android/app/GameModeConfigurationTest.java index 7462bcf67480..b3e74d3f553a 100644 --- a/core/tests/GameManagerTests/src/android/app/GameModeConfigurationTest.java +++ b/core/tests/GameManagerTests/src/android/app/GameModeConfigurationTest.java @@ -77,10 +77,10 @@ public class GameModeConfigurationTest { } @Test - public void testToBuilder() { + public void testBuilderConstructor() { GameModeConfiguration config = new GameModeConfiguration .Builder().setFpsOverride(40).setScalingFactor(0.5f).build(); - GameModeConfiguration newConfig = config.toBuilder().build(); + GameModeConfiguration newConfig = new GameModeConfiguration.Builder(config).build(); assertEquals(config, newConfig); } |