diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-21 16:49:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-21 16:49:22 -0800 |
| commit | d9e1b566899dedd6b45f10989163304a45a93fe8 (patch) | |
| tree | 9b3c453d5272fdafc7c48dc3b1611bb9c67faee8 /core | |
| parent | 7198367f7b7e37fa36e6d49515ed9f494add7878 (diff) | |
| parent | 3da75ab90c4e6309ec6d6801bf0208cff6249b2d (diff) | |
| download | frameworks_base-d9e1b566899dedd6b45f10989163304a45a93fe8.zip frameworks_base-d9e1b566899dedd6b45f10989163304a45a93fe8.tar.gz frameworks_base-d9e1b566899dedd6b45f10989163304a45a93fe8.tar.bz2 | |
am 3da75ab9: am 3a56ce3a: Merge "Fix some error messages, turn off logging." into honeycomb
* commit '3da75ab90c4e6309ec6d6801bf0208cff6249b2d':
Fix some error messages, turn off logging.
Diffstat (limited to 'core')
| -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 bce240f..e729805 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 fc5f5fc..431be05 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 |