diff options
| author | Craig Mautner <cmautner@google.com> | 2015-01-20 15:02:36 -0800 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2015-01-21 13:57:24 -0800 |
| commit | e3119b7d353e71d1f94ddff932b722b4d285931e (patch) | |
| tree | 5e2fee0389e88768da470a195d196023777575f4 /core | |
| parent | d7211ef8bc5aca625a17e76651b2c99dc8963c03 (diff) | |
| download | frameworks_base-e3119b7d353e71d1f94ddff932b722b4d285931e.zip frameworks_base-e3119b7d353e71d1f94ddff932b722b4d285931e.tar.gz frameworks_base-e3119b7d353e71d1f94ddff932b722b4d285931e.tar.bz2 | |
Refactor removeApp and removeTask for last removals.
Move app token removal to the AppWindowToken class so cleanup can
be done locally. Move task removal to the Task class so cleanup can
be done locally. Call task removal when the last app is removed.
Merge actions done prior to method calls into methods.
Fixes bug 18088522 item #12.
Change-Id: I5ce85d2bb309ceb82bd7404e27a56a7c31cd7359
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 2a8d64b..26a1c3a 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -46,7 +46,6 @@ import android.graphics.Canvas; import android.hardware.display.DisplayManagerGlobal; import android.net.ConnectivityManager; import android.net.IConnectivityManager; -import android.net.LinkProperties; import android.net.Network; import android.net.Proxy; import android.net.ProxyInfo; @@ -87,8 +86,6 @@ import android.util.Slog; import android.util.SuperNotCalledException; import android.view.Display; import android.view.HardwareRenderer; -import android.view.IWindowManager; -import android.view.IWindowSessionCallback; import android.view.View; import android.view.ViewDebug; import android.view.ViewManager; @@ -165,8 +162,8 @@ public final class ActivityThread { private static final long MIN_TIME_BETWEEN_GCS = 5*1000; private static final Pattern PATTERN_SEMICOLON = Pattern.compile(";"); private static final int SQLITE_MEM_RELEASED_EVENT_LOG_TAG = 75003; - private static final int LOG_ON_PAUSE_CALLED = 30021; - private static final int LOG_ON_RESUME_CALLED = 30022; + private static final int LOG_AM_ON_PAUSE_CALLED = 30021; + private static final int LOG_AM_ON_RESUME_CALLED = 30022; private ContextImpl mSystemContext; @@ -2993,7 +2990,7 @@ public final class ActivityThread { } r.activity.performResume(); - EventLog.writeEvent(LOG_ON_RESUME_CALLED, + EventLog.writeEvent(LOG_AM_ON_RESUME_CALLED, UserHandle.myUserId(), r.activity.getComponentName().getClassName()); r.paused = false; @@ -3263,7 +3260,7 @@ public final class ActivityThread { // Now we are idle. r.activity.mCalled = false; mInstrumentation.callActivityOnPause(r.activity); - EventLog.writeEvent(LOG_ON_PAUSE_CALLED, UserHandle.myUserId(), + EventLog.writeEvent(LOG_AM_ON_PAUSE_CALLED, UserHandle.myUserId(), r.activity.getComponentName().getClassName()); if (!r.activity.mCalled) { throw new SuperNotCalledException( @@ -3660,7 +3657,7 @@ public final class ActivityThread { try { r.activity.mCalled = false; mInstrumentation.callActivityOnPause(r.activity); - EventLog.writeEvent(LOG_ON_PAUSE_CALLED, UserHandle.myUserId(), + EventLog.writeEvent(LOG_AM_ON_PAUSE_CALLED, UserHandle.myUserId(), r.activity.getComponentName().getClassName()); if (!r.activity.mCalled) { throw new SuperNotCalledException( |