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

Merge "Add permission for takeScreenshot API." into tm-dev

Browse Source
This commit is contained in:
Peiyong Lin
2022-03-19 01:53:16 +00:00
committed by Android (Google) Code Review
parent 7794cd47ea 7fd2f7f29f
commit 4bd3214296
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -11410,7 +11410,7 @@ package android.service.games {
method @RequiresPermission(android.Manifest.permission.MANAGE_GAME_ACTIVITY) public final boolean restartGame();
method public void setTaskOverlayView(@NonNull android.view.View, @NonNull android.view.ViewGroup.LayoutParams);
method @RequiresPermission(android.Manifest.permission.MANAGE_GAME_ACTIVITY) public final void startActivityFromGameSessionForResult(@NonNull android.content.Intent, @Nullable android.os.Bundle, @NonNull java.util.concurrent.Executor, @NonNull android.service.games.GameSessionActivityCallback);
method public void takeScreenshot(@NonNull java.util.concurrent.Executor, @NonNull android.service.games.GameSession.ScreenshotCallback);
method @RequiresPermission(android.Manifest.permission.MANAGE_GAME_ACTIVITY) public void takeScreenshot(@NonNull java.util.concurrent.Executor, @NonNull android.service.games.GameSession.ScreenshotCallback);
}
public static interface GameSession.ScreenshotCallback {

1
core/java/android/service/games/GameSession.java
View File

@@ -426,6 +426,7 @@ public abstract class GameSession {
* or failed.
* @throws IllegalStateException if this method is called prior to {@link #onCreate}.
*/
@RequiresPermission(android.Manifest.permission.MANAGE_GAME_ACTIVITY)
public void takeScreenshot(@NonNull Executor executor, @NonNull ScreenshotCallback callback) {
if (mGameSessionController == null) {
throw new IllegalStateException("Can not call before onCreate()");

3
services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java
View File

@@ -192,8 +192,11 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan
private final IGameSessionController mGameSessionController =
new IGameSessionController.Stub() {
@Override
@RequiresPermission(android.Manifest.permission.MANAGE_GAME_ACTIVITY)
public void takeScreenshot(int taskId,
@NonNull AndroidFuture gameScreenshotResultFuture) {
mContext.enforceCallingPermission(Manifest.permission.MANAGE_GAME_ACTIVITY,
"takeScreenshot()");
mBackgroundExecutor.execute(() -> {
GameServiceProviderInstanceImpl.this.takeScreenshot(taskId,
gameScreenshotResultFuture);