diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-01-27 22:24:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-27 22:24:15 +0000 |
| commit | 783f28691e27b7b116730fad4f9fd9c083bab283 (patch) | |
| tree | 19796a6ac1f39392a5b57598ebd3088075dd2d8e /core/java/android/app/Activity.java | |
| parent | a171ae1bb2b5803b2661ce0d54ef073555ee4b6b (diff) | |
| parent | 60454dbc4d815c90ff2713e224953d6547fc3ad5 (diff) | |
| download | frameworks_base-783f28691e27b7b116730fad4f9fd9c083bab283.zip frameworks_base-783f28691e27b7b116730fad4f9fd9c083bab283.tar.gz frameworks_base-783f28691e27b7b116730fad4f9fd9c083bab283.tar.bz2 | |
Merge "Support activities in the same process having different resources."
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 0a23bc5..74c468d 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4613,7 +4613,7 @@ public class Activity extends ContextThemeWrapper if (Looper.myLooper() != mMainThread.getLooper()) { throw new IllegalStateException("Must be called from main thread"); } - mMainThread.requestRelaunchActivity(mToken, null, null, 0, false, null, false); + mMainThread.requestRelaunchActivity(mToken, null, null, 0, false, null, null, false); } /** |