summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/ContentResolver.java5
-rw-r--r--core/java/android/content/ContentService.java5
-rw-r--r--core/java/android/content/IntentFilter.java9
-rw-r--r--core/java/android/content/pm/PackageParser.java7
-rw-r--r--core/java/android/content/res/AssetManager.java3
-rw-r--r--core/java/android/content/res/StringBlock.java3
6 files changed, 13 insertions, 19 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 2d03e7c..364821e 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -35,7 +35,6 @@ import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.text.TextUtils;
-import android.util.Config;
import android.util.EventLog;
import android.util.Log;
@@ -1627,9 +1626,9 @@ public abstract class ContentResolver {
return sContentService;
}
IBinder b = ServiceManager.getService(CONTENT_SERVICE_NAME);
- if (Config.LOGV) Log.v("ContentService", "default service binder = " + b);
+ if (false) Log.v("ContentService", "default service binder = " + b);
sContentService = IContentService.Stub.asInterface(b);
- if (Config.LOGV) Log.v("ContentService", "default service = " + sContentService);
+ if (false) Log.v("ContentService", "default service = " + sContentService);
return sContentService;
}
diff --git a/core/java/android/content/ContentService.java b/core/java/android/content/ContentService.java
index afe8483..a2af558 100644
--- a/core/java/android/content/ContentService.java
+++ b/core/java/android/content/ContentService.java
@@ -25,7 +25,6 @@ import android.os.IBinder;
import android.os.Parcel;
import android.os.RemoteException;
import android.os.ServiceManager;
-import android.util.Config;
import android.util.Log;
import android.Manifest;
@@ -104,7 +103,7 @@ public final class ContentService extends IContentService.Stub {
}
synchronized (mRootNode) {
mRootNode.addObserverLocked(uri, observer, notifyForDescendents, mRootNode);
- if (Config.LOGV) Log.v(TAG, "Registered observer " + observer + " at " + uri +
+ if (false) Log.v(TAG, "Registered observer " + observer + " at " + uri +
" with notifyForDescendents " + notifyForDescendents);
}
}
@@ -115,7 +114,7 @@ public final class ContentService extends IContentService.Stub {
}
synchronized (mRootNode) {
mRootNode.removeObserverLocked(observer);
- if (Config.LOGV) Log.v(TAG, "Unregistered observer " + observer);
+ if (false) Log.v(TAG, "Unregistered observer " + observer);
}
}
diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java
index 06c1ecb..2a0ebcf 100644
--- a/core/java/android/content/IntentFilter.java
+++ b/core/java/android/content/IntentFilter.java
@@ -31,7 +31,6 @@ import android.os.Parcel;
import android.os.Parcelable;
import android.os.PatternMatcher;
import android.util.AndroidException;
-import android.util.Config;
import android.util.Log;
import android.util.Printer;
@@ -670,7 +669,7 @@ public class IntentFilter implements Parcelable {
if (host == null) {
return NO_MATCH_DATA;
}
- if (Config.LOGV) Log.v("IntentFilter",
+ if (false) Log.v("IntentFilter",
"Match host " + host + ": " + mHost);
if (mWild) {
if (host.length() < mHost.length()) {
@@ -1095,14 +1094,14 @@ public class IntentFilter implements Parcelable {
public final int match(String action, String type, String scheme,
Uri data, Set<String> categories, String logTag) {
if (action != null && !matchAction(action)) {
- if (Config.LOGV) Log.v(
+ if (false) Log.v(
logTag, "No matching action " + action + " for " + this);
return NO_MATCH_ACTION;
}
int dataMatch = matchData(type, scheme, data);
if (dataMatch < 0) {
- if (Config.LOGV) {
+ if (false) {
if (dataMatch == NO_MATCH_TYPE) {
Log.v(logTag, "No matching type " + type
+ " for " + this);
@@ -1117,7 +1116,7 @@ public class IntentFilter implements Parcelable {
String categoryMismatch = matchCategories(categories);
if (categoryMismatch != null) {
- if (Config.LOGV) {
+ if (false) {
Log.v(logTag, "No matching category " + categoryMismatch + " for " + this);
}
return NO_MATCH_CATEGORY;
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 8dfdaa8..67cd4a2 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -28,7 +28,6 @@ import android.os.Build;
import android.os.Bundle;
import android.os.PatternMatcher;
import android.util.AttributeSet;
-import android.util.Config;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.TypedValue;
@@ -384,7 +383,7 @@ public class PackageParser {
return null;
}
- if ((flags&PARSE_CHATTY) != 0 && Config.LOGD) Log.d(
+ if ((flags&PARSE_CHATTY) != 0 && false) Log.d(
TAG, "Scanning package: " + mArchiveSourcePath);
XmlResourceParser parser = null;
@@ -666,7 +665,7 @@ public class PackageParser {
outError[0] = "No start tag found";
return null;
}
- if ((flags&PARSE_CHATTY) != 0 && Config.LOGV) Log.v(
+ if ((flags&PARSE_CHATTY) != 0 && false) Log.v(
TAG, "Root element name: '" + parser.getName() + "'");
if (!parser.getName().equals("manifest")) {
outError[0] = "No <manifest> tag";
@@ -701,7 +700,7 @@ public class PackageParser {
outError[0] = "No start tag found";
return null;
}
- if ((flags&PARSE_CHATTY) != 0 && Config.LOGV) Log.v(
+ if ((flags&PARSE_CHATTY) != 0 && false) Log.v(
TAG, "Root element name: '" + parser.getName() + "'");
if (!parser.getName().equals("manifest")) {
outError[0] = "No <manifest> tag";
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index afa68c3..c8c5733 100644
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -17,7 +17,6 @@
package android.content.res;
import android.os.ParcelFileDescriptor;
-import android.util.Config;
import android.util.Log;
import android.util.TypedValue;
@@ -58,7 +57,7 @@ public final class AssetManager {
public static final int ACCESS_BUFFER = 3;
private static final String TAG = "AssetManager";
- private static final boolean localLOGV = Config.LOGV || false;
+ private static final boolean localLOGV = false || false;
private static final boolean DEBUG_REFS = false;
diff --git a/core/java/android/content/res/StringBlock.java b/core/java/android/content/res/StringBlock.java
index 23a6f97..63e33ce 100644
--- a/core/java/android/content/res/StringBlock.java
+++ b/core/java/android/content/res/StringBlock.java
@@ -18,7 +18,6 @@ package android.content.res;
import android.text.*;
import android.text.style.*;
-import android.util.Config;
import android.util.Log;
import android.util.SparseArray;
import android.graphics.Paint;
@@ -34,7 +33,7 @@ import com.android.internal.util.XmlUtils;
*/
final class StringBlock {
private static final String TAG = "AssetManager";
- private static final boolean localLOGV = Config.LOGV || false;
+ private static final boolean localLOGV = false || false;
private final int mNative;
private final boolean mUseSparse;