Remove the deprecated things from Config.java. These haven't been working since before 1.0.
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
diff --git a/core/config/README.txt b/core/config/README.txt
deleted file mode 100644
index 5f48fb3..0000000
--- a/core/config/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-One of the subdirectories {debug, ndebug} is included in framework.jar
-by ../../Android.mk depending on the value of $(TARGET_BUILD_TYPE).
-
-The sdk/ directory contains the files that are passed to the doc/API
-tools regardless of $(TARGET_BUILD_TYPE).
diff --git a/core/config/debug/android/util/ConfigBuildFlags.java b/core/config/debug/android/util/ConfigBuildFlags.java
deleted file mode 100644
index eb00163..0000000
--- a/core/config/debug/android/util/ConfigBuildFlags.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.util;
-
-/**
- * Static flags set by the build process.
- */
-/* package */ final class ConfigBuildFlags {
- /* package */ static final boolean DEBUG = true;
-}
diff --git a/core/config/ndebug/android/util/ConfigBuildFlags.java b/core/config/ndebug/android/util/ConfigBuildFlags.java
deleted file mode 100644
index 2345a40..0000000
--- a/core/config/ndebug/android/util/ConfigBuildFlags.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.util;
-
-/**
- * Static flags set by the build process.
- */
-/* package */ final class ConfigBuildFlags {
- /* package */ static final boolean DEBUG = false;
-}
diff --git a/core/config/sdk/android/util/ConfigBuildFlags.java b/core/config/sdk/android/util/ConfigBuildFlags.java
deleted file mode 100644
index f903ee4..0000000
--- a/core/config/sdk/android/util/ConfigBuildFlags.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.util;
-
-/**
- * Static flags set by the build process.
- */
-/* package */ final class ConfigBuildFlags {
- /* This field is intentionally declared as non-final. This file
- * is passed to the SDK docs/API tools, and is used to force them
- * to avoid treating DEBUG as a constant value. This is necessary
- * to avoid breaking the API check when switching to and from
- * a debug build.
- */
- /* package */ static boolean DEBUG = false;
-}
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index edfd6ef..ed39457 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -51,7 +51,6 @@
import android.text.TextUtils;
import android.text.method.TextKeyListener;
import android.util.AttributeSet;
-import android.util.Config;
import android.util.EventLog;
import android.util.Log;
import android.util.SparseArray;
@@ -3597,7 +3596,7 @@
resultCode = mResultCode;
resultData = mResultData;
}
- if (Config.LOGV) Log.v(TAG, "Finishing self: token=" + mToken);
+ if (false) Log.v(TAG, "Finishing self: token=" + mToken);
try {
if (ActivityManagerNative.getDefault()
.finishActivity(mToken, resultCode, resultData)) {
@@ -4533,7 +4532,7 @@
void dispatchActivityResult(String who, int requestCode,
int resultCode, Intent data) {
- if (Config.LOGV) Log.v(
+ if (false) Log.v(
TAG, "Dispatching result: who=" + who + ", reqCode=" + requestCode
+ ", resCode=" + resultCode + ", data=" + data);
mFragments.noteStateNotSaved();
diff --git a/core/java/android/app/ActivityGroup.java b/core/java/android/app/ActivityGroup.java
index f1216f9..5b04253 100644
--- a/core/java/android/app/ActivityGroup.java
+++ b/core/java/android/app/ActivityGroup.java
@@ -110,7 +110,7 @@
if (who != null) {
Activity act = mLocalActivityManager.getActivity(who);
/*
- if (Config.LOGV) Log.v(
+ if (false) Log.v(
TAG, "Dispatching result: who=" + who + ", reqCode=" + requestCode
+ ", resCode=" + resultCode + ", data=" + data
+ ", rec=" + rec);
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index b6581e9..45d49b1 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -47,8 +47,7 @@
*/
public class ActivityManager {
private static String TAG = "ActivityManager";
- private static boolean DEBUG = false;
- private static boolean localLOGV = DEBUG || android.util.Config.LOGV;
+ private static boolean localLOGV = false;
private final Context mContext;
private final Handler mHandler;
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index 6426635..a37b67f4d 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -39,7 +39,6 @@
import android.os.ServiceManager;
import android.os.StrictMode;
import android.text.TextUtils;
-import android.util.Config;
import android.util.Log;
import android.util.Singleton;
@@ -1410,11 +1409,11 @@
private static final Singleton<IActivityManager> gDefault = new Singleton<IActivityManager>() {
protected IActivityManager create() {
IBinder b = ServiceManager.getService("activity");
- if (Config.LOGV) {
+ if (false) {
Log.v("ActivityManager", "default service binder = " + b);
}
IActivityManager am = asInterface(b);
- if (Config.LOGV) {
+ if (false) {
Log.v("ActivityManager", "default service = " + am);
}
return am;
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 5e4e36e..57a79a9 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -60,7 +60,6 @@
import android.os.StrictMode;
import android.os.SystemClock;
import android.util.AndroidRuntimeException;
-import android.util.Config;
import android.util.DisplayMetrics;
import android.util.EventLog;
import android.util.Log;
@@ -125,7 +124,7 @@
public static final String TAG = "ActivityThread";
private static final android.graphics.Bitmap.Config THUMBNAIL_FORMAT = Bitmap.Config.RGB_565;
private static final boolean DEBUG = false;
- static final boolean localLOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ static final boolean localLOGV = false;
static final boolean DEBUG_MESSAGES = false;
/** @hide */
public static final boolean DEBUG_BROADCAST = false;
@@ -2660,7 +2659,7 @@
r.stopped = false;
}
if (r.activity.mDecor != null) {
- if (Config.LOGV) Slog.v(
+ if (false) Slog.v(
TAG, "Handle window " + r + " visibility: " + show);
updateVisibility(r, show);
}
@@ -3868,7 +3867,7 @@
info.applicationInfo.sourceDir);
return null;
}
- if (Config.LOGV) Slog.v(
+ if (false) Slog.v(
TAG, "Instantiating local provider " + info.name);
// XXX Need to create the correct context for this provider.
localProvider.attachInfo(c, info);
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index cd278be..7b02763 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -33,7 +33,6 @@
import android.os.SystemClock;
import android.os.ServiceManager;
import android.util.AndroidRuntimeException;
-import android.util.Config;
import android.util.Log;
import android.view.IWindowManager;
import android.view.KeyCharacterMap;
diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index 6541c54..4913e78 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -61,8 +61,7 @@
public class NotificationManager
{
private static String TAG = "NotificationManager";
- private static boolean DEBUG = false;
- private static boolean localLOGV = DEBUG || android.util.Config.LOGV;
+ private static boolean localLOGV = false;
private static INotificationManager sService;
diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java
index 29f8caf..473aec60 100644
--- a/core/java/android/app/admin/DeviceAdminReceiver.java
+++ b/core/java/android/app/admin/DeviceAdminReceiver.java
@@ -52,8 +52,7 @@
*/
public class DeviceAdminReceiver extends BroadcastReceiver {
private static String TAG = "DevicePolicy";
- private static boolean DEBUG = false;
- private static boolean localLOGV = DEBUG || android.util.Config.LOGV;
+ private static boolean localLOGV = false;
/**
* This is the primary action that a device administrator must implement to be
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.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 @@
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.Parcel;
import android.os.RemoteException;
import android.os.ServiceManager;
-import android.util.Config;
import android.util.Log;
import android.Manifest;
@@ -104,7 +103,7 @@
}
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 @@
}
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.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 @@
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 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 @@
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.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 @@
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 @@
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 @@
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 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 @@
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 @@
*/
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;
diff --git a/core/java/android/database/AbstractCursor.java b/core/java/android/database/AbstractCursor.java
index 3ffc714..b6487bd 100644
--- a/core/java/android/database/AbstractCursor.java
+++ b/core/java/android/database/AbstractCursor.java
@@ -19,7 +19,6 @@
import android.content.ContentResolver;
import android.net.Uri;
import android.os.Bundle;
-import android.util.Config;
import android.util.Log;
import java.lang.ref.WeakReference;
@@ -285,7 +284,7 @@
}
}
- if (Config.LOGV) {
+ if (false) {
if (getCount() > 0) {
Log.w("AbstractCursor", "Unknown column " + columnName);
}
diff --git a/core/java/android/database/CursorToBulkCursorAdaptor.java b/core/java/android/database/CursorToBulkCursorAdaptor.java
index 8bc7de2..8fa4d3b 100644
--- a/core/java/android/database/CursorToBulkCursorAdaptor.java
+++ b/core/java/android/database/CursorToBulkCursorAdaptor.java
@@ -19,7 +19,6 @@
import android.os.Bundle;
import android.os.IBinder;
import android.os.RemoteException;
-import android.util.Config;
import android.util.Log;
@@ -77,7 +76,7 @@
if (mCursor instanceof AbstractWindowedCursor) {
AbstractWindowedCursor windowedCursor = (AbstractWindowedCursor) cursor;
if (windowedCursor.hasWindow()) {
- if (Log.isLoggable(TAG, Log.VERBOSE) || Config.LOGV) {
+ if (Log.isLoggable(TAG, Log.VERBOSE) || false) {
Log.v(TAG, "Cross process cursor has a local window before setWindow in "
+ providerName, new RuntimeException());
}
diff --git a/core/java/android/database/DatabaseUtils.java b/core/java/android/database/DatabaseUtils.java
index f428aad..8e6f699 100644
--- a/core/java/android/database/DatabaseUtils.java
+++ b/core/java/android/database/DatabaseUtils.java
@@ -33,7 +33,6 @@
import android.os.Parcel;
import android.os.ParcelFileDescriptor;
import android.text.TextUtils;
-import android.util.Config;
import android.util.Log;
import java.io.FileNotFoundException;
@@ -49,7 +48,7 @@
private static final String TAG = "DatabaseUtils";
private static final boolean DEBUG = false;
- private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ private static final boolean LOCAL_LOGV = false;
private static final String[] countProjection = new String[]{"count(*)"};
diff --git a/core/java/android/database/sqlite/SQLiteCursor.java b/core/java/android/database/sqlite/SQLiteCursor.java
index 83f3891..ea9346d 100644
--- a/core/java/android/database/sqlite/SQLiteCursor.java
+++ b/core/java/android/database/sqlite/SQLiteCursor.java
@@ -23,7 +23,6 @@
import android.os.Message;
import android.os.Process;
import android.os.StrictMode;
-import android.util.Config;
import android.util.Log;
import java.util.HashMap;
@@ -251,7 +250,7 @@
for (int i = 0; i < columnCount; i++) {
String columnName = mQuery.columnNameLocked(i);
mColumns[i] = columnName;
- if (Config.LOGV) {
+ if (false) {
Log.v("DatabaseWindow", "mColumns[" + i + "] is "
+ mColumns[i]);
}
@@ -366,13 +365,13 @@
}
private void deactivateCommon() {
- if (Config.LOGV) Log.v(TAG, "<<< Releasing cursor " + this);
+ if (false) Log.v(TAG, "<<< Releasing cursor " + this);
mCursorState = 0;
if (mWindow != null) {
mWindow.close();
mWindow = null;
}
- if (Config.LOGV) Log.v("DatabaseWindow", "closing window in release()");
+ if (false) Log.v("DatabaseWindow", "closing window in release()");
}
@Override
@@ -398,7 +397,7 @@
return false;
}
long timeStart = 0;
- if (Config.LOGV) {
+ if (false) {
timeStart = System.currentTimeMillis();
}
@@ -453,7 +452,7 @@
}
}
- if (Config.LOGV) {
+ if (false) {
Log.v("DatabaseWindow", "closing window in requery()");
Log.v(TAG, "--- Requery()ed cursor " + this + ": " + mQuery);
}
@@ -465,7 +464,7 @@
// for backwards compatibility, just return false
Log.w(TAG, "requery() failed " + e.getMessage(), e);
}
- if (Config.LOGV) {
+ if (false) {
long timeEnd = System.currentTimeMillis();
Log.v(TAG, "requery (" + (timeEnd - timeStart) + " ms): " + mDriver.toString());
}
@@ -513,7 +512,7 @@
close();
SQLiteDebug.notifyActiveCursorFinalized();
} else {
- if (Config.LOGV) {
+ if (false) {
Log.v(TAG, "Finalizing cursor on database = " + mQuery.mDatabase.getPath() +
", table = " + mEditTable + ", query = " + mQuery.mSql);
}
diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index 2f2b4eb..93a6ad3 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -30,7 +30,6 @@
import android.os.SystemClock;
import android.os.SystemProperties;
import android.text.TextUtils;
-import android.util.Config;
import android.util.EventLog;
import android.util.Log;
import android.util.LruCache;
@@ -735,7 +734,7 @@
throw savedException;
}
} catch (SQLException e) {
- if (Config.LOGD) {
+ if (false) {
Log.d(TAG, "exception during rollback, maybe the DB previously "
+ "performed an auto-rollback");
}
@@ -744,7 +743,7 @@
} finally {
mTransactionListener = null;
unlockForced();
- if (Config.LOGV) {
+ if (false) {
Log.v(TAG, "unlocked " + Thread.currentThread()
+ ", holdCount is " + mLock.getHoldCount());
}
@@ -1557,7 +1556,7 @@
BlockGuard.getThreadPolicy().onReadFromDisk();
long timeStart = 0;
- if (Config.LOGV || mSlowQueryThreshold != -1) {
+ if (false || mSlowQueryThreshold != -1) {
timeStart = System.currentTimeMillis();
}
@@ -1570,7 +1569,7 @@
cursorFactory != null ? cursorFactory : mFactory,
selectionArgs);
} finally {
- if (Config.LOGV || mSlowQueryThreshold != -1) {
+ if (false || mSlowQueryThreshold != -1) {
// Force query execution
int count = -1;
@@ -1580,7 +1579,7 @@
long duration = System.currentTimeMillis() - timeStart;
- if (Config.LOGV || duration >= mSlowQueryThreshold) {
+ if (false || duration >= mSlowQueryThreshold) {
Log.v(SQLiteCursor.TAG,
"query (" + duration + " ms): " + driver.toString() + ", args are "
+ (selectionArgs != null
diff --git a/core/java/android/ddm/DdmHandleAppName.java b/core/java/android/ddm/DdmHandleAppName.java
index 4a57d12..78dd23e 100644
--- a/core/java/android/ddm/DdmHandleAppName.java
+++ b/core/java/android/ddm/DdmHandleAppName.java
@@ -19,7 +19,6 @@
import org.apache.harmony.dalvik.ddmc.Chunk;
import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer;
-import android.util.Config;
import android.util.Log;
import java.nio.ByteBuffer;
@@ -88,7 +87,7 @@
* Send an APNM (APplication NaMe) chunk.
*/
private static void sendAPNM(String appName) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm", "Sending app name");
ByteBuffer out = ByteBuffer.allocate(4 + appName.length()*2);
diff --git a/core/java/android/ddm/DdmHandleExit.java b/core/java/android/ddm/DdmHandleExit.java
index 8a0b9a4..74ae37a 100644
--- a/core/java/android/ddm/DdmHandleExit.java
+++ b/core/java/android/ddm/DdmHandleExit.java
@@ -19,7 +19,6 @@
import org.apache.harmony.dalvik.ddmc.Chunk;
import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer;
-import android.util.Config;
import android.util.Log;
import java.nio.ByteBuffer;
@@ -59,7 +58,7 @@
* Handle a chunk of data. We're only registered for "EXIT".
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-exit", "Handling " + name(request.type) + " chunk");
/*
diff --git a/core/java/android/ddm/DdmHandleHeap.java b/core/java/android/ddm/DdmHandleHeap.java
index fa0fbbf..cece556 100644
--- a/core/java/android/ddm/DdmHandleHeap.java
+++ b/core/java/android/ddm/DdmHandleHeap.java
@@ -21,7 +21,6 @@
import org.apache.harmony.dalvik.ddmc.DdmServer;
import org.apache.harmony.dalvik.ddmc.DdmVmInternal;
import android.os.Debug;
-import android.util.Config;
import android.util.Log;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -78,7 +77,7 @@
* Handle a chunk of data.
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Handling " + name(request.type) + " chunk");
int type = request.type;
@@ -113,7 +112,7 @@
ByteBuffer in = wrapChunk(request);
int when = in.get();
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Heap segment enable: when=" + when);
boolean ok = DdmVmInternal.heapInfoNotify(when);
@@ -132,7 +131,7 @@
int when = in.get();
int what = in.get();
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Heap segment enable: when=" + when
+ ", what=" + what + ", isNative=" + isNative);
@@ -160,7 +159,7 @@
/* get the filename for the output file */
int len = in.getInt();
String fileName = getString(in, len);
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Heap dump: file='" + fileName + "'");
try {
@@ -192,7 +191,7 @@
byte result;
/* get the filename for the output file */
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Heap dump: [DDMS]");
String failMsg = null;
@@ -218,7 +217,7 @@
private Chunk handleHPGC(Chunk request) {
//ByteBuffer in = wrapChunk(request);
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Heap GC request");
System.gc();
@@ -234,7 +233,7 @@
enable = (in.get() != 0);
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Recent allocation enable request: " + enable);
DdmVmInternal.enableRecentAllocations(enable);
@@ -259,7 +258,7 @@
private Chunk handleREAL(Chunk request) {
//ByteBuffer in = wrapChunk(request);
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Recent allocations request");
/* generate the reply in a ready-to-go format */
diff --git a/core/java/android/ddm/DdmHandleHello.java b/core/java/android/ddm/DdmHandleHello.java
index 714a611..5088d22 100644
--- a/core/java/android/ddm/DdmHandleHello.java
+++ b/core/java/android/ddm/DdmHandleHello.java
@@ -19,7 +19,6 @@
import org.apache.harmony.dalvik.ddmc.Chunk;
import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer;
-import android.util.Config;
import android.util.Log;
import android.os.Debug;
@@ -53,7 +52,7 @@
* send messages to the server.
*/
public void connected() {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-hello", "Connected!");
if (false) {
@@ -70,7 +69,7 @@
* periodic transmissions or clean up saved state.
*/
public void disconnected() {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-hello", "Disconnected!");
}
@@ -78,7 +77,7 @@
* Handle a chunk of data.
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Handling " + name(request.type) + " chunk");
int type = request.type;
@@ -105,7 +104,7 @@
ByteBuffer in = wrapChunk(request);
int serverProtoVers = in.getInt();
- if (Config.LOGV)
+ if (false)
Log.v("ddm-hello", "Server version is " + serverProtoVers);
/*
@@ -150,7 +149,7 @@
// is actually compiled in
final String[] features = Debug.getVmFeatureList();
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Got feature list request");
int size = 4 + 4 * features.length;
diff --git a/core/java/android/ddm/DdmHandleProfiling.java b/core/java/android/ddm/DdmHandleProfiling.java
index 63ee445..e0db5e7 100644
--- a/core/java/android/ddm/DdmHandleProfiling.java
+++ b/core/java/android/ddm/DdmHandleProfiling.java
@@ -20,7 +20,6 @@
import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer;
import android.os.Debug;
-import android.util.Config;
import android.util.Log;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -69,7 +68,7 @@
* Handle a chunk of data.
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Handling " + name(request.type) + " chunk");
int type = request.type;
@@ -99,7 +98,7 @@
int flags = in.getInt();
int len = in.getInt();
String fileName = getString(in, len);
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Method profiling start: filename='" + fileName
+ "', size=" + bufferSize + ", flags=" + flags);
@@ -139,7 +138,7 @@
int bufferSize = in.getInt();
int flags = in.getInt();
- if (Config.LOGV) {
+ if (false) {
Log.v("ddm-heap", "Method prof stream start: size=" + bufferSize
+ ", flags=" + flags);
}
@@ -158,7 +157,7 @@
private Chunk handleMPSE(Chunk request) {
byte result;
- if (Config.LOGV) {
+ if (false) {
Log.v("ddm-heap", "Method prof stream end");
}
diff --git a/core/java/android/ddm/DdmHandleThread.java b/core/java/android/ddm/DdmHandleThread.java
index c307988..613ab75 100644
--- a/core/java/android/ddm/DdmHandleThread.java
+++ b/core/java/android/ddm/DdmHandleThread.java
@@ -20,7 +20,6 @@
import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer;
import org.apache.harmony.dalvik.ddmc.DdmVmInternal;
-import android.util.Config;
import android.util.Log;
import java.nio.ByteBuffer;
@@ -66,7 +65,7 @@
* Handle a chunk of data.
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-thread", "Handling " + name(request.type) + " chunk");
int type = request.type;
diff --git a/core/java/android/ddm/DdmRegister.java b/core/java/android/ddm/DdmRegister.java
index debf189..ecd450d 100644
--- a/core/java/android/ddm/DdmRegister.java
+++ b/core/java/android/ddm/DdmRegister.java
@@ -17,7 +17,6 @@
package android.ddm;
import org.apache.harmony.dalvik.ddmc.DdmServer;
-import android.util.Config;
import android.util.Log;
/**
@@ -44,7 +43,7 @@
* we finish here.
*/
public static void registerHandlers() {
- if (Config.LOGV)
+ if (false)
Log.v("ddm", "Registering DDM message handlers");
DdmHandleHello.register();
DdmHandleThread.register();
diff --git a/core/java/android/net/SntpClient.java b/core/java/android/net/SntpClient.java
index 3e21e2d..316440f 100644
--- a/core/java/android/net/SntpClient.java
+++ b/core/java/android/net/SntpClient.java
@@ -17,7 +17,6 @@
package android.net;
import android.os.SystemClock;
-import android.util.Config;
import android.util.Log;
import java.io.IOException;
@@ -112,8 +111,8 @@
// = (transit + skew - transit + skew)/2
// = (2 * skew)/2 = skew
long clockOffset = ((receiveTime - originateTime) + (transmitTime - responseTime))/2;
- // if (Config.LOGD) Log.d(TAG, "round trip: " + roundTripTime + " ms");
- // if (Config.LOGD) Log.d(TAG, "clock offset: " + clockOffset + " ms");
+ // if (false) Log.d(TAG, "round trip: " + roundTripTime + " ms");
+ // if (false) Log.d(TAG, "clock offset: " + clockOffset + " ms");
// save our results - use the times on this side of the network latency
// (response rather than request time)
@@ -121,7 +120,7 @@
mNtpTimeReference = responseTicks;
mRoundTripTime = roundTripTime;
} catch (Exception e) {
- if (Config.LOGD) Log.d(TAG, "request time failed: " + e);
+ if (false) Log.d(TAG, "request time failed: " + e);
return false;
} finally {
if (socket != null) {
diff --git a/core/java/android/net/http/Headers.java b/core/java/android/net/http/Headers.java
index 74c0de8..657e071 100644
--- a/core/java/android/net/http/Headers.java
+++ b/core/java/android/net/http/Headers.java
@@ -16,7 +16,6 @@
package android.net.http;
-import android.util.Config;
import android.util.Log;
import java.util.ArrayList;
@@ -201,7 +200,7 @@
try {
contentLength = Long.parseLong(val);
} catch (NumberFormatException e) {
- if (Config.LOGV) {
+ if (false) {
Log.v(LOGTAG, "Headers.headers(): error parsing"
+ " content length: " + buffer.toString());
}
@@ -449,7 +448,7 @@
}
int extraLen = mExtraHeaderNames.size();
for (int i = 0; i < extraLen; i++) {
- if (Config.LOGV) {
+ if (false) {
HttpLog.v("Headers.getHeaders() extra: " + i + " " +
mExtraHeaderNames.get(i) + " " + mExtraHeaderValues.get(i));
}
diff --git a/core/java/android/net/http/HttpLog.java b/core/java/android/net/http/HttpLog.java
index 30bf647..0934664 100644
--- a/core/java/android/net/http/HttpLog.java
+++ b/core/java/android/net/http/HttpLog.java
@@ -23,7 +23,6 @@
import android.os.SystemClock;
import android.util.Log;
-import android.util.Config;
/**
* {@hide}
@@ -32,7 +31,7 @@
private final static String LOGTAG = "http";
private static final boolean DEBUG = false;
- static final boolean LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ static final boolean LOGV = false;
static void v(String logMe) {
Log.v(LOGTAG, SystemClock.uptimeMillis() + " " + Thread.currentThread().getName() + " " + logMe);
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index ae1e1c2..c25ebb7 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -16,7 +16,6 @@
package android.os;
-import android.util.Config;
import android.util.Log;
import java.io.FileDescriptor;
@@ -291,7 +290,7 @@
*/
public final boolean transact(int code, Parcel data, Parcel reply,
int flags) throws RemoteException {
- if (Config.LOGV) Log.v("Binder", "Transact: " + code + " to " + this);
+ if (false) Log.v("Binder", "Transact: " + code + " to " + this);
if (data != null) {
data.setDataPosition(0);
}
@@ -413,7 +412,7 @@
private native final void destroy();
private static final void sendDeathNotice(DeathRecipient recipient) {
- if (Config.LOGV) Log.v("JavaBinder", "sendDeathNotice to " + recipient);
+ if (false) Log.v("JavaBinder", "sendDeathNotice to " + recipient);
try {
recipient.binderDied();
}
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index 87aeccb..ba69246 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -18,7 +18,6 @@
import com.android.internal.util.TypedProperties;
-import android.util.Config;
import android.util.Log;
import java.io.FileDescriptor;
@@ -1031,7 +1030,7 @@
* Load the debug properties from the standard files into debugProperties.
*/
static {
- if (Config.DEBUG) {
+ if (false) {
final String TAG = "DebugProperties";
final String[] files = { "/system/debug.prop", "/debug.prop", "/data/debug.prop" };
final TypedProperties tp = new TypedProperties();
@@ -1157,10 +1156,10 @@
/**
* Reflectively sets static fields of a class based on internal debugging
- * properties. This method is a no-op if android.util.Config.DEBUG is
+ * properties. This method is a no-op if false is
* false.
* <p>
- * <strong>NOTE TO APPLICATION DEVELOPERS</strong>: Config.DEBUG will
+ * <strong>NOTE TO APPLICATION DEVELOPERS</strong>: false will
* always be false in release builds. This API is typically only useful
* for platform developers.
* </p>
@@ -1211,7 +1210,7 @@
* the internal debugging property value.
*/
public static void setFieldsOn(Class<?> cl, boolean partial) {
- if (Config.DEBUG) {
+ if (false) {
if (debugProperties != null) {
/* Only look for fields declared directly by the class,
* so we don't mysteriously change static fields in superclasses.
diff --git a/core/java/android/os/Looper.java b/core/java/android/os/Looper.java
index ccf642c..3edd692 100644
--- a/core/java/android/os/Looper.java
+++ b/core/java/android/os/Looper.java
@@ -16,7 +16,6 @@
package android.os;
-import android.util.Config;
import android.util.Log;
import android.util.Printer;
import android.util.PrefixPrinter;
diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java
index bb07825..a658fc4 100644
--- a/core/java/android/os/MessageQueue.java
+++ b/core/java/android/os/MessageQueue.java
@@ -17,7 +17,6 @@
package android.os;
import android.util.AndroidRuntimeException;
-import android.util.Config;
import android.util.Log;
import java.util.ArrayList;
@@ -128,7 +127,7 @@
mBlocked = false;
mMessages = msg.next;
msg.next = null;
- if (Config.LOGV) Log.v("MessageQueue", "Returning message: " + msg);
+ if (false) Log.v("MessageQueue", "Returning message: " + msg);
msg.markInUse();
return msg;
} else {
diff --git a/core/java/android/pim/ICalendar.java b/core/java/android/pim/ICalendar.java
index 9c4eaf4..58c5c63 100644
--- a/core/java/android/pim/ICalendar.java
+++ b/core/java/android/pim/ICalendar.java
@@ -17,7 +17,6 @@
package android.pim;
import android.util.Log;
-import android.util.Config;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -447,7 +446,7 @@
component = current;
}
} catch (FormatException fe) {
- if (Config.LOGV) {
+ if (false) {
Log.v(TAG, "Cannot parse " + line, fe);
}
// for now, we ignore the parse error. Google Calendar seems
diff --git a/core/java/android/pim/RecurrenceSet.java b/core/java/android/pim/RecurrenceSet.java
index 282417d..fdd0783 100644
--- a/core/java/android/pim/RecurrenceSet.java
+++ b/core/java/android/pim/RecurrenceSet.java
@@ -21,7 +21,6 @@
import android.provider.Calendar;
import android.text.TextUtils;
import android.text.format.Time;
-import android.util.Config;
import android.util.Log;
import java.util.List;
@@ -197,7 +196,7 @@
(TextUtils.isEmpty(duration))||
((TextUtils.isEmpty(rrule))&&
(TextUtils.isEmpty(rdate)))) {
- if (Config.LOGD) {
+ if (false) {
Log.d(TAG, "Recurrence missing DTSTART, DTEND/DURATION, "
+ "or RRULE/RDATE: "
+ component.toString());
@@ -211,7 +210,7 @@
long millis = start.toMillis(false /* use isDst */);
values.put(Calendar.Events.DTSTART, millis);
if (millis == -1) {
- if (Config.LOGD) {
+ if (false) {
Log.d(TAG, "DTSTART is out of range: " + component.toString());
}
return false;
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 8a19456..ccab8e5 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -41,7 +41,6 @@
import android.os.SystemProperties;
import android.text.TextUtils;
import android.util.AndroidException;
-import android.util.Config;
import android.util.Log;
import java.net.URISyntaxException;
@@ -569,7 +568,7 @@
public static final String AUTHORITY = "settings";
private static final String TAG = "Settings";
- private static final boolean LOCAL_LOGV = Config.LOGV || false;
+ private static final boolean LOCAL_LOGV = false || false;
public static class SettingNotFoundException extends AndroidException {
public SettingNotFoundException(String msg) {
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 6ff9f0e..91a72a5 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -28,7 +28,6 @@
import android.os.Environment;
import android.telephony.SmsMessage;
import android.text.TextUtils;
-import android.util.Config;
import android.util.Log;
import android.util.Patterns;
@@ -46,7 +45,7 @@
public final class Telephony {
private static final String TAG = "Telephony";
private static final boolean DEBUG = true;
- private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ private static final boolean LOCAL_LOGV = false;
// Constructor
public Telephony() {
diff --git a/core/java/android/speech/srec/Recognizer.java b/core/java/android/speech/srec/Recognizer.java
index a03a36a..8a2bc7d 100644
--- a/core/java/android/speech/srec/Recognizer.java
+++ b/core/java/android/speech/srec/Recognizer.java
@@ -22,7 +22,6 @@
package android.speech.srec;
-import android.util.Config;
import android.util.Log;
import java.io.File;
diff --git a/core/java/android/util/Config.java b/core/java/android/util/Config.java
deleted file mode 100644
index becb882..0000000
--- a/core/java/android/util/Config.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.util;
-
-/**
- * Build configuration. The constants in this class vary depending
- * on release vs. debug build.
- * {@more}
- */
-public final class Config {
- /** @hide */ public Config() {}
-
- /**
- * If this is a debug build, this field will be true.
- */
- public static final boolean DEBUG = ConfigBuildFlags.DEBUG;
-
- /*
- * Deprecated fields
- * TODO: Remove platform references to these and @hide them.
- */
-
- /**
- * @deprecated Use {@link #DEBUG} instead.
- */
- @Deprecated
- public static final boolean RELEASE = !DEBUG;
-
- /**
- * @deprecated Always false.
- */
- @Deprecated
- public static final boolean PROFILE = false;
-
- /**
- * @deprecated Always false.
- */
- @Deprecated
- public static final boolean LOGV = false;
-
- /**
- * @deprecated Always true.
- */
- @Deprecated
- public static final boolean LOGD = true;
-}
diff --git a/core/java/android/view/OrientationEventListener.java b/core/java/android/view/OrientationEventListener.java
index 391ba1e..cd48a4f 100755
--- a/core/java/android/view/OrientationEventListener.java
+++ b/core/java/android/view/OrientationEventListener.java
@@ -21,7 +21,6 @@
import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
-import android.util.Config;
import android.util.Log;
/**
@@ -31,7 +30,7 @@
public abstract class OrientationEventListener {
private static final String TAG = "OrientationEventListener";
private static final boolean DEBUG = false;
- private static final boolean localLOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ private static final boolean localLOGV = false;
private int mOrientation = ORIENTATION_UNKNOWN;
private SensorManager mSensorManager;
private boolean mEnabled = false;
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 87b3d79..0a7a375 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -34,7 +34,6 @@
import android.os.SystemClock;
import android.os.ParcelFileDescriptor;
import android.util.AttributeSet;
-import android.util.Config;
import android.util.Log;
import java.lang.ref.WeakReference;
@@ -84,7 +83,7 @@
public class SurfaceView extends View {
static private final String TAG = "SurfaceView";
static private final boolean DEBUG = false;
- static private final boolean localLOGV = DEBUG ? true : Config.LOGV;
+ static private final boolean localLOGV = DEBUG ? true : false;
final ArrayList<SurfaceHolder.Callback> mCallbacks
= new ArrayList<SurfaceHolder.Callback>();
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index e329e97d..dc8e52f 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4603,7 +4603,7 @@
}
//noinspection SimplifiableIfStatement,deprecation
- if (android.util.Config.LOGV) {
+ if (false) {
captureViewInfo("captureViewKeyEvent", this);
}
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index 89736d6..881cb76 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -16,7 +16,6 @@
package android.view;
-import android.util.Config;
import android.util.Log;
import android.util.DisplayMetrics;
import android.content.res.Resources;
@@ -158,7 +157,7 @@
/**
* <p>Enables or disables views consistency check. Even when this property is enabled,
- * view consistency checks happen only if {@link android.util.Config#DEBUG} is set
+ * view consistency checks happen only if {@link false} is set
* to true. The value of this property can be configured externally in one of the
* following files:</p>
* <ul>
@@ -172,7 +171,7 @@
public static boolean consistencyCheckEnabled = false;
static {
- if (Config.DEBUG) {
+ if (false) {
Debug.setFieldsOn(ViewDebug.class, true);
}
}
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index a899b46..1a6bae7 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -49,7 +49,6 @@
import android.os.SystemClock;
import android.os.SystemProperties;
import android.util.AndroidRuntimeException;
-import android.util.Config;
import android.util.DisplayMetrics;
import android.util.EventLog;
import android.util.Log;
@@ -1273,7 +1272,7 @@
}
host.layout(0, 0, host.getMeasuredWidth(), host.getMeasuredHeight());
- if (Config.DEBUG && ViewDebug.consistencyCheckEnabled) {
+ if (false && ViewDebug.consistencyCheckEnabled) {
if (!host.dispatchConsistencyCheck(ViewDebug.CONSISTENCY_LAYOUT)) {
throw new IllegalStateException("The view hierarchy is an inconsistent state,"
+ "please refer to the logs with the tag "
@@ -1711,7 +1710,7 @@
mAttachInfo.mIgnoreDirtyState = false;
}
- if (Config.DEBUG && ViewDebug.consistencyCheckEnabled) {
+ if (false && ViewDebug.consistencyCheckEnabled) {
mView.dispatchConsistencyCheck(ViewDebug.CONSISTENCY_DRAWING);
}
@@ -2442,7 +2441,7 @@
if (isDown) {
ensureTouchMode(true);
}
- if(Config.LOGV) {
+ if(false) {
captureMotionLog("captureDispatchPointer", event);
}
@@ -2981,7 +2980,7 @@
return;
}
- if (Config.LOGV) {
+ if (false) {
captureKeyLog("captureDispatchKeyEvent", event);
}
diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java
index a4c4544..8336959 100644
--- a/core/java/android/view/WindowManagerImpl.java
+++ b/core/java/android/view/WindowManagerImpl.java
@@ -19,7 +19,6 @@
import android.graphics.PixelFormat;
import android.os.IBinder;
import android.util.AndroidRuntimeException;
-import android.util.Config;
import android.util.Log;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
@@ -102,7 +101,7 @@
private void addView(View view, ViewGroup.LayoutParams params, boolean nest)
{
- if (Config.LOGV) Log.v("WindowManager", "addView view=" + view);
+ if (false) Log.v("WindowManager", "addView view=" + view);
if (!(params instanceof WindowManager.LayoutParams)) {
throw new IllegalArgumentException(
diff --git a/core/java/android/view/WindowOrientationListener.java b/core/java/android/view/WindowOrientationListener.java
index 62d3e6a..d128b57 100755
--- a/core/java/android/view/WindowOrientationListener.java
+++ b/core/java/android/view/WindowOrientationListener.java
@@ -21,7 +21,6 @@
import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
-import android.util.Config;
import android.util.Log;
import android.util.Slog;
@@ -47,7 +46,7 @@
public abstract class WindowOrientationListener {
private static final String TAG = "WindowOrientationListener";
private static final boolean DEBUG = false;
- private static final boolean localLOGV = DEBUG || Config.DEBUG;
+ private static final boolean localLOGV = DEBUG || false;
private SensorManager mSensorManager;
private boolean mEnabled;
diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java
index f406da9..22cb0d4 100644
--- a/core/java/android/view/accessibility/AccessibilityManager.java
+++ b/core/java/android/view/accessibility/AccessibilityManager.java
@@ -16,8 +16,6 @@
package android.view.accessibility;
-import static android.util.Config.LOGV;
-
import android.content.Context;
import android.content.pm.ServiceInfo;
import android.os.Binder;
@@ -166,7 +164,7 @@
long identityToken = Binder.clearCallingIdentity();
doRecycle = mService.sendAccessibilityEvent(event);
Binder.restoreCallingIdentity(identityToken);
- if (LOGV) {
+ if (false) {
Log.i(LOG_TAG, event + " sent");
}
} catch (RemoteException re) {
@@ -187,7 +185,7 @@
}
try {
mService.interrupt();
- if (LOGV) {
+ if (false) {
Log.i(LOG_TAG, "Requested interrupt from all services");
}
} catch (RemoteException re) {
@@ -204,7 +202,7 @@
List<ServiceInfo> services = null;
try {
services = mService.getAccessibilityServiceList();
- if (LOGV) {
+ if (false) {
Log.i(LOG_TAG, "Installed AccessibilityServices " + services);
}
} catch (RemoteException re) {
diff --git a/core/java/android/widget/CursorAdapter.java b/core/java/android/widget/CursorAdapter.java
index 516162a..6c4c39d 100644
--- a/core/java/android/widget/CursorAdapter.java
+++ b/core/java/android/widget/CursorAdapter.java
@@ -21,7 +21,6 @@
import android.database.Cursor;
import android.database.DataSetObserver;
import android.os.Handler;
-import android.util.Config;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
@@ -440,7 +439,7 @@
*/
protected void onContentChanged() {
if (mAutoRequery && mCursor != null && !mCursor.isClosed()) {
- if (Config.LOGV) Log.v("Cursor", "Auto requerying " + mCursor + " due to update");
+ if (false) Log.v("Cursor", "Auto requerying " + mCursor + " due to update");
mDataValid = mCursor.requery();
}
}
diff --git a/core/java/android/widget/CursorTreeAdapter.java b/core/java/android/widget/CursorTreeAdapter.java
index 3fadf4c..44d1656 100644
--- a/core/java/android/widget/CursorTreeAdapter.java
+++ b/core/java/android/widget/CursorTreeAdapter.java
@@ -22,7 +22,6 @@
import android.database.Cursor;
import android.database.DataSetObserver;
import android.os.Handler;
-import android.util.Config;
import android.util.Log;
import android.util.SparseArray;
import android.view.View;
@@ -499,7 +498,7 @@
@Override
public void onChange(boolean selfChange) {
if (mAutoRequery && mCursor != null) {
- if (Config.LOGV) Log.v("Cursor", "Auto requerying " + mCursor +
+ if (false) Log.v("Cursor", "Auto requerying " + mCursor +
" due to update");
mDataValid = mCursor.requery();
}
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 2e56996..ba2f5d4 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -30,7 +30,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.PatternMatcher;
-import android.util.Config;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
@@ -238,7 +237,7 @@
ResolveInfo r0 = rList.get(0);
for (int i=1; i<N; i++) {
ResolveInfo ri = rList.get(i);
- if (Config.LOGV) Log.v(
+ if (false) Log.v(
"ResolveListActivity",
r0.activityInfo.name + "=" +
r0.priority + "/" + r0.isDefault + " vs " +
diff --git a/core/java/com/android/internal/content/NativeLibraryHelper.java b/core/java/com/android/internal/content/NativeLibraryHelper.java
index 4ae55fc..9ae7def 100644
--- a/core/java/com/android/internal/content/NativeLibraryHelper.java
+++ b/core/java/com/android/internal/content/NativeLibraryHelper.java
@@ -4,7 +4,6 @@
import android.os.Build;
import android.os.FileUtils;
import android.os.SystemProperties;
-import android.util.Config;
import android.util.Log;
import android.util.Pair;
import android.util.Slog;
@@ -176,7 +175,7 @@
continue;
}
- if (Config.LOGD) {
+ if (false) {
Log.d(TAG, "Found gdbserver: " + entry.getName());
}
diff --git a/core/java/com/android/internal/net/DomainNameValidator.java b/core/java/com/android/internal/net/DomainNameValidator.java
index 36973f1..3950655 100644
--- a/core/java/com/android/internal/net/DomainNameValidator.java
+++ b/core/java/com/android/internal/net/DomainNameValidator.java
@@ -16,7 +16,6 @@
package com.android.internal.net;
import android.net.NetworkUtils;
-import android.util.Config;
import android.util.Log;
import java.net.InetAddress;
@@ -35,7 +34,7 @@
private final static String TAG = "DomainNameValidator";
private static final boolean DEBUG = false;
- private static final boolean LOG_ENABLED = DEBUG ? Config.LOGD : Config.LOGV;
+ private static final boolean LOG_ENABLED = false;
private static final int ALT_DNS_NAME = 2;
private static final int ALT_IPA_NAME = 7;
diff --git a/core/java/com/android/internal/os/BinderInternal.java b/core/java/com/android/internal/os/BinderInternal.java
index ba0bf0d..f54a3e9 100644
--- a/core/java/com/android/internal/os/BinderInternal.java
+++ b/core/java/com/android/internal/os/BinderInternal.java
@@ -19,7 +19,6 @@
import android.os.Binder;
import android.os.IBinder;
import android.os.SystemClock;
-import android.util.Config;
import android.util.EventLog;
import android.util.Log;
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index f58f261..0f086f6 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -23,7 +23,6 @@
import android.os.IBinder;
import android.os.Process;
import android.os.SystemProperties;
-import android.util.Config;
import android.util.Log;
import android.util.Slog;
@@ -90,14 +89,14 @@
}
private static final void commonInit() {
- if (Config.LOGV) Slog.d(TAG, "Entered RuntimeInit!");
+ if (false) Slog.d(TAG, "Entered RuntimeInit!");
/* set default handler; this applies to all threads in the VM */
Thread.setDefaultUncaughtExceptionHandler(new UncaughtHandler());
int hasQwerty = getQwertyKeyboard();
- if (Config.LOGV) Slog.d(TAG, ">>>>> qwerty keyboard = " + hasQwerty);
+ if (false) Slog.d(TAG, ">>>>> qwerty keyboard = " + hasQwerty);
if (hasQwerty == 1) {
System.setProperty("qwerty", "1");
}
@@ -234,7 +233,7 @@
*/
finishInit();
- if (Config.LOGV) Slog.d(TAG, "Leaving RuntimeInit!");
+ if (false) Slog.d(TAG, "Leaving RuntimeInit!");
}
public static final native void finishInit();
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 9b71a8b..ad1342b 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -25,7 +25,6 @@
import android.os.FileUtils;
import android.os.SystemClock;
import android.os.SystemProperties;
-import android.util.Config;
import android.util.EventLog;
import android.util.Log;
@@ -272,12 +271,12 @@
}
try {
- if (Config.LOGV) {
+ if (false) {
Log.v(TAG, "Preloading " + line + "...");
}
Class.forName(line);
if (Debug.getGlobalAllocSize() > PRELOAD_GC_THRESHOLD) {
- if (Config.LOGV) {
+ if (false) {
Log.v(TAG,
" GC at " + Debug.getGlobalAllocSize());
}
@@ -362,7 +361,7 @@
int N = ar.length();
for (int i=0; i<N; i++) {
if (Debug.getGlobalAllocSize() > PRELOAD_GC_THRESHOLD) {
- if (Config.LOGV) {
+ if (false) {
Log.v(TAG, " GC at " + Debug.getGlobalAllocSize());
}
System.gc();
@@ -370,7 +369,7 @@
Debug.resetGlobalAllocSize();
}
int id = ar.getResourceId(i, 0);
- if (Config.LOGV) {
+ if (false) {
Log.v(TAG, "Preloading resource #" + Integer.toHexString(id));
}
if (id != 0) {
@@ -385,7 +384,7 @@
int N = ar.length();
for (int i=0; i<N; i++) {
if (Debug.getGlobalAllocSize() > PRELOAD_GC_THRESHOLD) {
- if (Config.LOGV) {
+ if (false) {
Log.v(TAG, " GC at " + Debug.getGlobalAllocSize());
}
System.gc();
@@ -393,7 +392,7 @@
Debug.resetGlobalAllocSize();
}
int id = ar.getResourceId(i, 0);
- if (Config.LOGV) {
+ if (false) {
Log.v(TAG, "Preloading resource #" + Integer.toHexString(id));
}
if (id != 0) {
diff --git a/core/java/com/google/android/mms/pdu/EncodedStringValue.java b/core/java/com/google/android/mms/pdu/EncodedStringValue.java
index a27962d..9495c1c 100644
--- a/core/java/com/google/android/mms/pdu/EncodedStringValue.java
+++ b/core/java/com/google/android/mms/pdu/EncodedStringValue.java
@@ -17,7 +17,6 @@
package com.google.android.mms.pdu;
-import android.util.Config;
import android.util.Log;
import java.io.ByteArrayOutputStream;
@@ -31,7 +30,7 @@
public class EncodedStringValue implements Cloneable {
private static final String TAG = "EncodedStringValue";
private static final boolean DEBUG = false;
- private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ private static final boolean LOCAL_LOGV = false;
/**
* The Char-set value.
diff --git a/core/java/com/google/android/mms/pdu/PduParser.java b/core/java/com/google/android/mms/pdu/PduParser.java
index 3f185aa..f7f71ed 100755
--- a/core/java/com/google/android/mms/pdu/PduParser.java
+++ b/core/java/com/google/android/mms/pdu/PduParser.java
@@ -20,7 +20,6 @@
import com.google.android.mms.ContentType;
import com.google.android.mms.InvalidHeaderValueException;
-import android.util.Config;
import android.util.Log;
import java.io.ByteArrayInputStream;
@@ -86,7 +85,7 @@
*/
private static final String LOG_TAG = "PduParser";
private static final boolean DEBUG = false;
- private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ private static final boolean LOCAL_LOGV = false;
/**
* Constructor.
diff --git a/core/java/com/google/android/mms/pdu/PduPersister.java b/core/java/com/google/android/mms/pdu/PduPersister.java
index 9fdd204..4d2d535 100644
--- a/core/java/com/google/android/mms/pdu/PduPersister.java
+++ b/core/java/com/google/android/mms/pdu/PduPersister.java
@@ -39,7 +39,6 @@
import android.provider.Telephony.Mms.Part;
import android.provider.Telephony.MmsSms.PendingMessages;
import android.text.TextUtils;
-import android.util.Config;
import android.util.Log;
import java.io.ByteArrayOutputStream;
@@ -63,7 +62,7 @@
public class PduPersister {
private static final String TAG = "PduPersister";
private static final boolean DEBUG = false;
- private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ private static final boolean LOCAL_LOGV = false;
private static final long DUMMY_THREAD_ID = Long.MAX_VALUE;
diff --git a/core/java/com/google/android/mms/util/AbstractCache.java b/core/java/com/google/android/mms/util/AbstractCache.java
index 670439c..39b2abf 100644
--- a/core/java/com/google/android/mms/util/AbstractCache.java
+++ b/core/java/com/google/android/mms/util/AbstractCache.java
@@ -17,7 +17,6 @@
package com.google.android.mms.util;
-import android.util.Config;
import android.util.Log;
import java.util.HashMap;
@@ -25,7 +24,7 @@
public abstract class AbstractCache<K, V> {
private static final String TAG = "AbstractCache";
private static final boolean DEBUG = false;
- private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ private static final boolean LOCAL_LOGV = false;
private static final int MAX_CACHED_ITEMS = 500;
diff --git a/core/java/com/google/android/mms/util/PduCache.java b/core/java/com/google/android/mms/util/PduCache.java
index 866ca1e..059af72 100644
--- a/core/java/com/google/android/mms/util/PduCache.java
+++ b/core/java/com/google/android/mms/util/PduCache.java
@@ -21,7 +21,6 @@
import android.content.UriMatcher;
import android.net.Uri;
import android.provider.Telephony.Mms;
-import android.util.Config;
import android.util.Log;
import java.util.HashMap;
@@ -30,7 +29,7 @@
public final class PduCache extends AbstractCache<Uri, PduCacheEntry> {
private static final String TAG = "PduCache";
private static final boolean DEBUG = false;
- private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ private static final boolean LOCAL_LOGV = false;
private static final int MMS_ALL = 0;
private static final int MMS_ALL_ID = 1;
diff --git a/core/tests/coretests/src/android/app/activity/LocalProvider.java b/core/tests/coretests/src/android/app/activity/LocalProvider.java
index 085e622..d6a10c2 100644
--- a/core/tests/coretests/src/android/app/activity/LocalProvider.java
+++ b/core/tests/coretests/src/android/app/activity/LocalProvider.java
@@ -23,7 +23,6 @@
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
-import android.util.Config;
import android.util.Log;
/** Simple test provider that runs in the local process. */
@@ -106,7 +105,7 @@
null, null, sort);
if (ret == null) {
- if (Config.LOGD) Log.d(TAG, "Alarms.query: failed");
+ if (false) Log.d(TAG, "Alarms.query: failed");
} else {
ret.setNotificationUri(getContext().getContentResolver(), url);
}
@@ -145,7 +144,7 @@
"Cannot update URL: " + url);
}
}
- if (Config.LOGD) Log.d(TAG, "*** notifyChange() rowId: " + rowId);
+ if (false) Log.d(TAG, "*** notifyChange() rowId: " + rowId);
getContext().getContentResolver().notifyChange(url, null);
return count;
}