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

Commit 430aff95 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen
Browse files

Migrate game service to @EnforcePermission 

Transition to AIDL annotations which automatically generate the required
permission checks.

Test: atest CtsGameServiceTestCases
Bug: 220214993
Change-Id: I61cbb7f67c9a194b289bc34024def82c05aef447
parent c90c8b78

core/java/android/service/games/IGameService.aidl

+5 −0
Original line number Diff line number Diff line
@@ -23,7 +23,12 @@ import android.service.games.IGameServiceController; 
 * @hide

 */

oneway interface IGameService {

    @RequiresNoPermission

    void connected(in IGameServiceController gameServiceController);



    @RequiresNoPermission

    void disconnected();



    @RequiresNoPermission

    void gameStarted(in GameStartedEvent gameStartedEvent);

}

core/java/android/service/games/IGameServiceController.aidl

+2 −1
Original line number Diff line number Diff line
@@ -20,5 +20,6 @@ package android.service.games; 
 * @hide

 */

oneway interface IGameServiceController {

    @EnforcePermission("MANAGE_GAME_ACTIVITY")

    void createGameSession(int taskId);

}

core/java/android/service/games/IGameSession.aidl

+5 −0
Original line number Diff line number Diff line
@@ -20,7 +20,12 @@ package android.service.games; 
 * @hide

 */

oneway interface IGameSession {

    @RequiresNoPermission

    void onDestroyed();



    @RequiresNoPermission

    void onTransientSystemBarVisibilityFromRevealGestureChanged(boolean visibleDueToGesture);



    @RequiresNoPermission

    void onTaskFocusChanged(boolean focused);

}

core/java/android/service/games/IGameSessionController.aidl

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ import com.android.internal.infra.AndroidFuture; 
 * @hide

 */

oneway interface IGameSessionController {

    @EnforcePermission("MANAGE_GAME_ACTIVITY")

    void takeScreenshot(int taskId, in AndroidFuture gameScreenshotResultFuture);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_GAME_ACTIVITY)")



    @EnforcePermission("MANAGE_GAME_ACTIVITY")

    void restartGame(in int taskId);

}

core/java/android/service/games/IGameSessionService.aidl

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.internal.infra.AndroidFuture; 
 * @hide

 */

oneway interface IGameSessionService {

    @RequiresNoPermission

    void create(

            in IGameSessionController gameSessionController,

            in CreateGameSessionRequest createGameSessionRequest,