Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove extraneous logs." into jb-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2012-11-08 13:16:10 -08:00
committed by Android (Google) Code Review
parent 9de5901bb3 7ff30113de
commit a46a74fcd6
8 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/widget/TransportControlView.java
View File

@@ -23,7 +23,6 @@ import com.android.internal.widget.LockScreenWidgetInterface;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.app.PendingIntent.CanceledException; import android.app.PendingIntent.CanceledException;
import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -193,7 +192,7 @@ public class TransportControlView extends FrameLayout implements OnClickListener
public TransportControlView(Context context, AttributeSet attrs) { public TransportControlView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
Log.v(TAG, "Create TCV " + this); if (DEBUG) Log.v(TAG, "Create TCV " + this);
mAudioManager = new AudioManager(mContext); mAudioManager = new AudioManager(mContext);
mCurrentPlayState = RemoteControlClient.PLAYSTATE_NONE; // until we get a callback mCurrentPlayState = RemoteControlClient.PLAYSTATE_NONE; // until we get a callback
mIRCD = new IRemoteControlDisplayWeak(mHandler); mIRCD = new IRemoteControlDisplayWeak(mHandler);

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -279,7 +279,7 @@ public class PhoneStatusBar extends BaseStatusBar {
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
// double-check to avoid races // double-check to avoid races
if (mStatusBarContents.getAlpha() == 0) { if (mStatusBarContents.getAlpha() == 0) {
Slog.d(TAG, "makeIconsInvisible"); if (DEBUG) Slog.d(TAG, "makeIconsInvisible");
mStatusBarContents.setVisibility(View.INVISIBLE); mStatusBarContents.setVisibility(View.INVISIBLE);
} }
} }
@@ -518,7 +518,7 @@ public class PhoneStatusBar extends BaseStatusBar {
mCarrierLabel = (TextView)mStatusBarWindow.findViewById(R.id.carrier_label); mCarrierLabel = (TextView)mStatusBarWindow.findViewById(R.id.carrier_label);
mShowCarrierInPanel = (mCarrierLabel != null); mShowCarrierInPanel = (mCarrierLabel != null);
Slog.v(TAG, "carrierlabel=" + mCarrierLabel + " show=" + mShowCarrierInPanel); if (DEBUG) Slog.v(TAG, "carrierlabel=" + mCarrierLabel + " show=" + mShowCarrierInPanel);
if (mShowCarrierInPanel) { if (mShowCarrierInPanel) {
mCarrierLabel.setVisibility(mCarrierLabelVisible ? View.VISIBLE : View.INVISIBLE); mCarrierLabel.setVisibility(mCarrierLabelVisible ? View.VISIBLE : View.INVISIBLE);
@@ -854,7 +854,7 @@ public class PhoneStatusBar extends BaseStatusBar {
} }
public void addNotification(IBinder key, StatusBarNotification notification) { public void addNotification(IBinder key, StatusBarNotification notification) {
/* if (DEBUG) */ Slog.d(TAG, "addNotification score=" + notification.score); if (DEBUG) Slog.d(TAG, "addNotification score=" + notification.score);
StatusBarIconView iconView = addNotificationViews(key, notification); StatusBarIconView iconView = addNotificationViews(key, notification);
if (iconView == null) return; if (iconView == null) return;
@@ -909,7 +909,7 @@ public class PhoneStatusBar extends BaseStatusBar {
awakenDreams(); awakenDreams();
// not immersive & a full-screen alert should be shown // not immersive & a full-screen alert should be shown
Slog.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent"); if (DEBUG) Slog.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent");
try { try {
notification.notification.fullScreenIntent.send(); notification.notification.fullScreenIntent.send();
} catch (PendingIntent.CanceledException e) { } catch (PendingIntent.CanceledException e) {
@@ -2249,7 +2249,7 @@ public class PhoneStatusBar extends BaseStatusBar {
private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
Slog.v(TAG, "onReceive: " + intent); if (DEBUG) Slog.v(TAG, "onReceive: " + intent);
String action = intent.getAction(); String action = intent.getAction();
if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) { if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {
int flags = CommandQueue.FLAG_EXCLUDE_NONE; int flags = CommandQueue.FLAG_EXCLUDE_NONE;

2
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
View File

@@ -215,7 +215,7 @@ public class KeyguardViewManager {
mKeyguardHost.removeView(v); mKeyguardHost.removeView(v);
} }
// TODO: Remove once b/7094175 is fixed // TODO: Remove once b/7094175 is fixed
Slog.d(TAG, "inflateKeyguardView: b/7094175 mContext.config=" if (false) Slog.d(TAG, "inflateKeyguardView: b/7094175 mContext.config="
+ mContext.getResources().getConfiguration()); + mContext.getResources().getConfiguration());
final LayoutInflater inflater = LayoutInflater.from(mContext); final LayoutInflater inflater = LayoutInflater.from(mContext);
View view = inflater.inflate(R.layout.keyguard_host_view, mKeyguardHost, true); View view = inflater.inflate(R.layout.keyguard_host_view, mKeyguardHost, true);

2
services/java/com/android/server/BackupManagerService.java
View File

@@ -133,7 +133,7 @@ import javax.crypto.spec.SecretKeySpec;
class BackupManagerService extends IBackupManager.Stub { class BackupManagerService extends IBackupManager.Stub {
private static final String TAG = "BackupManagerService"; private static final String TAG = "BackupManagerService";
private static final boolean DEBUG = true; private static final boolean DEBUG = false;
private static final boolean MORE_DEBUG = false; private static final boolean MORE_DEBUG = false;
// Name and current contents version of the full-backup manifest file // Name and current contents version of the full-backup manifest file

4
services/java/com/android/server/ConnectivityService.java
View File

@@ -629,7 +629,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
wimaxStateTrackerClassName = context.getResources().getString( wimaxStateTrackerClassName = context.getResources().getString(
com.android.internal.R.string.config_wimaxStateTrackerClassname); com.android.internal.R.string.config_wimaxStateTrackerClassname);
log("wimaxJarLocation: " + wimaxJarLocation); if (DBG) log("wimaxJarLocation: " + wimaxJarLocation);
wimaxClassLoader = new DexClassLoader(wimaxJarLocation, wimaxClassLoader = new DexClassLoader(wimaxJarLocation,
new ContextWrapper(context).getCacheDir().getAbsolutePath(), new ContextWrapper(context).getCacheDir().getAbsolutePath(),
wimaxLibLocation, ClassLoader.getSystemClassLoader()); wimaxLibLocation, ClassLoader.getSystemClassLoader());
@@ -648,7 +648,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
try { try {
log("Starting Wimax Service... "); if (DBG) log("Starting Wimax Service... ");
Constructor wmxStTrkrConst = wimaxStateTrackerClass.getConstructor Constructor wmxStTrkrConst = wimaxStateTrackerClass.getConstructor
(new Class[] {Context.class, Handler.class}); (new Class[] {Context.class, Handler.class});

6
services/java/com/android/server/LocationManagerService.java
View File

@@ -1214,8 +1214,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
throw new IllegalArgumentException("provider doesn't exisit: " + provider); throw new IllegalArgumentException("provider doesn't exisit: " + provider);
} }
Log.i(TAG, "request " + Integer.toHexString(System.identityHashCode(receiver)) + " " + if (D) Log.d(TAG, "request " + Integer.toHexString(System.identityHashCode(receiver))
name + " " + request + " from " + packageName + "(" + uid + ")"); + " " + name + " " + request + " from " + packageName + "(" + uid + ")");
UpdateRecord record = new UpdateRecord(name, request, receiver); UpdateRecord record = new UpdateRecord(name, request, receiver);
UpdateRecord oldRecord = receiver.mUpdateRecords.put(name, record); UpdateRecord oldRecord = receiver.mUpdateRecords.put(name, record);
@@ -1253,7 +1253,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
} }
private void removeUpdatesLocked(Receiver receiver) { private void removeUpdatesLocked(Receiver receiver) {
Log.i(TAG, "remove " + Integer.toHexString(System.identityHashCode(receiver))); if (D) Log.i(TAG, "remove " + Integer.toHexString(System.identityHashCode(receiver)));
if (mReceivers.remove(receiver.mKey) != null && receiver.isListener()) { if (mReceivers.remove(receiver.mKey) != null && receiver.isListener()) {
receiver.getListener().asBinder().unlinkToDeath(receiver, 0); receiver.getListener().asBinder().unlinkToDeath(receiver, 0);

6
services/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -668,9 +668,9 @@ public class UsbDeviceManager {
id = com.android.internal.R.string.usb_accessory_notification_title; id = com.android.internal.R.string.usb_accessory_notification_title;
} else { } else {
// There is a different notification for USB tethering so we don't need one here // There is a different notification for USB tethering so we don't need one here
if (!containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_RNDIS)) { //if (!containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_RNDIS)) {
Slog.e(TAG, "No known USB function in updateUsbNotification"); // Slog.e(TAG, "No known USB function in updateUsbNotification");
} //}
} }
} }
if (id != mUsbNotificationId) { if (id != mUsbNotificationId) {

9
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -2779,10 +2779,7 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} }
if (DEBUG_LAYOUT if (DEBUG_LAYOUT) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility
// TODO: Remove once b/7094175 is fixed
|| ((String)win.mAttrs.getTitle()).contains("Keyguard")
) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility
+ " req=" + requestedWidth + "x" + requestedHeight + " " + win.mAttrs); + " req=" + requestedWidth + "x" + requestedHeight + " " + win.mAttrs);
win.mEnforceSizeCompat = (win.mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0; win.mEnforceSizeCompat = (win.mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0;
@@ -9403,9 +9400,7 @@ public class WindowManagerService extends IWindowManager.Stub
"Reporting new frame to " + win + ": " + win.mCompatFrame); "Reporting new frame to " + win + ": " + win.mCompatFrame);
int diff = 0; int diff = 0;
boolean configChanged = win.isConfigChanged(); boolean configChanged = win.isConfigChanged();
if ((DEBUG_RESIZE || DEBUG_ORIENTATION || DEBUG_CONFIGURATION if ((DEBUG_RESIZE || DEBUG_ORIENTATION || DEBUG_CONFIGURATION)
// TODO: Remove once b/7094175 is fixed
|| ((String)win.mAttrs.getTitle()).contains("Keyguard"))
&& configChanged) { && configChanged) {
Slog.i(TAG, "Sending new config to window " + win + ": " Slog.i(TAG, "Sending new config to window " + win + ": "
+ winAnimator.mSurfaceW + "x" + winAnimator.mSurfaceH + winAnimator.mSurfaceW + "x" + winAnimator.mSurfaceH