diff options
author | Nicolas Prevot <nprevot@google.com> | 2015-06-29 11:28:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 11:28:13 +0000 |
commit | f1fff7976937d92bc7e0014d54cb071a509975dc (patch) | |
tree | 7abe87423643238c125a26c24361f4bf7917065c /services | |
parent | b6fb3fe8f4fce5fda82a833247bd99ec435815f1 (diff) | |
parent | b6830197450d5a2befaf0dc4f7e73850f4c55846 (diff) | |
download | frameworks_base-f1fff7976937d92bc7e0014d54cb071a509975dc.zip frameworks_base-f1fff7976937d92bc7e0014d54cb071a509975dc.tar.gz frameworks_base-f1fff7976937d92bc7e0014d54cb071a509975dc.tar.bz2 |
Merge "Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService." into mnc-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/core/java/com/android/server/pm/LauncherAppsService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index d787919..4582828 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -271,7 +271,8 @@ public class LauncherAppsService extends SystemService { Intent launchIntent = new Intent(Intent.ACTION_MAIN); launchIntent.addCategory(Intent.CATEGORY_LAUNCHER); launchIntent.setSourceBounds(sourceBounds); - launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK + | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); launchIntent.setPackage(component.getPackageName()); long ident = Binder.clearCallingIdentity(); @@ -470,4 +471,4 @@ public class LauncherAppsService extends SystemService { } } } -}
\ No newline at end of file +} |