Merge "Fix 5125978: remove lockscreen logspew" (72aa694f) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -266,7 +266,7 @@ class KeyguardStatusViewManager implements OnClickListener {
		case OWNER_INFO:
		case CARRIER_TEXT:
		default:
		Log.w(TAG, "Not showing message id " + what + ", str=" + string);
		if (DEBUG) Log.w(TAG, "Not showing message id " + what + ", str=" + string);
		}
		} else {
		updateStatusLines(mShowingStatus);

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.res.Configuration;
		import android.database.ContentObserver;
		import static android.os.BatteryManager.BATTERY_STATUS_CHARGING;
		import static android.os.BatteryManager.BATTERY_STATUS_FULL;
		@@ -29,7 +28,6 @@ import android.media.AudioManager;
		import android.os.BatteryManager;
		import android.os.Handler;
		import android.os.Message;
		import android.os.SystemClock;
		import android.provider.Settings;
		import android.provider.Telephony;
		import static android.provider.Telephony.Intents.EXTRA_PLMN;
		@@ -503,7 +501,8 @@ public class KeyguardUpdateMonitor {
		if (!mSimStateCallbacks.contains(callback)) {
		mSimStateCallbacks.add(callback);
		} else {
		Log.e(TAG, "Object tried to add another SIM callback", new Exception("Whoops"));
		if (DEBUG) Log.e(TAG, "Object tried to add another SIM callback",
		new Exception("Whoops"));
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -127,10 +127,10 @@ public class KeyguardViewManager implements KeyguardWindowController {
		}

		if (enableScreenRotation) {
		Log.d(TAG, "Rotation sensor for lock screen On!");
		if (DEBUG) Log.d(TAG, "Rotation sensor for lock screen On!");
		mWindowLayoutParams.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR;
		} else {
		Log.d(TAG, "Rotation sensor for lock screen Off!");
		if (DEBUG) Log.d(TAG, "Rotation sensor for lock screen Off!");
		mWindowLayoutParams.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
		}

+7 −5

Original line number	Diff line number	Diff line
		@@ -646,7 +646,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		* @see #onWakeKeyWhenKeyguardShowingTq(int)
		*/
		private void wakeWhenReadyLocked(int keyCode) {
		if (true \|\| DBG_WAKE) Log.d(TAG, "wakeWhenReadyLocked(" + keyCode + ")");
		if (DBG_WAKE) Log.d(TAG, "wakeWhenReadyLocked(" + keyCode + ")");

		/**
		* acquire the handoff lock that will keep the cpu running. this will
		@@ -741,7 +741,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,

		int sequence = intent.getIntExtra("seq", 0);

		if (false) Log.d(TAG, "received DELAYED_KEYGUARD_ACTION with seq = "
		if (DEBUG) Log.d(TAG, "received DELAYED_KEYGUARD_ACTION with seq = "
		+ sequence + ", mDelayedShowingSequence = " + mDelayedShowingSequence);

		if (mDelayedShowingSequence == sequence) {
		@@ -1033,13 +1033,15 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		sfx.setStreamType(AudioManager.STREAM_SYSTEM);
		sfx.play();
		} else {
		Log.d(TAG, "playSounds: failed to load ringtone from uri: " + soundUri);
		if (DEBUG) Log.d(TAG, "playSounds: failed to load ringtone from uri: "
		+ soundUri);
		}
		} else {
		Log.d(TAG, "playSounds: could not parse Uri: " + soundPath);
		if (DEBUG) Log.d(TAG, "playSounds: could not parse Uri: " + soundPath);
		}
		} else {
		Log.d(TAG, "playSounds: whichSound = " + whichSound + "; soundPath was null");
		if (DEBUG) Log.d(TAG, "playSounds: whichSound = " + whichSound
		+ "; soundPath was null");
		}
		}
		}