am 48e6725c: Merge change Iaca22686 into eclair

Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-mr2

* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
  Work on issue #2163789: Way too much logging

core/java/android/content/SyncStorageEngine.java

@@ -1028,7 +1028,7 @@ public class SyncStorageEngine extends Handler {
                     ident++;
                 }
             }
-            Log.d(TAG, "created a new AuthorityInfo for " + accountName
+            if (DEBUG) Log.v(TAG, "created a new AuthorityInfo for " + accountName
                     + ", provider " + authorityName);
             authority = new AuthorityInfo(accountName, authorityName, ident);
             account.authorities.put(authorityName, authority);

core/java/android/content/pm/PackageParser.java

@@ -973,8 +973,9 @@ public class PackageParser {
                 return null;
 
             } else {
-                Log.w(TAG, "Bad element under <manifest>: "
-                      + parser.getName());
+                Log.w(TAG, "Unknown element under <manifest>: " + parser.getName()
+                        + " at " + mArchiveSourcePath + " "
+                        + parser.getPositionDescription());
                 XmlUtils.skipCurrentTag(parser);
                 continue;
             }
@@ -1729,8 +1730,9 @@ public class PackageParser {
                     return null;
                 }
                 if (intent.countActions() == 0) {
-                    Log.w(TAG, "Intent filter for activity " + intent
-                            + " defines no actions");
+                    Log.w(TAG, "No actions in intent filter at "
+                            + mArchiveSourcePath + " "
+                            + parser.getPositionDescription());
                 } else {
                     a.intents.add(intent);
                 }
@@ -1877,8 +1879,9 @@ public class PackageParser {
                     return null;
                 }
                 if (intent.countActions() == 0) {
-                    Log.w(TAG, "Intent filter for activity alias " + intent
-                            + " defines no actions");
+                    Log.w(TAG, "No actions in intent filter at "
+                            + mArchiveSourcePath + " "
+                            + parser.getPositionDescription());
                 } else {
                     a.intents.add(intent);
                 }

core/java/android/net/MobileDataStateTracker.java

@@ -42,7 +42,7 @@ import android.text.TextUtils;
 public class MobileDataStateTracker extends NetworkStateTracker {
 
     private static final String TAG = "MobileDataStateTracker";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
 
     private Phone.DataState mMobileDataState;
     private ITelephony mPhoneService;

core/java/com/android/internal/backup/LocalTransport.java

@@ -41,7 +41,6 @@ public class LocalTransport extends IBackupTransport.Stub {
 
 
     public LocalTransport(Context context) {
-        if (DEBUG) Log.v(TAG, "Transport constructed");
         mContext = context;
         mPackageManager = context.getPackageManager();
     }