am 5d9d03a0: Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException... (98d169ea) · Commits · e / os / android_frameworks_base

api/current.xml

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29889,6 +29889,17 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
			<method name="isRemoving"
			return="boolean"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="isResumed"		<method name="isResumed"
	return="boolean"		return="boolean"
	abstract="false"		abstract="false"

core/java/android/app/ActivityThread.java

+14 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2410,7 +2410,9 @@ public final class ActivityThread {
	performPauseActivity(token, finished, r.isPreHoneycomb());		performPauseActivity(token, finished, r.isPreHoneycomb());

	// Make sure any pending writes are now committed.		// Make sure any pending writes are now committed.
			if (r.isPreHoneycomb()) {
	QueuedWork.waitToFinish();		QueuedWork.waitToFinish();
			}

	// Tell the activity manager we have paused.		// Tell the activity manager we have paused.
	try {		try {
	@@ -2619,6 +2621,11 @@ public final class ActivityThread {

	updateVisibility(r, show);		updateVisibility(r, show);

			// Make sure any pending writes are now committed.
			if (!r.isPreHoneycomb()) {
			QueuedWork.waitToFinish();
			}

	// Tell activity manager we have been stopped.		// Tell activity manager we have been stopped.
	try {		try {
	ActivityManagerNative.getDefault().activityStopped(		ActivityManagerNative.getDefault().activityStopped(
	@@ -2683,6 +2690,12 @@ public final class ActivityThread {
	}		}
	r.stopped = true;		r.stopped = true;
	}		}

			// Make sure any pending writes are now committed.
			if (!r.isPreHoneycomb()) {
			QueuedWork.waitToFinish();
			}

	// Tell activity manager we slept.		// Tell activity manager we slept.
	try {		try {
	ActivityManagerNative.getDefault().activitySlept(r.token);		ActivityManagerNative.getDefault().activitySlept(r.token);

core/java/android/app/Fragment.java

+26 −1

Original line number	Original line	Diff line number	Diff line
	@@ -357,6 +357,9 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
	// True if the fragment is in the list of added fragments.		// True if the fragment is in the list of added fragments.
	boolean mAdded;		boolean mAdded;

			// If set this fragment is being removed from its activity.
			boolean mRemoving;

	// True if the fragment is in the resumed state.		// True if the fragment is in the resumed state.
	boolean mResumed;		boolean mResumed;

	@@ -638,6 +641,9 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
	* Return <code>getActivity().getResources()</code>.		* Return <code>getActivity().getResources()</code>.
	*/		*/
	final public Resources getResources() {		final public Resources getResources() {
			if (mActivity == null) {
			throw new IllegalStateException("Fragment " + this + " not attached to Activity");
			}
	return mActivity.getResources();		return mActivity.getResources();
	}		}

	@@ -689,7 +695,16 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
	* Return true if the fragment is currently added to its activity.		* Return true if the fragment is currently added to its activity.
	*/		*/
	final public boolean isAdded() {		final public boolean isAdded() {
	return mActivity != null && mActivity.mFragments.mAdded.contains(this);		return mActivity != null && mAdded;
			}

			/**
			* Return true if this fragment is currently being removed from its
			* activity. This is <em>not</em> whether its activity is finishing, but
			* rather whether it is in the process of being removed from its activity.
			*/
			final public boolean isRemoving() {
			return mRemoving;
	}		}

	/**		/**
	@@ -787,6 +802,9 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
	if (mLoaderManager != null) {		if (mLoaderManager != null) {
	return mLoaderManager;		return mLoaderManager;
	}		}
			if (mActivity == null) {
			throw new IllegalStateException("Fragment " + this + " not attached to Activity");
			}
	mCheckedForLoaderManager = true;		mCheckedForLoaderManager = true;
	mLoaderManager = mActivity.getLoaderManager(mIndex, mLoadersStarted, true);		mLoaderManager = mActivity.getLoaderManager(mIndex, mLoadersStarted, true);
	return mLoaderManager;		return mLoaderManager;
	@@ -797,6 +815,9 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
	* containing Activity.		* containing Activity.
	*/		*/
	public void startActivity(Intent intent) {		public void startActivity(Intent intent) {
			if (mActivity == null) {
			throw new IllegalStateException("Fragment " + this + " not attached to Activity");
			}
	mActivity.startActivityFromFragment(this, intent, -1);		mActivity.startActivityFromFragment(this, intent, -1);
	}		}

	@@ -805,6 +826,9 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
	* containing Activity.		* containing Activity.
	*/		*/
	public void startActivityForResult(Intent intent, int requestCode) {		public void startActivityForResult(Intent intent, int requestCode) {
			if (mActivity == null) {
			throw new IllegalStateException("Fragment " + this + " not attached to Activity");
			}
	mActivity.startActivityFromFragment(this, intent, requestCode);		mActivity.startActivityFromFragment(this, intent, requestCode);
	}		}

	@@ -1217,6 +1241,7 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
	writer.print(" mWho="); writer.print(mWho);		writer.print(" mWho="); writer.print(mWho);
	writer.print(" mBackStackNesting="); writer.println(mBackStackNesting);		writer.print(" mBackStackNesting="); writer.println(mBackStackNesting);
	writer.print(prefix); writer.print("mAdded="); writer.print(mAdded);		writer.print(prefix); writer.print("mAdded="); writer.print(mAdded);
			writer.print(" mRemoving="); writer.print(mRemoving);
	writer.print(" mResumed="); writer.print(mResumed);		writer.print(" mResumed="); writer.print(mResumed);
	writer.print(" mFromLayout="); writer.print(mFromLayout);		writer.print(" mFromLayout="); writer.print(mFromLayout);
	writer.print(" mInLayout="); writer.println(mInLayout);		writer.print(" mInLayout="); writer.println(mInLayout);

core/java/android/app/FragmentManager.java

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,8 @@ import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
	import android.util.DebugUtils;		import android.util.DebugUtils;
	import android.util.Log;		import android.util.Log;
			import android.util.LogWriter;
			import android.util.Slog;
	import android.util.SparseArray;		import android.util.SparseArray;
	import android.view.Menu;		import android.view.Menu;
	import android.view.MenuInflater;		import android.view.MenuInflater;
	@@ -968,6 +970,7 @@ final class FragmentManagerImpl extends FragmentManager {
	makeActive(fragment);		makeActive(fragment);
	if (DEBUG) Log.v(TAG, "add: " + fragment);		if (DEBUG) Log.v(TAG, "add: " + fragment);
	fragment.mAdded = true;		fragment.mAdded = true;
			fragment.mRemoving = false;
	if (fragment.mHasMenu) {		if (fragment.mHasMenu) {
	mNeedMenuInvalidate = true;		mNeedMenuInvalidate = true;
	}		}
	@@ -984,6 +987,7 @@ final class FragmentManagerImpl extends FragmentManager {
	mNeedMenuInvalidate = true;		mNeedMenuInvalidate = true;
	}		}
	fragment.mAdded = false;		fragment.mAdded = false;
			fragment.mRemoving = true;
	moveToState(fragment, inactive ? Fragment.INITIALIZING : Fragment.CREATED,		moveToState(fragment, inactive ? Fragment.INITIALIZING : Fragment.CREATED,
	transition, transitionStyle);		transition, transitionStyle);
	if (inactive) {		if (inactive) {
	@@ -1376,6 +1380,14 @@ final class FragmentManagerImpl extends FragmentManager {
	}		}

	if (f.mTarget != null) {		if (f.mTarget != null) {
			if (f.mTarget.mIndex < 0) {
			String msg = "Failure saving state: " + f
			+ " has target not in fragment manager: " + f.mTarget;
			Slog.e(TAG, msg);
			dump(" ", null, new PrintWriter(new LogWriter(
			Log.ERROR, TAG, Log.LOG_ID_SYSTEM)), new String[] { });
			throw new IllegalStateException(msg);
			}
	if (fs.mSavedFragmentState == null) {		if (fs.mSavedFragmentState == null) {
	fs.mSavedFragmentState = new Bundle();		fs.mSavedFragmentState = new Bundle();
	}		}

core/java/android/content/AsyncTaskLoader.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -195,7 +195,7 @@ public abstract class AsyncTaskLoader<D> extends Loader<D> {
	}		}
	}		}
	if (DEBUG) Slog.v(TAG, "Executing: " + mTask);		if (DEBUG) Slog.v(TAG, "Executing: " + mTask);
	mTask.execute((Void[]) null);		mTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
	}		}
	}		}