diff options
| author | 2022-09-22 12:35:40 +0000 | |
|---|---|---|
| committer | 2022-09-22 12:35:40 +0000 | |
| commit | 96b69de42f18427bb5e861da9b38ebdff812d34d (patch) | |
| tree | 93605f28d17d75deab0d2b5a4e5ea5710d68dde2 | |
| parent | a9e715b9e11e5c3dfe718980ddf659458e6e9b74 (diff) | |
| parent | 5998e8c2034480b1e6b2862c5a517a5fc840adda (diff) | |
Merge "Remove duplicated white space in ContextImpl when throw AndroidRuntimeException" am: 67d1bacd75 am: 5998e8c203
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219559
Change-Id: Id12ed0e37db2e537f1990092648fce39d7c057da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 6d982ced385c..9673e8ce6b56 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1094,7 +1094,7 @@ class ContextImpl extends Context { && (options == null || ActivityOptions.fromBundle(options).getLaunchTaskId() == -1)) { throw new AndroidRuntimeException( - "Calling startActivity() from outside of an Activity " + "Calling startActivity() from outside of an Activity" + " context requires the FLAG_ACTIVITY_NEW_TASK flag." + " Is this really what you want?"); } @@ -1128,7 +1128,7 @@ class ContextImpl extends Context { public int startActivitiesAsUser(Intent[] intents, Bundle options, UserHandle userHandle) { if ((intents[0].getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) == 0) { throw new AndroidRuntimeException( - "Calling startActivities() from outside of an Activity " + "Calling startActivities() from outside of an Activity" + " context requires the FLAG_ACTIVITY_NEW_TASK flag on first Intent." + " Is this really what you want?"); } @@ -1142,7 +1142,7 @@ class ContextImpl extends Context { warnIfCallingFromSystemProcess(); if ((intents[0].getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) == 0) { throw new AndroidRuntimeException( - "Calling startActivities() from outside of an Activity " + "Calling startActivities() from outside of an Activity" + " context requires the FLAG_ACTIVITY_NEW_TASK flag on first Intent." + " Is this really what you want?"); } |