commit d944986fbdb3d45fab9ae4120af76ca4f6b0909c
author Jorim Jaggi <jjaggi@google.com> Fri May 29 14:49:08 2015 -0700
committer Jorim Jaggi <jjaggi@google.com> Mon Jun 01 18:01:20 2015 -0700
tree 8e7f67f5b08b7e64f86806b8d29579f03057c3e6
parent cd0f3a1afe668ba3705819da0350d6d05a0b1bcf

Fix API review: Camera prewarm

Let the intent receiver of a camea launch intent declare a prewarm
service instead of sending broadcasts.

Bug: 21347653
Change-Id: I11e31aad4f788ad90eb46a661b819d3e808ddb51

tests/CameraPrewarmTest/AndroidManifest.xml

diff --git a/tests/CameraPrewarmTest/AndroidManifest.xml b/tests/CameraPrewarmTest/AndroidManifest.xml
index eb40200..11b2686 100644
--- a/tests/CameraPrewarmTest/AndroidManifest.xml
+++ b/tests/CameraPrewarmTest/AndroidManifest.xml
@@ -22,13 +22,13 @@
         <activity android:name=".CameraActivity"
                 android:theme="@android:style/Theme.NoTitleBar">
             <intent-filter>
-                <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
                 <action android:name="android.media.action.STILL_IMAGE_CAMERA" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data
+                android:name="android.media.still_image_camera_preview_service"
+                android:value="com.google.android.test.cameraprewarm.PrewarmService">
+            </meta-data>
         </activity>
 
         <activity android:name=".SecureCameraActivity"
@@ -37,16 +37,15 @@
                 <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data
+                android:name="android.media.still_image_camera_preview_service"
+                android:value="com.google.android.test.cameraprewarm.PrewarmService">
+            </meta-data>
         </activity>
 
-        <receiver android:name=".PrewarmReceiver" >
-            <intent-filter>
-                <action android:name="android.media.action.STILL_IMAGE_CAMERA_PREWARM" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.media.action.STILL_IMAGE_CAMERA_COOLDOWN" />
-            </intent-filter>
-        </receiver>
+        <service android:name=".PrewarmService"
+            android:exported="true">
+        </service>
 
     </application>
 </manifest>