OSDN Git Service

Clear activity result when launching from lock screen.
authorGeorge Mount <mount@google.com>
Thu, 16 Aug 2012 18:06:42 +0000 (11:06 -0700)
committerGeorge Mount <mount@google.com>
Fri, 17 Aug 2012 17:37:06 +0000 (10:37 -0700)
commit14d3289b4867c21da93ec4032119c0091bc78c30
tree8ae07cc2453b6d2e6d39e131e67a4f5548f6d5df
parent91ac05ca91846236a4fa05a524e18ed49dc2639c
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
src/com/android/gallery3d/app/ActivityState.java
src/com/android/gallery3d/app/PhotoPage.java
src/com/android/gallery3d/app/StateManager.java