Merge "Fix double DBG check." into lmp-dev

Wink Saville · Android (Google) Code Review · commit bfa96fb38202 · 2014-08-01T01:46:21.000Z
diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java
@@ -239,7 +239,7 @@ public PhoneStateListener(long subId, Looper looper) {
         mHandler = new Handler(looper) {
             public void handleMessage(Message msg) {
                 if (DBG) {
-                    if (DBG) log("mSubId=" + mSubId + " what=0x" + Integer.toHexString(msg.what)
+                    log("mSubId=" + mSubId + " what=0x" + Integer.toHexString(msg.what)
                             + " msg=" + msg);
                 }
                 switch (msg.what) {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ public PhoneStateListener(long subId, Looper looper) {`
`239`	`239`	`mHandler = new Handler(looper) {`
`240`	`240`	`public void handleMessage(Message msg) {`
`241`	`241`	`if (DBG) {`
`242`		`- if (DBG) log("mSubId=" + mSubId + " what=0x" + Integer.toHexString(msg.what)`
	`242`	`+ log("mSubId=" + mSubId + " what=0x" + Integer.toHexString(msg.what)`
`243`	`243`	`+ " msg=" + msg);`
`244`	`244`	`}`
`245`	`245`	`switch (msg.what) {`