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

Commit 7ea09c10 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13443303

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bf623120a442bb847c0143ba93a0ffd671f8349
parents c46841e4 b23f6d71

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

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

 * limitations under the License.

 */

 */





package android.graphics;

package android.app;





import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.SystemService;

import android.annotation.SystemService;

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

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

** limitations under the License.

*/

*/





package android.graphics;

package android.app;





/**

/**

 * @hide

 * @hide

core/java/android/app/SystemServiceRegistry.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,6 @@ import android.content.res.Resources; 
import android.content.rollback.RollbackManagerFrameworkInitializer;

import android.content.rollback.RollbackManagerFrameworkInitializer;

import android.debug.AdbManager;

import android.debug.AdbManager;

import android.debug.IAdbManager;

import android.debug.IAdbManager;

import android.graphics.GameManager;

import android.graphics.fonts.FontManager;

import android.graphics.fonts.FontManager;

import android.hardware.ConsumerIrManager;

import android.hardware.ConsumerIrManager;

import android.hardware.ISerialManager;

import android.hardware.ISerialManager;

core/java/android/content/Context.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ import android.annotation.TestApi; 
import android.annotation.UiContext;

import android.annotation.UiContext;

import android.annotation.UserIdInt;

import android.annotation.UserIdInt;

import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.GameManager;

import android.app.IApplicationThread;

import android.app.IApplicationThread;

import android.app.IServiceConnection;

import android.app.IServiceConnection;

import android.app.VrManager;

import android.app.VrManager;
@@ -5441,7 +5442,7 @@ public abstract class Context { 




    /**

    /**

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

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

     * {@link android.graphics.GameManager}.

     * {@link GameManager}.

     *

     *

     * @see #getSystemService(String)

     * @see #getSystemService(String)

     *

     *

core/tests/GameManagerTests/AndroidManifest.xml

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

  -->





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

<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" >

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





    <application>

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

    </application>





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

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

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

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

                     android:label="Game Manager Tests"/>

                     android:label="Game Manager Tests"/>





</manifest>
 
</manifest>