diff options
author | Craig Mautner <cmautner@google.com> | 2014-05-14 00:54:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-14 00:54:41 +0000 |
commit | 7fd239cf0a1ddc0500b51d97e0e6c3539b42639f (patch) | |
tree | 78a9c3fdb5a154ea6fddd5215886171cfc8b052f /core/java/android/app/ApplicationThreadNative.java | |
parent | 7126c3c7aebad0e92a9779c534c8e42bd66b4cbd (diff) | |
parent | 233ceeebab7efe6ad4783371003c4cf29b896436 (diff) | |
download | frameworks_base-7fd239cf0a1ddc0500b51d97e0e6c3539b42639f.zip frameworks_base-7fd239cf0a1ddc0500b51d97e0e6c3539b42639f.tar.gz frameworks_base-7fd239cf0a1ddc0500b51d97e0e6c3539b42639f.tar.bz2 |
Merge "Pass ActivityOptions back from finishing activity."
Diffstat (limited to 'core/java/android/app/ApplicationThreadNative.java')
-rw-r--r-- | core/java/android/app/ApplicationThreadNative.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/java/android/app/ApplicationThreadNative.java b/core/java/android/app/ApplicationThreadNative.java index 0029efa..ef4099f 100644 --- a/core/java/android/app/ApplicationThreadNative.java +++ b/core/java/android/app/ApplicationThreadNative.java @@ -152,11 +152,10 @@ public abstract class ApplicationThreadNative extends Binder ParcelFileDescriptor profileFd = data.readInt() != 0 ? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null; boolean autoStopProfiler = data.readInt() != 0; - Bundle resumeArgs = data.readBundle(); scheduleLaunchActivity(intent, b, ident, info, curConfig, compatInfo, voiceInteractor, procState, state, persistentState, ri, pi, notResumed, isForward, profileName, profileFd, - autoStopProfiler, resumeArgs); + autoStopProfiler); return true; } @@ -737,8 +736,7 @@ class ApplicationThreadProxy implements IApplicationThread { IVoiceInteractor voiceInteractor, int procState, Bundle state, PersistableBundle persistentState, List<ResultInfo> pendingResults, List<Intent> pendingNewIntents, boolean notResumed, boolean isForward, - String profileName, ParcelFileDescriptor profileFd, boolean autoStopProfiler, - Bundle resumeArgs) + String profileName, ParcelFileDescriptor profileFd, boolean autoStopProfiler) throws RemoteException { Parcel data = Parcel.obtain(); data.writeInterfaceToken(IApplicationThread.descriptor); @@ -764,7 +762,6 @@ class ApplicationThreadProxy implements IApplicationThread { data.writeInt(0); } data.writeInt(autoStopProfiler ? 1 : 0); - data.writeBundle(resumeArgs); mRemote.transact(SCHEDULE_LAUNCH_ACTIVITY_TRANSACTION, data, null, IBinder.FLAG_ONEWAY); data.recycle(); |