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

Merge "Rename Settings to GameManagerSettings" into sc-dev

Browse Source
This commit is contained in:
Tim Van Patten
2021-02-17 17:32:54 +00:00
committed by Android (Google) Code Review
parent 01640845f0 63b6658f17
commit 1db78385ad
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ public final class GameManagerService extends IGameManagerService.Stub {
private final Object mLock = new Object(); private final Object mLock = new Object();
private final Handler mHandler; private final Handler mHandler;
@GuardedBy("mLock") @GuardedBy("mLock")
private final ArrayMap<Integer, Settings> mSettings = new ArrayMap<>(); private final ArrayMap<Integer, GameManagerSettings> mSettings = new ArrayMap<>();
public GameManagerService(Context context) { public GameManagerService(Context context) {
this(context, createServiceThread().getLooper()); this(context, createServiceThread().getLooper());
@@ -99,7 +99,7 @@ public final class GameManagerService extends IGameManagerService.Stub {
synchronized (mLock) { synchronized (mLock) {
removeMessages(WRITE_SETTINGS, msg.obj); removeMessages(WRITE_SETTINGS, msg.obj);
if (mSettings.containsKey(userId)) { if (mSettings.containsKey(userId)) {
Settings userSettings = mSettings.get(userId); GameManagerSettings userSettings = mSettings.get(userId);
userSettings.writePersistentDataLocked(); userSettings.writePersistentDataLocked();
} }
} }
@@ -123,7 +123,7 @@ public final class GameManagerService extends IGameManagerService.Stub {
removeMessages(WRITE_SETTINGS, msg.obj); removeMessages(WRITE_SETTINGS, msg.obj);
removeMessages(REMOVE_SETTINGS, msg.obj); removeMessages(REMOVE_SETTINGS, msg.obj);
if (mSettings.containsKey(userId)) { if (mSettings.containsKey(userId)) {
final Settings userSettings = mSettings.get(userId); final GameManagerSettings userSettings = mSettings.get(userId);
mSettings.remove(userId); mSettings.remove(userId);
userSettings.writePersistentDataLocked(); userSettings.writePersistentDataLocked();
} }
@@ -190,7 +190,7 @@ public final class GameManagerService extends IGameManagerService.Stub {
if (!mSettings.containsKey(userId)) { if (!mSettings.containsKey(userId)) {
return GameManager.GAME_MODE_UNSUPPORTED; return GameManager.GAME_MODE_UNSUPPORTED;
} }
Settings userSettings = mSettings.get(userId); GameManagerSettings userSettings = mSettings.get(userId);
return userSettings.getGameModeLocked(packageName); return userSettings.getGameModeLocked(packageName);
} }
} }
@@ -211,7 +211,7 @@ public final class GameManagerService extends IGameManagerService.Stub {
if (!mSettings.containsKey(userId)) { if (!mSettings.containsKey(userId)) {
return; return;
} }
Settings userSettings = mSettings.get(userId); GameManagerSettings userSettings = mSettings.get(userId);
userSettings.setGameModeLocked(packageName, gameMode); userSettings.setGameModeLocked(packageName, gameMode);
final Message msg = mHandler.obtainMessage(WRITE_SETTINGS); final Message msg = mHandler.obtainMessage(WRITE_SETTINGS);
msg.obj = userId; msg.obj = userId;
@@ -235,7 +235,8 @@ public final class GameManagerService extends IGameManagerService.Stub {
return; return;
} }
Settings userSettings = new Settings(Environment.getDataSystemDeDirectory(userId)); GameManagerSettings userSettings =
new GameManagerSettings(Environment.getDataSystemDeDirectory(userId));
mSettings.put(userId, userSettings); mSettings.put(userId, userSettings);
userSettings.readPersistentDataLocked(); userSettings.readPersistentDataLocked();
} }

5
services/core/java/com/android/server/app/Settings.java → services/core/java/com/android/server/app/GameManagerSettings.java
View File

@@ -41,7 +41,7 @@ import java.util.Map;
* Persists all GameService related settings. * Persists all GameService related settings.
* @hide * @hide
*/ */
public class Settings { public class GameManagerSettings {
// The XML file follows the below format: // The XML file follows the below format:
// <?xml> // <?xml>
@@ -63,7 +63,7 @@ public class Settings {
// PackageName -> GameMode // PackageName -> GameMode
private final ArrayMap<String, Integer> mGameModes = new ArrayMap<>(); private final ArrayMap<String, Integer> mGameModes = new ArrayMap<>();
Settings(File dataDir) { GameManagerSettings(File dataDir) {
mSystemDir = new File(dataDir, "system"); mSystemDir = new File(dataDir, "system");
mSystemDir.mkdirs(); mSystemDir.mkdirs();
FileUtils.setPermissions(mSystemDir.toString(), FileUtils.setPermissions(mSystemDir.toString(),
@@ -144,6 +144,7 @@ public class Settings {
int type; int type;
while ((type = parser.next()) != XmlPullParser.START_TAG while ((type = parser.next()) != XmlPullParser.START_TAG
&& type != XmlPullParser.END_DOCUMENT) { && type != XmlPullParser.END_DOCUMENT) {
// Do nothing
} }
if (type != XmlPullParser.START_TAG) { if (type != XmlPullParser.START_TAG) {
Slog.wtf(GameManagerService.TAG, Slog.wtf(GameManagerService.TAG,

6
services/tests/servicestests/src/com/android/server/app/GameManagerServiceSettingsTests.java
View File

@@ -90,7 +90,7 @@ public class GameManagerServiceSettingsTests {
writeGameServiceXml(); writeGameServiceXml();
} }
private void verifyGameServiceSettingsData(Settings settings) { private void verifyGameServiceSettingsData(GameManagerSettings settings) {
assertThat(settings.getGameModeLocked(PACKAGE_NAME_1), is(1)); assertThat(settings.getGameModeLocked(PACKAGE_NAME_1), is(1));
assertThat(settings.getGameModeLocked(PACKAGE_NAME_2), is(2)); assertThat(settings.getGameModeLocked(PACKAGE_NAME_2), is(2));
assertThat(settings.getGameModeLocked(PACKAGE_NAME_3), is(3)); assertThat(settings.getGameModeLocked(PACKAGE_NAME_3), is(3));
@@ -107,7 +107,7 @@ public class GameManagerServiceSettingsTests {
/* write out files and read */ /* write out files and read */
writeOldFiles(); writeOldFiles();
final Context context = InstrumentationRegistry.getContext(); final Context context = InstrumentationRegistry.getContext();
Settings settings = new Settings(context.getFilesDir()); GameManagerSettings settings = new GameManagerSettings(context.getFilesDir());
assertThat(settings.readPersistentDataLocked(), is(true)); assertThat(settings.readPersistentDataLocked(), is(true));
verifyGameServiceSettingsData(settings); verifyGameServiceSettingsData(settings);
} }
@@ -118,7 +118,7 @@ public class GameManagerServiceSettingsTests {
// write out files and read // write out files and read
writeOldFiles(); writeOldFiles();
final Context context = InstrumentationRegistry.getContext(); final Context context = InstrumentationRegistry.getContext();
Settings settings = new Settings(context.getFilesDir()); GameManagerSettings settings = new GameManagerSettings(context.getFilesDir());
assertThat(settings.readPersistentDataLocked(), is(true)); assertThat(settings.readPersistentDataLocked(), is(true));
// write out, read back in and verify the same // write out, read back in and verify the same