Merge "SnapdragonCamera: fix invoke camera failture caused by permissions" into camera.lnx.1.0-dev.1.0

1 files changed, 22 insertions, 4 deletions

diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java
index c5e43e56d..5ebe72075 100644
--- a/src/com/android/camera/PermissionsActivity.java
+++ b/src/com/android/camera/PermissionsActivity.java
@@ -33,16 +33,20 @@ public class PermissionsActivity extends Activity {
     private boolean mFlagHasMicrophonePermission;
     private boolean mFlagHasStoragePermission;
     private boolean mCriticalPermissionDenied;
+    private Intent mIntent;
+    private boolean mIsReturnResult;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mIntent = getIntent();
+        mIsReturnResult = false;
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        if (!mCriticalPermissionDenied) {
+        if (!mCriticalPermissionDenied && !mIsReturnResult) {
             mNumPermissionsToRequest = 0;
             checkPermissions();
         } else {
@@ -160,9 +164,16 @@ public class PermissionsActivity extends Activity {
     }
 
     private void handlePermissionsSuccess() {
-        Intent intent = new Intent(this, CameraActivity.class);
-        startActivity(intent);
-        finish();
+        if (mIntent != null) {
+           mIsReturnResult = true;
+           mIntent.setClass(this, CameraActivity.class);
+           startActivityForResult(mIntent, 1);
+        } else {
+           mIsReturnResult = false;
+           Intent intent = new Intent(this, CameraActivity.class);
+           startActivity(intent);
+           finish();
+        }
     }
 
     private void handlePermissionsFailure() {
@@ -187,4 +198,11 @@ 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();
+    }
 }