summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rwxr-xr-xsrc/com/android/camera/CameraActivity.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 5666331fa..a330f6a5f 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -16,6 +16,8 @@
package com.android.camera;
+import android.os.Parcel;
+import android.os.Parcelable;
import android.view.Display;
import android.graphics.Point;
import android.Manifest;
@@ -1642,6 +1644,13 @@ public class CameraActivity extends Activity
if(resultCode == RESULT_OK) {
mCaptureModule.setRefocusLastTaken(false);
}
+ } else if (requestCode == BestpictureActivity.BESTPICTURE_ACTIVITY_CODE) {
+ if(resultCode == RESULT_OK) {
+ byte[] jpeg = data.getByteArrayExtra("thumbnail");
+ if(jpeg != null) {
+ updateThumbnail(jpeg);
+ }
+ }
} else {
super.onActivityResult(requestCode, resultCode, data);
}