summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/am/ActivityStack.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-09-20 22:15:37 -0700
committerAmith Yamasani <yamasani@google.com>2012-09-20 22:33:43 -0700
commit920ace0bbc2d4133dbec991d2636c99a57d6245e (patch)
treea69deeaa2cd76a15eaf402faeb95bba608bc6895 /services/java/com/android/server/am/ActivityStack.java
parent2f98008d06cbe48f0f5619d16f59988952c9b2ca (diff)
downloadframeworks_base-920ace0bbc2d4133dbec991d2636c99a57d6245e.zip
frameworks_base-920ace0bbc2d4133dbec991d2636c99a57d6245e.tar.gz
frameworks_base-920ace0bbc2d4133dbec991d2636c99a57d6245e.tar.bz2
Query users excluding any being removed
Keep track of user creation and last logged-in time. adb shell dumpsys users User switcher shouldn't show users about to be removed. No need to check for singleton for activities. Bug: 7194894 Change-Id: Ic9a59ea5bd544920479e191d1a1e8a77f8b6ddcf
Diffstat (limited to 'services/java/com/android/server/am/ActivityStack.java')
-rwxr-xr-xservices/java/com/android/server/am/ActivityStack.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index df50d89..05ff379 100755
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -3038,11 +3038,6 @@ final class ActivityStack {
// Collect information about the target of the Intent.
ActivityInfo aInfo = resolveActivity(intent, resolvedType, startFlags,
profileFile, profileFd, userId);
- if (aInfo != null && (aInfo.flags & ActivityInfo.FLAG_MULTIPROCESS) == 0
- && mService.isSingleton(aInfo.processName, aInfo.applicationInfo, null, 0)) {
- userId = 0;
- }
- aInfo = mService.getActivityInfoForUser(aInfo, userId);
synchronized (mService) {
int callingPid;