diff options
author | junjiez <junjiez@codeaurora.org> | 2016-09-01 11:29:51 +0800 |
---|---|---|
committer | junjiez <junjiez@codeaurora.org> | 2016-09-01 11:29:51 +0800 |
commit | e3a921a7f91f8abc8cc92c4b08167afdb73898cc (patch) | |
tree | 588fa8f53ccfe067f98e2fb7a326b65ba35198ad /src/com/android/camera/PermissionsActivity.java | |
parent | 9159ebde9c1bc74e531bd0cc5e7e9379d1d235e6 (diff) | |
download | android_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/PermissionsActivity.java')
-rw-r--r-- | src/com/android/camera/PermissionsActivity.java | 23 |
1 files changed, 9 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(); - } } |