Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 28e000ef: Merge "Remove debugging for b6829431." into jb-mr1-dev

Browse Source 
* commit '28e000ef72e9f86dec9d7be82dfac6d8c05882f7':
  Remove debugging for b6829431.
This commit is contained in:
Craig Mautner
2012-08-01 10:21:28 -07:00
committed by Android Git Automerger
parent c72a495704 28e000ef72
commit 4186f85dde
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/FragmentManager.java
View File

@@ -22,8 +22,6 @@ import android.animation.AnimatorListenerAdapter;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.os.Bundle; import android.os.Bundle;
// TODO(cmautner): remove after fixing 6829431.
import android.os.Debug;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Parcel; import android.os.Parcel;
@@ -385,8 +383,7 @@ final class FragmentManagerState implements Parcelable {
* Container for fragments associated with an activity. * Container for fragments associated with an activity.
*/ */
final class FragmentManagerImpl extends FragmentManager { final class FragmentManagerImpl extends FragmentManager {
// TODO(cmautner): restore to false after fixing 6829431. static boolean DEBUG = false;
static boolean DEBUG = true;
static final String TAG = "FragmentManager"; static final String TAG = "FragmentManager";
static final String TARGET_REQUEST_CODE_STATE_TAG = "android:target_req_state"; static final String TARGET_REQUEST_CODE_STATE_TAG = "android:target_req_state";
@@ -735,10 +732,10 @@ final class FragmentManagerImpl extends FragmentManager {
void moveToState(Fragment f, int newState, int transit, int transitionStyle, void moveToState(Fragment f, int newState, int transit, int transitionStyle,
boolean keepActive) { boolean keepActive) {
// TODO(cmautner): remove after fixing 6829431. //if (DEBUG) Log.v(TAG, "moveToState: " + f
if (DEBUG) Log.v(TAG, "moveToState: " + f // + " oldState=" + f.mState + " newState=" + newState
+ " oldState=" + f.mState + " newState=" + newState // + " mRemoving=" + f.mRemoving + " Callers=" + Debug.getCallers(5));
+ " mRemoving=" + f.mRemoving + " Callers=" + Debug.getCallers(5));
// Fragments that are not currently added will sit in the onCreate() state. // Fragments that are not currently added will sit in the onCreate() state.
if (!f.mAdded && newState > Fragment.CREATED) { if (!f.mAdded && newState > Fragment.CREATED) {
newState = Fragment.CREATED; newState = Fragment.CREATED;