commit efc7b514db7bb07f54d77516936f6a0da0e26b38
author George Lin <giolin@google.com> Thu Oct 20 10:41:29 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 20 10:41:29 2022 +0000
tree cd6fc882d769e505e2ab9cecfe6626edf74e2e38
parent 54c95a8fef1f6f257eb238efefad42e73f2ffbeb
parent c4e63bf23b1084e6485b49b1be1d111d0f767271

Merge "[WP2] Reorder TestInjector" into tm-qpr-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4072227..6270836 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,7 +14,10 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+  <uses-permission android:name="android.permission.READ_WALLPAPER_INTERNAL" />
   <uses-permission android:name="android.permission.SET_WALLPAPER"/>
+  <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />
+  <uses-permission android:name="android.permission.BIND_WALLPAPER" />
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-permission android:name="com.android.wallpaper.NOTIFY_ROTATING_WALLPAPER_CHANGED"/>
 
@@ -41,6 +44,11 @@
       <intent>
           <action android:name="com.android.launcher3.action.PARTNER_CUSTOMIZATION" />
       </intent>
+      <!-- Intent filter used to query the launcher Activity for grid preview metadata -->
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.HOME" />
+        </intent>
   </queries>
 
   <application

src/com/android/wallpaper/effects/EffectsController.java

diff --git a/src/com/android/wallpaper/effects/EffectsController.java b/src/com/android/wallpaper/effects/EffectsController.java
index c0d3d56..6734477 100644
--- a/src/com/android/wallpaper/effects/EffectsController.java
+++ b/src/com/android/wallpaper/effects/EffectsController.java
@@ -27,6 +27,8 @@
     public static final int RESULT_ERROR_TRY_AGAIN_LATER = 2;
     public static final int RESULT_ERROR_CONTINUE = 4;
     public static final int RESULT_ERROR_DISCONNECT_NO_BUTTON = 8;
+    public static final int RESULT_PROBE_SUCCESS = 16;
+    public static final int RESULT_PROBE_ERROR = 32;
     /**
      * Interface of the Effect enum.
      */