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

Merge "DO NOT MERGE: add interim startDream api." into tm-qpr-dev

Browse Source
This commit is contained in:
Darrell Shi
2022-09-15 16:00:34 +00:00
committed by Android (Google) Code Review
parent ab5c609adb 93e654d66c
commit 05dfa43c03
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -287,6 +287,7 @@ package android.app {
method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void setDreamOverlay(@Nullable android.content.ComponentName); method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void setDreamOverlay(@Nullable android.content.ComponentName);
method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setScreensaverEnabled(boolean); method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setScreensaverEnabled(boolean);
method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void setSystemDreamComponent(@Nullable android.content.ComponentName); method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void setSystemDreamComponent(@Nullable android.content.ComponentName);
method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void startDream(@Nullable android.content.ComponentName);
method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void startDream(); method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void startDream();
method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void stopDream(); method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void stopDream();
} }

19
core/java/android/app/DreamManager.java
View File

@@ -84,6 +84,25 @@ public class DreamManager {
com.android.internal.R.bool.config_dreamsSupported); com.android.internal.R.bool.config_dreamsSupported);
} }
/**
* Starts dreaming.
*
* This API is equivalent to {@link DreamManager#startDream()} but with a nullable component
* name to be compatible with TM CTS tests.
*
* <p>This is only used for testing the dream service APIs.
*
* @see DreamManager#startDream()
*
* @hide
*/
@TestApi
@UserHandleAware
@RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE)
public void startDream(@Nullable ComponentName name) {
startDream();
}
/** /**
* Starts dreaming. * Starts dreaming.
* *