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

1 files changed, 9 insertions, 14 deletions

diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java
index 5ebe72075..b5bb2eeee 100644
--- a/src/com/android/camera/PermissionsActivity.java
+++ b/src/com/android/camera/PermissionsActivity.java
@@ -165,14 +165,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();
         }
     }
 
@@ -198,11 +200,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();
-    }
 }