commit 3a56ce3ab30a72c359bf64cf75bdce6ab03f2b7a
author Dianne Hackborn <hackbod@google.com> Fri Jan 21 16:45:27 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 21 16:45:27 2011 -0800
tree cb7ef47c34d4ddf047be8be7f51adecd7f56bc3c
parent 84fbff1299880c56c8f12a09b1a432ffa9aabfd9
parent ec541e1787b39605200584042fa1e144923eeb4f

Merge "Fix some error messages, turn off logging." into honeycomb

core/java/android/app/FragmentManager.java

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 @@
  * 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 @@
                         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 @@
                         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;

core/java/android/app/LoaderManager.java

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 @@
 
 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