Merge "Add isDreaming method to DreamManager" into rvc-dev

2 files changed, 20 insertions, 1 deletions

diff --git a/api/test-current.txt b/api/test-current.txt
index cc3604ce728c..46049bd949c5 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -431,6 +431,7 @@ package android.app {
   }
 
   public class DreamManager {
+    method @RequiresPermission("android.permission.READ_DREAM_STATE") public boolean isDreaming();
     method @RequiresPermission("android.permission.WRITE_DREAM_STATE") public void setActiveDream(@NonNull android.content.ComponentName);
     method @RequiresPermission("android.permission.WRITE_DREAM_STATE") public void startDream(@NonNull android.content.ComponentName);
     method @RequiresPermission("android.permission.WRITE_DREAM_STATE") public void stopDream();
diff --git a/core/java/android/app/DreamManager.java b/core/java/android/app/DreamManager.java
index fe13b8f26d78..f23681373f53 100644
--- a/core/java/android/app/DreamManager.java
+++ b/core/java/android/app/DreamManager.java
@@ -58,7 +58,7 @@ public class DreamManager {
     @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE)
     public void startDream(@NonNull ComponentName name) {
         try {
-            mService.testDream(mContext.getUserId(), name);
+            mService.dream();
         } catch (RemoteException e) {
             e.rethrowFromSystemServer();
         }
@@ -99,4 +99,22 @@ public class DreamManager {
             e.rethrowFromSystemServer();
         }
     }
+
+    /**
+     * Returns whether the device is Dreaming.
+     *
+     * <p> This is only used for testing the dream service APIs.
+     *
+     * @hide
+     */
+    @TestApi
+    @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE)
+    public boolean isDreaming() {
+        try {
+            return mService.isDreaming();
+        } catch (RemoteException e) {
+            e.rethrowFromSystemServer();
+        }
+        return false;
+    }
 }