Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b23f6d71 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move GameManager to android.app package." into sc-dev

parents 72a11d73 235cb508

graphics/java/android/graphics/GameManager.java→core/java/android/app/GameManager.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.graphics;

package android.app;



import android.annotation.IntDef;

import android.annotation.SystemService;

graphics/java/android/graphics/IGameManagerService.aidl→core/java/android/app/IGameManagerService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
** limitations under the License.

*/



package android.graphics;

package android.app;



/**

 * @hide

core/java/android/app/SystemServiceRegistry.java

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,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;

core/java/android/content/Context.java

+2 −1
Original line number Diff line number Diff line
@@ -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;
@@ -5441,7 +5442,7 @@ public abstract class Context { 


    /**

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.graphics.GameManager}.

     * {@link GameManager}.

     *

     * @see #getSystemService(String)

     *

core/tests/GameManagerTests/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.graphics.gamemanagertests"

          package="com.android.app.gamemanagertests"

          android:sharedUserId="android.uid.system" >



    <application>
@@ -24,7 +24,7 @@ 
    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.graphics.gamemanagertests"

                     android:targetPackage="com.android.app.gamemanagertests"

                     android:label="Game Manager Tests"/>



</manifest>