Clean up member variables. (22d85a8e) · Commits · e / os / android_frameworks_opt_telephony

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

+33 −33

Original line number	Diff line number	Diff line
		@@ -23,16 +23,16 @@ public class ATResponseParser
		{
		/************************* Instance Variables ************************/

		private String line;
		private int next = 0;
		private int tokStart, tokEnd;
		private String mLine;
		private int mNext = 0;
		private int mTokStart, mTokEnd;

		/*************************** Class Methods ***************************/

		public
		ATResponseParser (String line)
		{
		this.line = line;
		mLine = line;
		}

		public boolean
		@@ -43,10 +43,10 @@ public class ATResponseParser

		nextTok();

		if (tokEnd - tokStart > 1) {
		if (mTokEnd - mTokStart > 1) {
		throw new ATParseEx();
		}
		char c = line.charAt(tokStart);
		char c = mLine.charAt(mTokStart);

		if (c == '0') return false;
		if (c == '1') return true;
		@@ -63,8 +63,8 @@ public class ATResponseParser

		nextTok();

		for (int i = tokStart ; i < tokEnd ; i++) {
		char c = line.charAt(i);
		for (int i = mTokStart ; i < mTokEnd ; i++) {
		char c = mLine.charAt(i);

		// Yes, ASCII decimal digits only
		if (c < '0' \|\| c > '9') {
		@@ -83,63 +83,63 @@ public class ATResponseParser
		{
		nextTok();

		return line.substring(tokStart, tokEnd);
		return mLine.substring(mTokStart, mTokEnd);
		}

		public boolean
		hasMore()
		{
		return next < line.length();
		return mNext < mLine.length();
		}

		private void
		nextTok()
		{
		int len = line.length();
		int len = mLine.length();

		if (next == 0) {
		if (mNext == 0) {
		skipPrefix();
		}

		if (next >= len) {
		if (mNext >= len) {
		throw new ATParseEx();
		}

		try {
		// \s("([^"])"\|(.)\s)(,\|$)

		char c = line.charAt(next++);
		char c = mLine.charAt(mNext++);
		boolean hasQuote = false;

		c = skipWhiteSpace(c);

		if (c == '"') {
		if (next >= len) {
		if (mNext >= len) {
		throw new ATParseEx();
		}
		c = line.charAt(next++);
		tokStart = next - 1;
		while (c != '"' && next < len) {
		c = line.charAt(next++);
		c = mLine.charAt(mNext++);
		mTokStart = mNext - 1;
		while (c != '"' && mNext < len) {
		c = mLine.charAt(mNext++);
		}
		if (c != '"') {
		throw new ATParseEx();
		}
		tokEnd = next - 1;
		if (next < len && line.charAt(next++) != ',') {
		mTokEnd = mNext - 1;
		if (mNext < len && mLine.charAt(mNext++) != ',') {
		throw new ATParseEx();
		}
		} else {
		tokStart = next - 1;
		tokEnd = tokStart;
		mTokStart = mNext - 1;
		mTokEnd = mTokStart;
		while (c != ',') {
		if (!Character.isWhitespace(c)) {
		tokEnd = next;
		mTokEnd = mNext;
		}
		if (next == len) {
		if (mNext == len) {
		break;
		}
		c = line.charAt(next++);
		c = mLine.charAt(mNext++);
		}
		}
		} catch (StringIndexOutOfBoundsException ex) {
		@@ -153,9 +153,9 @@ public class ATResponseParser
		skipWhiteSpace (char c)
		{
		int len;
		len = line.length();
		while (next < len && Character.isWhitespace(c)) {
		c = line.charAt(next++);
		len = mLine.length();
		while (mNext < len && Character.isWhitespace(c)) {
		c = mLine.charAt(mNext++);
		}

		if (Character.isWhitespace(c)) {
		@@ -170,10 +170,10 @@ public class ATResponseParser
		{
		// consume "^[^:]:"

		next = 0;
		int s = line.length();
		while (next < s){
		char c = line.charAt(next++);
		mNext = 0;
		int s = mLine.length();
		while (mNext < s){
		char c = mLine.charAt(mNext++);

		if (c == ':') {
		return;

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ import android.telephony.Rlog;
		* {@hide}
		*/
		public abstract class Call {
		protected final String LOG_TAG = "Call";

		/* Enums */

		public enum State {
		@@ -46,9 +48,9 @@ public abstract class Call {

		/* Instance Variables */

		public State state = State.IDLE;
		public State mState = State.IDLE;

		public ArrayList<Connection> connections = new ArrayList<Connection>();
		public ArrayList<Connection> mConnections = new ArrayList<Connection>();

		// Flag to indicate if the current calling/caller information
		// is accurate. If false the information is known to be accurate.
		@@ -56,9 +58,7 @@ public abstract class Call {
		// For CDMA, during call waiting/3 way, there is no network response
		// if call waiting is answered, network timed out, dropped, 3 way
		// merged, etc.
		protected boolean isGeneric = false;

		protected final String LOG_TAG = "Call";
		protected boolean mIsGeneric = false;

		/* Instance Methods */

		@@ -101,7 +101,7 @@ public abstract class Call {
		* @return state of class call
		*/
		public State getState() {
		return state;
		return mState;
		}

		/**
		@@ -232,14 +232,14 @@ public abstract class Call {
		* or not. false means accurate. Only used for CDMA.
		*/
		public boolean isGeneric() {
		return isGeneric;
		return mIsGeneric;
		}

		/**
		* Set the generic instance variable
		*/
		public void setGeneric(boolean generic) {
		isGeneric = generic;
		mIsGeneric = generic;
		}

		/**

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

+27 −27

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ public final class CallManager {
		private final ArrayList<Call> mForegroundCalls;

		// empty connection list
		private final ArrayList<Connection> emptyConnections = new ArrayList<Connection>();
		private final ArrayList<Connection> mEmptyConnections = new ArrayList<Connection>();

		// default phone as the first phone registered, which is PhoneBase obj
		private Phone mDefaultPhone;
		@@ -519,7 +519,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "acceptCall(" +ringingCall + " from " + ringingCall.getPhone() + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if ( hasActiveFgCall() ) {
		@@ -561,7 +561,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End acceptCall(" +ringingCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}
		}

		@@ -577,7 +577,7 @@ public final class CallManager {
		public void rejectCall(Call ringingCall) throws CallStateException {
		if (VDBG) {
		Rlog.d(LOG_TAG, "rejectCall(" +ringingCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		Phone ringingPhone = ringingCall.getPhone();
		@@ -586,7 +586,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End rejectCall(" +ringingCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}
		}

		@@ -614,7 +614,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "switchHoldingAndActive(" +heldCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if (hasActiveFgCall()) {
		@@ -635,7 +635,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End switchHoldingAndActive(" +heldCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}
		}

		@@ -653,7 +653,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "hangupForegroundResumeBackground(" +heldCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if (hasActiveFgCall()) {
		@@ -672,7 +672,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End hangupForegroundResumeBackground(" +heldCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}
		}

		@@ -709,7 +709,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "conference(" +heldCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}


		@@ -724,7 +724,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End conference(" +heldCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		}
		@@ -745,7 +745,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, " dial(" + basePhone + ", "+ dialString + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if (!canDial(phone)) {
		@@ -775,7 +775,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End dial(" + basePhone + ", "+ dialString + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		return result;
		@@ -875,7 +875,7 @@ public final class CallManager {
		public void explicitCallTransfer(Call heldCall) throws CallStateException {
		if (VDBG) {
		Rlog.d(LOG_TAG, " explicitCallTransfer(" + heldCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if (canTransfer(heldCall)) {
		@@ -884,7 +884,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End explicitCallTransfer(" + heldCall + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		}
		@@ -928,7 +928,7 @@ public final class CallManager {
		public void setMute(boolean muted) {
		if (VDBG) {
		Rlog.d(LOG_TAG, " setMute(" + muted + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if (hasActiveFgCall()) {
		@@ -937,7 +937,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End setMute(" + muted + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}
		}

		@@ -965,7 +965,7 @@ public final class CallManager {
		public void setEchoSuppressionEnabled(boolean enabled) {
		if (VDBG) {
		Rlog.d(LOG_TAG, " setEchoSuppression(" + enabled + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if (hasActiveFgCall()) {
		@@ -974,7 +974,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End setEchoSuppression(" + enabled + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}
		}

		@@ -991,7 +991,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, " sendDtmf(" + c + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if (hasActiveFgCall()) {
		@@ -1001,7 +1001,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End sendDtmf(" + c + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}
		return result;
		}
		@@ -1020,7 +1020,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, " startDtmf(" + c + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if (hasActiveFgCall()) {
		@@ -1030,7 +1030,7 @@ public final class CallManager {

		if (VDBG) {
		Rlog.d(LOG_TAG, "End startDtmf(" + c + ")");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		return result;
		@@ -1043,14 +1043,14 @@ public final class CallManager {
		public void stopDtmf() {
		if (VDBG) {
		Rlog.d(LOG_TAG, " stopDtmf()" );
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}

		if (hasActiveFgCall()) getFgPhone().stopDtmf();

		if (VDBG) {
		Rlog.d(LOG_TAG, "End stopDtmf()");
		Rlog.d(LOG_TAG, this.toString());
		Rlog.d(LOG_TAG, toString());
		}
		}

		@@ -1659,7 +1659,7 @@ public final class CallManager {
		if ( fgCall != null) {
		return fgCall.getConnections();
		}
		return emptyConnections;
		return mEmptyConnections;
		}

		/**
		@@ -1671,7 +1671,7 @@ public final class CallManager {
		if ( bgCall != null) {
		return bgCall.getConnections();
		}
		return emptyConnections;
		return mEmptyConnections;
		}

		/**

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

+15 −15

Original line number	Diff line number	Diff line
		@@ -38,11 +38,11 @@ public abstract class CallTracker extends Handler {

		static final int POLL_DELAY_MSEC = 250;

		protected int pendingOperations;
		protected boolean needsPoll;
		protected Message lastRelevantPoll;
		protected int mPendingOperations;
		protected boolean mNeedsPoll;
		protected Message mLastRelevantPoll;

		public CommandsInterface cm;
		public CommandsInterface mCi;


		//***** Events
		@@ -64,11 +64,11 @@ public abstract class CallTracker extends Handler {
		protected static final int EVENT_THREE_WAY_DIAL_L2_RESULT_CDMA = 16;

		protected void pollCallsWhenSafe() {
		needsPoll = true;
		mNeedsPoll = true;

		if (checkNoOperationsPending()) {
		lastRelevantPoll = obtainMessage(EVENT_POLL_CALLS_RESULT);
		cm.getCurrentCalls(lastRelevantPoll);
		mLastRelevantPoll = obtainMessage(EVENT_POLL_CALLS_RESULT);
		mCi.getCurrentCalls(mLastRelevantPoll);
		}
		}

		@@ -103,8 +103,8 @@ public abstract class CallTracker extends Handler {
		*/
		protected Message
		obtainNoPollCompleteMessage(int what) {
		pendingOperations++;
		lastRelevantPoll = null;
		mPendingOperations++;
		mLastRelevantPoll = null;
		return obtainMessage(what);
		}

		@@ -115,8 +115,8 @@ public abstract class CallTracker extends Handler {
		private boolean
		checkNoOperationsPending() {
		if (DBG_POLL) log("checkNoOperationsPending: pendingOperations=" +
		pendingOperations);
		return pendingOperations == 0;
		mPendingOperations);
		return mPendingOperations == 0;
		}

		/**
		@@ -152,7 +152,7 @@ public abstract class CallTracker extends Handler {
		if (values.length == 2) {
		if (values[0].equals(
		android.telephony.PhoneNumberUtils.stripSeparators(dialString))) {
		cm.testingEmergencyCall();
		mCi.testingEmergencyCall();
		log("checkForTestEmergencyNumber: remap " +
		dialString + " to " + values[1]);
		dialString = values[1];
		@@ -174,8 +174,8 @@ public abstract class CallTracker extends Handler {

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("CallTracker:");
		pw.println(" pendingOperations=" + pendingOperations);
		pw.println(" needsPoll=" + needsPoll);
		pw.println(" lastRelevantPoll=" + lastRelevantPoll);
		pw.println(" mPendingOperations=" + mPendingOperations);
		pw.println(" mNeedsPoll=" + mNeedsPoll);
		pw.println(" mLastRelevantPoll=" + mLastRelevantPoll);
		}
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import android.telephony.Rlog;
		* {@hide}
		*/
		public class CommandException extends RuntimeException {
		private Error e;
		private Error mError;

		public enum Error {
		INVALID_RESPONSE,
		@@ -46,7 +46,7 @@ public class CommandException extends RuntimeException {

		public CommandException(Error e) {
		super(e.toString());
		this.e = e;
		mError = e;
		}

		public static CommandException
		@@ -90,7 +90,7 @@ public class CommandException extends RuntimeException {
		}

		public Error getCommandError() {
		return e;
		return mError;
		}