Merge "Use Rlog" (d1591969) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

mockril/src/com/android/internal/telephony/mockril/MockRilController.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		package com.android.internal.telephony.mockril;

		import android.os.Bundle;
		import android.util.Log;
		import android.telephony.Rlog;

		import com.android.internal.communication.MsgHeader;
		import com.android.internal.communication.Msg;
		@@ -62,7 +62,7 @@ public class MockRilController {
		try {
		Msg.send(mRilChannel, cmd, token, status, pbData);
		} catch (IOException e) {
		Log.v(TAG, "send command : %d failed: " + e.getStackTrace());
		Rlog.v(TAG, "send command : %d failed: " + e.getStackTrace());
		return false;
		}
		return true;
		@@ -77,7 +77,7 @@ public class MockRilController {
		try {
		response = Msg.recv(mRilChannel);
		} catch (IOException e) {
		Log.v(TAG, "receive response for getRadioState() error: " + e.getStackTrace());
		Rlog.v(TAG, "receive response for getRadioState() error: " + e.getStackTrace());
		return null;
		}
		return response;
		@@ -92,7 +92,7 @@ public class MockRilController {
		}
		Msg response = getCtrlResponse();
		if (response == null) {
		Log.v(TAG, "failed to get response");
		Rlog.v(TAG, "failed to get response");
		return -1;
		}
		response.printHeader(TAG);
		@@ -113,17 +113,17 @@ public class MockRilController {
		public boolean setRadioState(int state) {
		RilCtrlCmds.CtrlReqRadioState req = new RilCtrlCmds.CtrlReqRadioState();
		if (state < 0 \|\| state > RilCmds.RADIOSTATE_NV_READY) {
		Log.v(TAG, "the give radio state is not valid.");
		Rlog.v(TAG, "the give radio state is not valid.");
		return false;
		}
		req.setState(state);
		if (!sendCtrlCommand(RilCtrlCmds.CTRL_CMD_SET_RADIO_STATE, 0, 0, req)) {
		Log.v(TAG, "send set radio state request failed.");
		Rlog.v(TAG, "send set radio state request failed.");
		return false;
		}
		Msg response = getCtrlResponse();
		if (response == null) {
		Log.v(TAG, "failed to get response for setRadioState");
		Rlog.v(TAG, "failed to get response for setRadioState");
		return false;
		}
		response.printHeader(TAG);
		@@ -144,7 +144,7 @@ public class MockRilController {

		req.setPhoneNumber(phoneNumber);
		if (!sendCtrlCommand(RilCtrlCmds.CTRL_CMD_SET_MT_CALL, 0, 0, req)) {
		Log.v(TAG, "send CMD_SET_MT_CALL request failed");
		Rlog.v(TAG, "send CMD_SET_MT_CALL request failed");
		return false;
		}
		return true;
		@@ -163,7 +163,7 @@ public class MockRilController {
		req.setCallFailCause(failCause);

		if (!sendCtrlCommand(RilCtrlCmds.CTRL_CMD_HANGUP_CONN_REMOTE, 0, 0, req)) {
		Log.v(TAG, "send CTRL_CMD_HANGUP_CONN_REMOTE request failed");
		Rlog.v(TAG, "send CTRL_CMD_HANGUP_CONN_REMOTE request failed");
		return false;
		}
		return true;
		@@ -183,7 +183,7 @@ public class MockRilController {
		req.setFlag(flag);

		if (!sendCtrlCommand(RilCtrlCmds.CTRL_CMD_SET_CALL_TRANSITION_FLAG, 0, 0, req)) {
		Log.v(TAG, "send CTRL_CMD_SET_CALL_TRANSITION_FLAG request failed");
		Rlog.v(TAG, "send CTRL_CMD_SET_CALL_TRANSITION_FLAG request failed");
		return false;
		}
		return true;
		@@ -196,7 +196,7 @@ public class MockRilController {
		*/
		public boolean setDialCallToAlert() {
		if (!sendCtrlCommand(RilCtrlCmds.CTRL_CMD_SET_CALL_ALERT, 0, 0, null)) {
		Log.v(TAG, "send CTRL_CMD_SET_CALL_ALERT request failed");
		Rlog.v(TAG, "send CTRL_CMD_SET_CALL_ALERT request failed");
		return false;
		}
		return true;
		@@ -209,7 +209,7 @@ public class MockRilController {
		*/
		public boolean setAlertCallToActive() {
		if (!sendCtrlCommand(RilCtrlCmds.CTRL_CMD_SET_CALL_ACTIVE, 0, 0, null)) {
		Log.v(TAG, "send CTRL_CMD_SET_CALL_ACTIVE request failed");
		Rlog.v(TAG, "send CTRL_CMD_SET_CALL_ACTIVE request failed");
		return false;
		}
		return true;

src/java/android/provider/Telephony.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import android.net.Uri;
		import android.os.Environment;
		import android.telephony.SmsMessage;
		import android.text.TextUtils;
		import android.util.Log;
		import android.telephony.Rlog;
		import android.util.Patterns;


		@@ -1293,7 +1293,7 @@ public final class Telephony {
		}

		Uri uri = uriBuilder.build();
		//if (DEBUG) Log.v(TAG, "getOrCreateThreadId uri: " + uri);
		//if (DEBUG) Rlog.v(TAG, "getOrCreateThreadId uri: " + uri);

		Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
		uri, ID_PROJECTION, null, null, null);
		@@ -1302,14 +1302,14 @@ public final class Telephony {
		if (cursor.moveToFirst()) {
		return cursor.getLong(0);
		} else {
		Log.e(TAG, "getOrCreateThreadId returned no rows!");
		Rlog.e(TAG, "getOrCreateThreadId returned no rows!");
		}
		} finally {
		cursor.close();
		}
		}

		Log.e(TAG, "getOrCreateThreadId failed with uri " + uri.toString());
		Rlog.e(TAG, "getOrCreateThreadId failed with uri " + uri.toString());
		throw new IllegalArgumentException("Unable to find or allocate a thread ID.");
		}
		}

src/java/android/telephony/SmsMessage.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		package android.telephony;

		import android.os.Parcel;
		import android.util.Log;
		import android.telephony.Rlog;

		import com.android.internal.telephony.GsmAlphabet;
		import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
		@@ -158,7 +158,7 @@ public class SmsMessage {
		} else if (SmsConstants.FORMAT_3GPP.equals(format)) {
		wrappedMessage = com.android.internal.telephony.gsm.SmsMessage.createFromPdu(pdu);
		} else {
		Log.e(LOG_TAG, "createFromPdu(): unsupported message format " + format);
		Rlog.e(LOG_TAG, "createFromPdu(): unsupported message format " + format);
		return null;
		}

		@@ -337,7 +337,7 @@ public class SmsMessage {
		nextPos = pos + Math.min(limit / 2, textLen - pos);
		}
		if ((nextPos <= pos) \|\| (nextPos > textLen)) {
		Log.e(LOG_TAG, "fragmentText failed (" + pos + " >= " + nextPos + " or " +
		Rlog.e(LOG_TAG, "fragmentText failed (" + pos + " >= " + nextPos + " or " +
		nextPos + " >= " + textLen + ")");
		break;
		}

src/java/com/android/internal/telephony/AdnRecord.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.os.Parcel;
		import android.os.Parcelable;
		import android.telephony.PhoneNumberUtils;
		import android.text.TextUtils;
		import android.util.Log;
		import android.telephony.Rlog;

		import java.util.Arrays;

		@@ -212,15 +212,15 @@ public class AdnRecord implements Parcelable {
		}

		if (TextUtils.isEmpty(number)) {
		Log.w(LOG_TAG, "[buildAdnString] Empty dialing number");
		Rlog.w(LOG_TAG, "[buildAdnString] Empty dialing number");
		return adnString; // return the empty record (for delete)
		} else if (number.length()
		> (ADN_DIALING_NUMBER_END - ADN_DIALING_NUMBER_START + 1) * 2) {
		Log.w(LOG_TAG,
		Rlog.w(LOG_TAG,
		"[buildAdnString] Max length of dialing number is 20");
		return null;
		} else if (alphaTag != null && alphaTag.length() > footerOffset) {
		Log.w(LOG_TAG,
		Rlog.w(LOG_TAG,
		"[buildAdnString] Max length of tag is " + footerOffset);
		return null;
		} else {
		@@ -271,7 +271,7 @@ public class AdnRecord implements Parcelable {
		// We don't support ext record chaining.

		} catch (RuntimeException ex) {
		Log.w(LOG_TAG, "Error parsing AdnRecord ext record", ex);
		Rlog.w(LOG_TAG, "Error parsing AdnRecord ext record", ex);
		}
		}

		@@ -312,7 +312,7 @@ public class AdnRecord implements Parcelable {
		emails = null;

		} catch (RuntimeException ex) {
		Log.w(LOG_TAG, "Error parsing AdnRecord", ex);
		Rlog.w(LOG_TAG, "Error parsing AdnRecord", ex);
		number = "";
		alphaTag = "";
		emails = null;

src/java/com/android/internal/telephony/AdnRecordCache.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package com.android.internal.telephony;
		import android.os.AsyncResult;
		import android.os.Handler;
		import android.os.Message;
		import android.util.Log;
		import android.telephony.Rlog;
		import android.util.SparseArray;

		import com.android.internal.telephony.gsm.UsimPhoneBookManager;