Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(604)

Unified Diff: sky/services/intents/src/org/domokit/intents/ActivityManagerImpl.java

Issue 1214633008: SkyDemo should launch demos in their own windows (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« sky/services/intents/intents.mojom ('K') | « sky/services/intents/intents.mojom ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/services/intents/src/org/domokit/intents/ActivityManagerImpl.java
diff --git a/sky/services/intents/src/org/domokit/intents/ActivityManagerImpl.java b/sky/services/intents/src/org/domokit/intents/ActivityManagerImpl.java
index 049d0eb5fdf2a56a0e2089f43e38e8792834e94f..21843283dffea39c679497508d7a284b650e1796 100644
--- a/sky/services/intents/src/org/domokit/intents/ActivityManagerImpl.java
+++ b/sky/services/intents/src/org/domokit/intents/ActivityManagerImpl.java
@@ -40,6 +40,11 @@ public class ActivityManagerImpl implements ActivityManager {
@Override
public void startActivity(Intent intent) {
+ if (sCurrentActivity == null) {
+ Log.e(TAG, "Unable to startActivity");
+ return;
+ }
+
final android.content.Intent androidIntent = new android.content.Intent(
intent.action, Uri.parse(intent.url));
@@ -56,10 +61,12 @@ public class ActivityManagerImpl implements ActivityManager {
}
}
- androidIntent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
+ if (intent.flags != 0) {
+ androidIntent.setFlags(intent.flags);
+ }
try {
- mContext.startActivity(androidIntent);
+ sCurrentActivity.startActivity(androidIntent);
} catch (ActivityNotFoundException e) {
Log.e(TAG, "Unable to startActivity", e);
}
« sky/services/intents/intents.mojom ('K') | « sky/services/intents/intents.mojom ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698