diff options
author | George Mount <mount@google.com> | 2012-08-16 11:06:42 -0700 |
---|---|---|
committer | George Mount <mount@google.com> | 2012-08-17 10:37:06 -0700 |
commit | d4798893a31705ade83c87c8915ea58f905018a0 (patch) | |
tree | f75d9dd8b791c0736b14092bc47eba1655bed2e8 /src/com/android/gallery3d/app/ActivityState.java | |
parent | 82cdb7bf23b0a9f2f26acd141dce7012bd8c70d5 (diff) | |
download | android_packages_apps_Snap-d4798893a31705ade83c87c8915ea58f905018a0.tar.gz android_packages_apps_Snap-d4798893a31705ade83c87c8915ea58f905018a0.tar.bz2 android_packages_apps_Snap-d4798893a31705ade83c87c8915ea58f905018a0.zip |
Clear activity result when launching from lock screen.
Bug 6710029
When the screen is locked during video play, the activity result
from that play will be triggered immediately when unlocking to
camera. The result must be destroyed on unlock so that the resume
goes to the camera rather than to the video display.
Change-Id: Ifa6f00fa1cba119d5fc6e762d1757bd6aac576f4
Diffstat (limited to 'src/com/android/gallery3d/app/ActivityState.java')
-rw-r--r-- | src/com/android/gallery3d/app/ActivityState.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java index 6335d0575..13cd1509a 100644 --- a/src/com/android/gallery3d/app/ActivityState.java +++ b/src/com/android/gallery3d/app/ActivityState.java @@ -108,6 +108,9 @@ abstract public class ActivityState { protected void onCreate(Bundle data, Bundle storedState) { } + protected void clearStateResult() { + } + BroadcastReceiver mPowerIntentReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { |