am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev (e0d454d2) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/TransportControlView.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import com.android.internal.widget.LockScreenWidgetInterface;

		import android.app.PendingIntent;
		import android.app.PendingIntent.CanceledException;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.graphics.Bitmap;
		@@ -193,7 +192,7 @@ public class TransportControlView extends FrameLayout implements OnClickListener

		public TransportControlView(Context context, AttributeSet attrs) {
		super(context, attrs);
		Log.v(TAG, "Create TCV " + this);
		if (DEBUG) Log.v(TAG, "Create TCV " + this);
		mAudioManager = new AudioManager(mContext);
		mCurrentPlayState = RemoteControlClient.PLAYSTATE_NONE; // until we get a callback
		mIRCD = new IRemoteControlDisplayWeak(mHandler);

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		public void onAnimationEnd(Animator animation) {
		// double-check to avoid races
		if (mStatusBarContents.getAlpha() == 0) {
		Slog.d(TAG, "makeIconsInvisible");
		if (DEBUG) Slog.d(TAG, "makeIconsInvisible");
		mStatusBarContents.setVisibility(View.INVISIBLE);
		}
		}
		@@ -518,7 +518,7 @@ public class PhoneStatusBar extends BaseStatusBar {

		mCarrierLabel = (TextView)mStatusBarWindow.findViewById(R.id.carrier_label);
		mShowCarrierInPanel = (mCarrierLabel != null);
		Slog.v(TAG, "carrierlabel=" + mCarrierLabel + " show=" + mShowCarrierInPanel);
		if (DEBUG) Slog.v(TAG, "carrierlabel=" + mCarrierLabel + " show=" + mShowCarrierInPanel);
		if (mShowCarrierInPanel) {
		mCarrierLabel.setVisibility(mCarrierLabelVisible ? View.VISIBLE : View.INVISIBLE);

		@@ -854,7 +854,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		}

		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);
		if (iconView == null) return;

		@@ -909,7 +909,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		awakenDreams();

		// 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 {
		notification.notification.fullScreenIntent.send();
		} catch (PendingIntent.CanceledException e) {
		@@ -2249,7 +2249,7 @@ public class PhoneStatusBar extends BaseStatusBar {

		private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
		public void onReceive(Context context, Intent intent) {
		Slog.v(TAG, "onReceive: " + intent);
		if (DEBUG) Slog.v(TAG, "onReceive: " + intent);
		String action = intent.getAction();
		if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {
		int flags = CommandQueue.FLAG_EXCLUDE_NONE;

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@ public class KeyguardViewManager {
		mKeyguardHost.removeView(v);
		}
		// 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());
		final LayoutInflater inflater = LayoutInflater.from(mContext);
		View view = inflater.inflate(R.layout.keyguard_host_view, mKeyguardHost, true);

services/java/com/android/server/BackupManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ import javax.crypto.spec.SecretKeySpec;

		class BackupManagerService extends IBackupManager.Stub {
		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;

		// Name and current contents version of the full-backup manifest file

services/java/com/android/server/ConnectivityService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -629,7 +629,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		wimaxStateTrackerClassName = context.getResources().getString(
		com.android.internal.R.string.config_wimaxStateTrackerClassname);

		log("wimaxJarLocation: " + wimaxJarLocation);
		if (DBG) log("wimaxJarLocation: " + wimaxJarLocation);
		wimaxClassLoader = new DexClassLoader(wimaxJarLocation,
		new ContextWrapper(context).getCacheDir().getAbsolutePath(),
		wimaxLibLocation, ClassLoader.getSystemClassLoader());
		@@ -648,7 +648,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}

		try {
		log("Starting Wimax Service... ");
		if (DBG) log("Starting Wimax Service... ");

		Constructor wmxStTrkrConst = wimaxStateTrackerClass.getConstructor
		(new Class[] {Context.class, Handler.class});