diff options
| author | Craig Mautner <cmautner@google.com> | 2012-08-01 10:29:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-01 10:29:01 -0700 |
| commit | 893eacc5919442959d946c866bde2894172bd5af (patch) | |
| tree | 56a0601ef461d5cc723894df2a282f2f2a1c5fed /core | |
| parent | 0351b54e90cbf56d7facf6bb9f98882500acca16 (diff) | |
| parent | 4186f85ddecc9d95aa130eb10bedbd2ef457c5b0 (diff) | |
| download | frameworks_base-893eacc5919442959d946c866bde2894172bd5af.zip frameworks_base-893eacc5919442959d946c866bde2894172bd5af.tar.gz frameworks_base-893eacc5919442959d946c866bde2894172bd5af.tar.bz2 | |
am 4186f85d: am 28e000ef: Merge "Remove debugging for b6829431." into jb-mr1-dev
* commit '4186f85ddecc9d95aa130eb10bedbd2ef457c5b0':
Remove debugging for b6829431.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/FragmentManager.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 1bf7785..c9e092c 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -22,8 +22,6 @@ import android.animation.AnimatorListenerAdapter; import android.content.res.Configuration; import android.content.res.TypedArray; import android.os.Bundle; -// TODO(cmautner): remove after fixing 6829431. -import android.os.Debug; import android.os.Handler; import android.os.Looper; import android.os.Parcel; @@ -385,8 +383,7 @@ final class FragmentManagerState implements Parcelable { * Container for fragments associated with an activity. */ final class FragmentManagerImpl extends FragmentManager { - // TODO(cmautner): restore to false after fixing 6829431. - static boolean DEBUG = true; + static boolean DEBUG = false; static final String TAG = "FragmentManager"; 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, boolean keepActive) { - // TODO(cmautner): remove after fixing 6829431. - if (DEBUG) Log.v(TAG, "moveToState: " + f - + " oldState=" + f.mState + " newState=" + newState - + " mRemoving=" + f.mRemoving + " Callers=" + Debug.getCallers(5)); + //if (DEBUG) Log.v(TAG, "moveToState: " + f + // + " oldState=" + f.mState + " newState=" + newState + // + " mRemoving=" + f.mRemoving + " Callers=" + Debug.getCallers(5)); + // Fragments that are not currently added will sit in the onCreate() state. if (!f.mAdded && newState > Fragment.CREATED) { newState = Fragment.CREATED; |