commit d6157a089c45d67d0250272cc87899b573d459f5
author Nicolas Prevot <nprevot@google.com> Fri Jul 25 10:50:24 2014 +0100
committer Nicolas Prevot <nprevot@google.com> Fri Jul 25 13:51:27 2014 +0100
tree ee722c19cd6620121dc6072af4f09de2dd6a271e
parent 771375628a4ab85e81ebaef99b1d543f83d935c7

Forward camera intents to primary user.

Including image/video capture intents.

This is required so applications in the managed profile can
intent to the camera in the primary profile to take photos.

Bug: 15534203

Change-Id: I7b94850323324b7994b2aa17dd0770b64c848153

src/com/android/managedprovisioning/ManagedProvisioningService.java

diff --git a/src/com/android/managedprovisioning/ManagedProvisioningService.java b/src/com/android/managedprovisioning/ManagedProvisioningService.java
index 1dbd066..ec71c8f 100644
--- a/src/com/android/managedprovisioning/ManagedProvisioningService.java
+++ b/src/com/android/managedprovisioning/ManagedProvisioningService.java
@@ -28,6 +28,7 @@
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.MediaStore;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 
@@ -390,6 +391,17 @@
         recognizeSpeech.addCategory(Intent.CATEGORY_DEFAULT);
         pm.addCrossProfileIntentFilter(recognizeSpeech, mManagedProfileUserInfo.id,
                 UserHandle.USER_OWNER, 0);
+
+        IntentFilter capture = new IntentFilter();
+        capture.addAction(MediaStore.ACTION_IMAGE_CAPTURE);
+        capture.addAction(MediaStore.ACTION_IMAGE_CAPTURE_SECURE);
+        capture.addAction(MediaStore.ACTION_VIDEO_CAPTURE);
+        capture.addAction(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);
+        capture.addAction(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE);
+        capture.addAction(MediaStore.INTENT_ACTION_VIDEO_CAMERA);
+        capture.addCategory(Intent.CATEGORY_DEFAULT);
+        pm.addCrossProfileIntentFilter(capture, mManagedProfileUserInfo.id,
+                UserHandle.USER_OWNER, 0);
     }
 
     /**