summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-03-01 15:26:44 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-01 15:26:44 -0800
commit606ecf3e9f27c8f69a398ea4d83d842df50d094f (patch)
tree9f8218b4ccde70d1a9e0912d6acc4ff0464b1722 /core/java/android/app
parent7a3a51d0f5eedb977b00e87003368d4bb81b35c0 (diff)
parentce418e661ab52a08a2a2c3b2f10a4dd9adf33305 (diff)
downloadframeworks_base-606ecf3e9f27c8f69a398ea4d83d842df50d094f.zip
frameworks_base-606ecf3e9f27c8f69a398ea4d83d842df50d094f.tar.gz
frameworks_base-606ecf3e9f27c8f69a398ea4d83d842df50d094f.tar.bz2
Merge "Fix issue #3495749: Crash on choosing to open the downloaded images"
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/Activity.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index c502e6f..3a82c78 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -66,6 +66,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
+import android.view.WindowManagerImpl;
import android.view.View.OnCreateContextMenuListener;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
@@ -4402,6 +4403,9 @@ public class Activity extends ContextThemeWrapper
if (mStopped) {
mStopped = false;
mCalled = false;
+ if (mToken != null && mParent == null) {
+ WindowManagerImpl.getDefault().setStoppedState(mToken, false);
+ }
mInstrumentation.callActivityOnRestart(this);
if (!mCalled) {
throw new SuperNotCalledException(
@@ -4478,6 +4482,10 @@ public class Activity extends ContextThemeWrapper
mWindow.closeAllPanels();
}
+ if (mToken != null && mParent == null) {
+ WindowManagerImpl.getDefault().setStoppedState(mToken, true);
+ }
+
mFragments.dispatchStop();
mCalled = false;