diff options
| author | 2011-01-21 16:45:27 -0800 | |
|---|---|---|
| committer | 2011-01-21 16:45:27 -0800 | |
| commit | 3a56ce3ab30a72c359bf64cf75bdce6ab03f2b7a (patch) | |
| tree | cb7ef47c34d4ddf047be8be7f51adecd7f56bc3c | |
| parent | 84fbff1299880c56c8f12a09b1a432ffa9aabfd9 (diff) | |
| parent | ec541e1787b39605200584042fa1e144923eeb4f (diff) | |
Merge "Fix some error messages, turn off logging." into honeycomb
| -rw-r--r-- | core/java/android/app/FragmentManager.java | 6 | ||||
| -rw-r--r-- | core/java/android/app/LoaderManager.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index bce240fc2ef0..e729805502b4 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -332,7 +332,7 @@ final class FragmentManagerState implements Parcelable { * Container for fragments associated with an activity. */ final class FragmentManagerImpl extends FragmentManager { - 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"; @@ -747,7 +747,7 @@ final class FragmentManagerImpl extends FragmentManager { f.onActivityCreated(f.mSavedFragmentState); if (!f.mCalled) { throw new SuperNotCalledException("Fragment " + f - + " did not call through to super.onReady()"); + + " did not call through to super.onActivityCreated()"); } f.mSavedFragmentState = null; } @@ -810,7 +810,7 @@ final class FragmentManagerImpl extends FragmentManager { f.onDestroyView(); if (!f.mCalled) { throw new SuperNotCalledException("Fragment " + f - + " did not call through to super.onDestroyedView()"); + + " did not call through to super.onDestroyView()"); } if (f.mView != null && f.mContainer != null) { Animator anim = null; diff --git a/core/java/android/app/LoaderManager.java b/core/java/android/app/LoaderManager.java index fc5f5fc697f3..431be05e4120 100644 --- a/core/java/android/app/LoaderManager.java +++ b/core/java/android/app/LoaderManager.java @@ -186,7 +186,7 @@ public abstract class LoaderManager { class LoaderManagerImpl extends LoaderManager { static final String TAG = "LoaderManager"; - static boolean DEBUG = true; + static boolean DEBUG = false; // These are the currently active loaders. A loader is here // from the time its load is started until it has been explicitly |