From 235cb5086cd07e51b8b198559da70b614562c1fb Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Fri, 29 Jan 2021 20:56:08 -0800 Subject: [PATCH] Move GameManager to android.app package. Bug: b/177611751 Bug: b/178112303 Test: atest GameManagerTests Test: atest GameManagerServiceTests Test: atest GameManagerServiceSettingsTests Change-Id: Icf01f723f1323f6f91030e6005958b7da05e8177 --- .../graphics => core/java/android/app}/GameManager.java | 2 +- .../java/android/app}/IGameManagerService.aidl | 2 +- core/java/android/app/SystemServiceRegistry.java | 1 - core/java/android/content/Context.java | 3 ++- core/tests/GameManagerTests/AndroidManifest.xml | 4 ++-- core/tests/GameManagerTests/AndroidTest.xml | 2 +- .../src/android/{graphics => app}/GameManagerTests.java | 6 +++--- .../server/{graphics => app}/GameManagerService.java | 8 ++++---- .../com/android/server/{graphics => app}/Settings.java | 4 ++-- services/java/com/android/server/SystemServer.java | 2 +- .../GameManagerServiceSettingsTests.java | 2 +- .../server/{graphics => app}/GameManagerServiceTests.java | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) rename {graphics/java/android/graphics => core/java/android/app}/GameManager.java (99%) rename {graphics/java/android/graphics => core/java/android/app}/IGameManagerService.aidl (96%) rename core/tests/GameManagerTests/src/android/{graphics => app}/GameManagerTests.java (96%) rename services/core/java/com/android/server/{graphics => app}/GameManagerService.java (97%) rename services/core/java/com/android/server/{graphics => app}/Settings.java (98%) rename services/tests/servicestests/src/com/android/server/{graphics => app}/GameManagerServiceSettingsTests.java (99%) rename services/tests/servicestests/src/com/android/server/{graphics => app}/GameManagerServiceTests.java (97%) diff --git a/graphics/java/android/graphics/GameManager.java b/core/java/android/app/GameManager.java similarity index 99% rename from graphics/java/android/graphics/GameManager.java rename to core/java/android/app/GameManager.java index a58aeb4298d65..8b6570f1241fa 100644 --- a/graphics/java/android/graphics/GameManager.java +++ b/core/java/android/app/GameManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.graphics; +package android.app; import android.annotation.IntDef; import android.annotation.SystemService; diff --git a/graphics/java/android/graphics/IGameManagerService.aidl b/core/java/android/app/IGameManagerService.aidl similarity index 96% rename from graphics/java/android/graphics/IGameManagerService.aidl rename to core/java/android/app/IGameManagerService.aidl index 7d3a4fba562e4..c8e1478a9930e 100644 --- a/graphics/java/android/graphics/IGameManagerService.aidl +++ b/core/java/android/app/IGameManagerService.aidl @@ -14,7 +14,7 @@ ** limitations under the License. */ -package android.graphics; +package android.app; /** * @hide diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 1498dae764a94..f185d3bcb116a 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -72,7 +72,6 @@ import android.content.res.Resources; import android.content.rollback.RollbackManagerFrameworkInitializer; import android.debug.AdbManager; import android.debug.IAdbManager; -import android.graphics.GameManager; import android.graphics.fonts.FontManager; import android.hardware.ConsumerIrManager; import android.hardware.ISerialManager; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 6a2329e5235f5..b1a07e610d9f9 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -37,6 +37,7 @@ import android.annotation.TestApi; import android.annotation.UiContext; import android.annotation.UserIdInt; import android.app.ActivityManager; +import android.app.GameManager; import android.app.IApplicationThread; import android.app.IServiceConnection; import android.app.VrManager; @@ -5419,7 +5420,7 @@ public abstract class Context { /** * Use with {@link #getSystemService(String)} to retrieve a - * {@link android.graphics.GameManager}. + * {@link GameManager}. * * @see #getSystemService(String) * diff --git a/core/tests/GameManagerTests/AndroidManifest.xml b/core/tests/GameManagerTests/AndroidManifest.xml index da6636b7b192e..6c28607a110e2 100644 --- a/core/tests/GameManagerTests/AndroidManifest.xml +++ b/core/tests/GameManagerTests/AndroidManifest.xml @@ -16,7 +16,7 @@ --> @@ -24,7 +24,7 @@ diff --git a/core/tests/GameManagerTests/AndroidTest.xml b/core/tests/GameManagerTests/AndroidTest.xml index bfb9802ba1ada..43729923eb7e7 100644 --- a/core/tests/GameManagerTests/AndroidTest.xml +++ b/core/tests/GameManagerTests/AndroidTest.xml @@ -25,7 +25,7 @@ - diff --git a/core/tests/GameManagerTests/src/android/graphics/GameManagerTests.java b/core/tests/GameManagerTests/src/android/app/GameManagerTests.java similarity index 96% rename from core/tests/GameManagerTests/src/android/graphics/GameManagerTests.java rename to core/tests/GameManagerTests/src/android/app/GameManagerTests.java index d861a894500a1..8f50051725cd0 100644 --- a/core/tests/GameManagerTests/src/android/graphics/GameManagerTests.java +++ b/core/tests/GameManagerTests/src/android/app/GameManagerTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package android.graphics; +package android.app; import static junit.framework.Assert.assertEquals; -import android.graphics.GameManager.GameMode; +import android.app.GameManager.GameMode; import android.util.ArrayMap; import android.util.Pair; @@ -31,7 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; /** - * Unit tests for {@link GameManager}. + * Unit tests for {@link android.app.GameManager}. */ @RunWith(AndroidJUnit4.class) @SmallTest diff --git a/services/core/java/com/android/server/graphics/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java similarity index 97% rename from services/core/java/com/android/server/graphics/GameManagerService.java rename to services/core/java/com/android/server/app/GameManagerService.java index 876f02f38536c..3acad49496c5e 100644 --- a/services/core/java/com/android/server/graphics/GameManagerService.java +++ b/services/core/java/com/android/server/app/GameManagerService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.server.graphics; +package com.android.server.app; import android.annotation.NonNull; +import android.app.GameManager; +import android.app.GameManager.GameMode; +import android.app.IGameManagerService; import android.content.Context; -import android.graphics.GameManager; -import android.graphics.GameManager.GameMode; -import android.graphics.IGameManagerService; import android.os.Environment; import android.os.Handler; import android.os.Looper; diff --git a/services/core/java/com/android/server/graphics/Settings.java b/services/core/java/com/android/server/app/Settings.java similarity index 98% rename from services/core/java/com/android/server/graphics/Settings.java rename to services/core/java/com/android/server/app/Settings.java index bbd84d037d18a..ab367fb923aca 100644 --- a/services/core/java/com/android/server/graphics/Settings.java +++ b/services/core/java/com/android/server/app/Settings.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.server.graphics; +package com.android.server.app; -import android.graphics.GameManager; +import android.app.GameManager; import android.os.FileUtils; import android.util.ArrayMap; import android.util.AtomicFile; diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 544eedf99c9e4..4eb4a2ae523d9 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -361,7 +361,7 @@ public final class SystemServer implements Dumpable { "com.android.server.connectivity.IpConnectivityMetrics"; private static final String ROLE_SERVICE_CLASS = "com.android.role.RoleService"; private static final String GAME_MANAGER_SERVICE_CLASS = - "com.android.server.graphics.GameManagerService$Lifecycle"; + "com.android.server.app.GameManagerService$Lifecycle"; private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector"; diff --git a/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceSettingsTests.java b/services/tests/servicestests/src/com/android/server/app/GameManagerServiceSettingsTests.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceSettingsTests.java rename to services/tests/servicestests/src/com/android/server/app/GameManagerServiceSettingsTests.java index 6fc6b9eb3da38..738f008f9f3f9 100644 --- a/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceSettingsTests.java +++ b/services/tests/servicestests/src/com/android/server/app/GameManagerServiceSettingsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.graphics; +package com.android.server.app; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceTests.java b/services/tests/servicestests/src/com/android/server/app/GameManagerServiceTests.java similarity index 97% rename from services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceTests.java rename to services/tests/servicestests/src/com/android/server/app/GameManagerServiceTests.java index 22df645f76191..caa46da306fa5 100644 --- a/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceTests.java +++ b/services/tests/servicestests/src/com/android/server/app/GameManagerServiceTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.server.graphics; +package com.android.server.app; import static org.junit.Assert.assertEquals; -import android.graphics.GameManager; +import android.app.GameManager; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest;