diff options
| -rw-r--r-- | src/com/android/camera/PermissionsActivity.java | 23 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 1 |
2 files changed, 10 insertions, 14 deletions
diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java index 6cc38f3c9..741e1b021 100644 --- a/src/com/android/camera/PermissionsActivity.java +++ b/src/com/android/camera/PermissionsActivity.java @@ -182,14 +182,16 @@ public class PermissionsActivity extends Activity { private void handlePermissionsSuccess() { if (mIntent != null) { - mIsReturnResult = true; - mIntent.setClass(this, CameraActivity.class); - startActivityForResult(mIntent, 1); + mIsReturnResult = true; + mIntent.setClass(this, CameraActivity.class); + mIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); + startActivity(mIntent); + finish(); } else { - mIsReturnResult = false; - Intent intent = new Intent(this, CameraActivity.class); - startActivity(intent); - finish(); + mIsReturnResult = false; + Intent intent = new Intent(this, CameraActivity.class); + startActivity(intent); + finish(); } } @@ -215,11 +217,4 @@ public class PermissionsActivity extends Activity { }) .show(); } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - setResult(resultCode, data); - finish(); - } } 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; } |