summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2016-09-01 11:29:51 +0800
committerjunjiez <junjiez@codeaurora.org>2016-09-01 11:29:51 +0800
commite3a921a7f91f8abc8cc92c4b08167afdb73898cc (patch)
tree588fa8f53ccfe067f98e2fb7a326b65ba35198ad /src/com/android/camera/VideoModule.java
parent9159ebde9c1bc74e531bd0cc5e7e9379d1d235e6 (diff)
downloadandroid_packages_apps_Snap-e3a921a7f91f8abc8cc92c4b08167afdb73898cc.tar.gz
android_packages_apps_Snap-e3a921a7f91f8abc8cc92c4b08167afdb73898cc.tar.bz2
android_packages_apps_Snap-e3a921a7f91f8abc8cc92c4b08167afdb73898cc.zip
SnapdragonCamera:Fix Camera GTS failture issue.
GTS test will fail if use permission activity to return the result, so set FLAG_ACTIVITY_FORWARD_RESULT flag for the intent and let CameraActivity return the result directly. And add URI read permission to the return intent Change-Id: I224789bbd430d977234d2bcbea4e38e957b81142 CRs-Fixed: 1059964
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r--src/com/android/camera/VideoModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index bae16bde6..918b5f28b 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1416,6 +1416,7 @@ public class VideoModule implements CameraModule,
if (valid) {
resultCode = Activity.RESULT_OK;
resultIntent.setData(mCurrentVideoUri);
+ resultIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
} else {
resultCode = Activity.RESULT_CANCELED;
}