Clean up member variables.
Wink Saville [Sat, 23 Feb 2013 21:23:48 +0000 (13:23 -0800)]
Change-Id: Ib60f350131ade626aca682407ea0b4377b16f6c6

87 files changed:
src/java/com/android/internal/telephony/ATResponseParser.java
src/java/com/android/internal/telephony/Call.java
src/java/com/android/internal/telephony/CallManager.java
src/java/com/android/internal/telephony/CallTracker.java
src/java/com/android/internal/telephony/CommandException.java
src/java/com/android/internal/telephony/Connection.java
src/java/com/android/internal/telephony/DebugService.java
src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
src/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
src/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
src/java/com/android/internal/telephony/IntRangeManager.java
src/java/com/android/internal/telephony/MccTable.java
src/java/com/android/internal/telephony/OperatorInfo.java
src/java/com/android/internal/telephony/PhoneBase.java
src/java/com/android/internal/telephony/PhoneFactory.java
src/java/com/android/internal/telephony/PhoneProxy.java
src/java/com/android/internal/telephony/PhoneSubInfoProxy.java
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/RetryManager.java
src/java/com/android/internal/telephony/SMSDispatcher.java
src/java/com/android/internal/telephony/ServiceStateTracker.java
src/java/com/android/internal/telephony/SmsMessageBase.java
src/java/com/android/internal/telephony/SmsResponse.java
src/java/com/android/internal/telephony/SmsStorageMonitor.java
src/java/com/android/internal/telephony/UUSInfo.java
src/java/com/android/internal/telephony/WspTypeDecoder.java
src/java/com/android/internal/telephony/cat/CatCmdMessage.java
src/java/com/android/internal/telephony/cat/CatResponseMessage.java
src/java/com/android/internal/telephony/cat/CatService.java
src/java/com/android/internal/telephony/cat/CommandParams.java
src/java/com/android/internal/telephony/cat/CommandParamsFactory.java
src/java/com/android/internal/telephony/cat/IconLoader.java
src/java/com/android/internal/telephony/cat/ImageDescriptor.java
src/java/com/android/internal/telephony/cat/ResponseData.java
src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
src/java/com/android/internal/telephony/cdma/CDMAPhone.java
src/java/com/android/internal/telephony/cdma/CdmaCall.java
src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
src/java/com/android/internal/telephony/cdma/CdmaConnection.java
src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
src/java/com/android/internal/telephony/cdma/EriInfo.java
src/java/com/android/internal/telephony/cdma/EriManager.java
src/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
src/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
src/java/com/android/internal/telephony/cdma/SignalToneUtil.java
src/java/com/android/internal/telephony/cdma/SmsMessage.java
src/java/com/android/internal/telephony/dataconnection/ApnSetting.java
src/java/com/android/internal/telephony/dataconnection/DataConnection.java
src/java/com/android/internal/telephony/dataconnection/DataConnectionBase.java
src/java/com/android/internal/telephony/dataconnection/DataConnectionTracker.java
src/java/com/android/internal/telephony/dataconnection/DataConnectionTrackerBase.java
src/java/com/android/internal/telephony/gsm/GSMPhone.java
src/java/com/android/internal/telephony/gsm/GsmCall.java
src/java/com/android/internal/telephony/gsm/GsmCallTracker.java
src/java/com/android/internal/telephony/gsm/GsmConnection.java
src/java/com/android/internal/telephony/gsm/GsmMmiCode.java
src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
src/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
src/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
src/java/com/android/internal/telephony/gsm/SimTlv.java
src/java/com/android/internal/telephony/gsm/SmsBroadcastConfigInfo.java
src/java/com/android/internal/telephony/gsm/SmsCbHeader.java
src/java/com/android/internal/telephony/gsm/SmsMessage.java
src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java
src/java/com/android/internal/telephony/sip/SipCallBase.java
src/java/com/android/internal/telephony/sip/SipConnectionBase.java
src/java/com/android/internal/telephony/sip/SipPhone.java
src/java/com/android/internal/telephony/sip/SipPhoneBase.java
src/java/com/android/internal/telephony/test/ModelInterpreter.java
src/java/com/android/internal/telephony/test/SimulatedCommands.java
src/java/com/android/internal/telephony/test/SimulatedGsmCallState.java
src/java/com/android/internal/telephony/uicc/AdnRecord.java
src/java/com/android/internal/telephony/uicc/AdnRecordCache.java
src/java/com/android/internal/telephony/uicc/AdnRecordLoader.java
src/java/com/android/internal/telephony/uicc/IccCardProxy.java
src/java/com/android/internal/telephony/uicc/IccFileHandler.java
src/java/com/android/internal/telephony/uicc/IccRecords.java
src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java
src/java/com/android/internal/telephony/uicc/RuimRecords.java
src/java/com/android/internal/telephony/uicc/SIMRecords.java
src/java/com/android/internal/telephony/uicc/SpnOverride.java
tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java

index fdb0526..1d4d7c7 100644 (file)
@@ -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;
index 931bd17..b83d33e 100644 (file)
@@ -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;
     }
 
     /**
index 49e6488..f32fcf0 100644 (file)
@@ -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;
     }
 
     /**
index 57de316..2694a04 100644 (file)
@@ -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);
     }
 }
index d1085f6..550e91c 100644 (file)
@@ -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;
     }
 
 
index 5bfea1c..f948885 100644 (file)
@@ -25,8 +25,8 @@ import android.util.Log;
 public abstract class Connection {
 
     //Caller Name Display
-    protected String cnapName;
-    protected int cnapNamePresentation  = PhoneConstants.PRESENTATION_ALLOWED;
+    protected String mCnapName;
+    protected int mCnapNamePresentation  = PhoneConstants.PRESENTATION_ALLOWED;
 
     private static String LOG_TAG = "Connection";
 
@@ -70,7 +70,7 @@ public abstract class Connection {
         ERROR_UNSPECIFIED
     }
 
-    Object userData;
+    Object mUserData;
 
     /* Instance Methods */
 
@@ -88,7 +88,7 @@ public abstract class Connection {
      * @return cnap name or null if unavailable
      */
     public String getCnapName() {
-        return cnapName;
+        return mCnapName;
     }
 
     /**
@@ -105,7 +105,7 @@ public abstract class Connection {
      */
 
     public int getCnapNamePresentation() {
-       return cnapNamePresentation;
+       return mCnapNamePresentation;
     }
 
     /**
@@ -207,7 +207,7 @@ public abstract class Connection {
      * @return the userdata set in setUserData()
      */
     public Object getUserData() {
-        return userData;
+        return mUserData;
     }
 
     /**
@@ -215,7 +215,7 @@ public abstract class Connection {
      * @param userdata user can store an any userdata in the Connection object.
      */
     public void setUserData(Object userdata) {
-        this.userData = userdata;
+        mUserData = userdata;
     }
 
     /**
@@ -247,7 +247,7 @@ public abstract class Connection {
     }
 
     public void clearUserData(){
-        userData = null;
+        mUserData = null;
     }
 
     public abstract PostDialState getPostDialState();
index deba3eb..f605721 100644 (file)
@@ -96,7 +96,7 @@ public class DebugService {
         pw.flush();
         pw.println("++++++++++++++++++++++++++++++++");
         try {
-            ((RIL)phoneBase.mCM).dump(fd, pw, args);
+            ((RIL)phoneBase.mCi).dump(fd, pw, args);
         } catch (Exception e) {
             e.printStackTrace();
         }
index b0ecda5..03c4967 100644 (file)
@@ -39,12 +39,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
     protected static final boolean DBG = true;
 
-    protected PhoneBase phone;
-    protected AdnRecordCache adnCache;
+    protected PhoneBase mPhone;
+    protected AdnRecordCache mAdnCache;
     protected final Object mLock = new Object();
-    protected int recordSize[];
-    protected boolean success;
-    protected List<AdnRecord> records;
+    protected int mRecordSize[];
+    protected boolean mSuccess;
+    protected List<AdnRecord> mRecords;
 
     protected static final boolean ALLOW_SIM_OP_IN_UI_THREAD = false;
 
@@ -62,13 +62,13 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
                     ar = (AsyncResult) msg.obj;
                     synchronized (mLock) {
                         if (ar.exception == null) {
-                            recordSize = (int[])ar.result;
+                            mRecordSize = (int[])ar.result;
                             // recordSize[0]  is the record length
                             // recordSize[1]  is the total length of the EF file
                             // recordSize[2]  is the number of records in the EF file
-                            logd("GET_RECORD_SIZE Size " + recordSize[0] +
-                                    " total " + recordSize[1] +
-                                    " #record " + recordSize[2]);
+                            logd("GET_RECORD_SIZE Size " + mRecordSize[0] +
+                                    " total " + mRecordSize[1] +
+                                    " #record " + mRecordSize[2]);
                         }
                         notifyPending(ar);
                     }
@@ -76,7 +76,7 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
                 case EVENT_UPDATE_DONE:
                     ar = (AsyncResult) msg.obj;
                     synchronized (mLock) {
-                        success = (ar.exception == null);
+                        mSuccess = (ar.exception == null);
                         notifyPending(ar);
                     }
                     break;
@@ -84,11 +84,11 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
                     ar = (AsyncResult)msg.obj;
                     synchronized (mLock) {
                         if (ar.exception == null) {
-                            records = (List<AdnRecord>) ar.result;
+                            mRecords = (List<AdnRecord>) ar.result;
                         } else {
                             if(DBG) logd("Cannot load ADN records");
-                            if (records != null) {
-                                records.clear();
+                            if (mRecords != null) {
+                                mRecords.clear();
                             }
                         }
                         notifyPending(ar);
@@ -108,10 +108,10 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
     };
 
     public IccPhoneBookInterfaceManager(PhoneBase phone) {
-        this.phone = phone;
+        this.mPhone = phone;
         IccRecords r = phone.mIccRecords.get();
         if (r != null) {
-            adnCache = r.getAdnCache();
+            mAdnCache = r.getAdnCache();
         }
     }
 
@@ -120,9 +120,9 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
 
     public void updateIccRecords(IccRecords iccRecords) {
         if (iccRecords != null) {
-            adnCache = iccRecords.getAdnCache();
+            mAdnCache = iccRecords.getAdnCache();
         } else {
-            adnCache = null;
+            mAdnCache = null;
         }
     }
 
@@ -162,7 +162,7 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
             String newTag, String newPhoneNumber, String pin2) {
 
 
-        if (phone.getContext().checkCallingOrSelfPermission(
+        if (mPhone.getContext().checkCallingOrSelfPermission(
                 android.Manifest.permission.WRITE_CONTACTS)
             != PackageManager.PERMISSION_GRANTED) {
             throw new SecurityException(
@@ -178,15 +178,15 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
 
         synchronized(mLock) {
             checkThread();
-            success = false;
+            mSuccess = false;
             AtomicBoolean status = new AtomicBoolean(false);
             Message response = mBaseHandler.obtainMessage(EVENT_UPDATE_DONE, status);
             AdnRecord oldAdn = new AdnRecord(oldTag, oldPhoneNumber);
             AdnRecord newAdn = new AdnRecord(newTag, newPhoneNumber);
-            adnCache.updateAdnBySearch(efid, oldAdn, newAdn, pin2, response);
+            mAdnCache.updateAdnBySearch(efid, oldAdn, newAdn, pin2, response);
             waitForResult(status);
         }
-        return success;
+        return mSuccess;
     }
 
     /**
@@ -211,7 +211,7 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
     updateAdnRecordsInEfByIndex(int efid, String newTag,
             String newPhoneNumber, int index, String pin2) {
 
-        if (phone.getContext().checkCallingOrSelfPermission(
+        if (mPhone.getContext().checkCallingOrSelfPermission(
                 android.Manifest.permission.WRITE_CONTACTS)
                 != PackageManager.PERMISSION_GRANTED) {
             throw new SecurityException(
@@ -223,14 +223,14 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
                 "("+ newTag + "," + newPhoneNumber + ")"+ " pin2=" + pin2);
         synchronized(mLock) {
             checkThread();
-            success = false;
+            mSuccess = false;
             AtomicBoolean status = new AtomicBoolean(false);
             Message response = mBaseHandler.obtainMessage(EVENT_UPDATE_DONE, status);
             AdnRecord newAdn = new AdnRecord(newTag, newPhoneNumber);
-            adnCache.updateAdnByIndex(efid, newAdn, index, pin2, response);
+            mAdnCache.updateAdnByIndex(efid, newAdn, index, pin2, response);
             waitForResult(status);
         }
-        return success;
+        return mSuccess;
     }
 
     /**
@@ -257,7 +257,7 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
     @Override
     public List<AdnRecord> getAdnRecordsInEf(int efid) {
 
-        if (phone.getContext().checkCallingOrSelfPermission(
+        if (mPhone.getContext().checkCallingOrSelfPermission(
                 android.Manifest.permission.READ_CONTACTS)
                 != PackageManager.PERMISSION_GRANTED) {
             throw new SecurityException(
@@ -271,10 +271,10 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
             checkThread();
             AtomicBoolean status = new AtomicBoolean(false);
             Message response = mBaseHandler.obtainMessage(EVENT_LOAD_DONE, status);
-            adnCache.requestLoadAllAdnLike(efid, adnCache.extensionEfForEf(efid), response);
+            mAdnCache.requestLoadAllAdnLike(efid, mAdnCache.extensionEfForEf(efid), response);
             waitForResult(status);
         }
-        return records;
+        return mRecords;
     }
 
     protected void checkThread() {
@@ -301,7 +301,7 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub {
     private int updateEfForIccType(int efid) {
         // Check if we are trying to read ADN records
         if (efid == IccConstants.EF_ADN) {
-            if (phone.getCurrentUiccAppType() == AppType.APPTYPE_USIM) {
+            if (mPhone.getCurrentUiccAppType() == AppType.APPTYPE_USIM) {
                 return IccConstants.EF_PBR;
             }
         }
index 7aa630c..3a2fbc5 100644 (file)
@@ -40,7 +40,7 @@ public class IccPhoneBookInterfaceManagerProxy extends IIccPhoneBook.Stub {
 
     public void setmIccPhoneBookInterfaceManager(
             IccPhoneBookInterfaceManager iccPhoneBookInterfaceManager) {
-        this.mIccPhoneBookInterfaceManager = iccPhoneBookInterfaceManager;
+        mIccPhoneBookInterfaceManager = iccPhoneBookInterfaceManager;
     }
 
     @Override
index ed55d99..eb526ae 100644 (file)
@@ -26,14 +26,14 @@ public class IccSmsInterfaceManagerProxy extends ISms.Stub {
 
     public IccSmsInterfaceManagerProxy(IccSmsInterfaceManager
             iccSmsInterfaceManager) {
-        this.mIccSmsInterfaceManager = iccSmsInterfaceManager;
+        mIccSmsInterfaceManager = iccSmsInterfaceManager;
         if(ServiceManager.getService("isms") == null) {
             ServiceManager.addService("isms", this);
         }
     }
 
     public void setmIccSmsInterfaceManager(IccSmsInterfaceManager iccSmsInterfaceManager) {
-        this.mIccSmsInterfaceManager = iccSmsInterfaceManager;
+        mIccSmsInterfaceManager = iccSmsInterfaceManager;
     }
 
     @Override
index cc7774d..fc6d1bd 100644 (file)
@@ -52,10 +52,10 @@ public abstract class IntRangeManager {
      * non-contiguous IntRanges.
      */
     private class IntRange {
-        int startId;
-        int endId;
+        int mStartId;
+        int mEndId;
         // sorted by earliest start id
-        final ArrayList<ClientRange> clients;
+        final ArrayList<ClientRange> mClients;
 
         /**
          * Create a new IntRange with a single client.
@@ -64,10 +64,10 @@ public abstract class IntRangeManager {
          * @param client the client requesting the enabled range
          */
         IntRange(int startId, int endId, String client) {
-            this.startId = startId;
-            this.endId = endId;
-            clients = new ArrayList<ClientRange>(INITIAL_CLIENTS_ARRAY_SIZE);
-            clients.add(new ClientRange(startId, endId, client));
+            mStartId = startId;
+            mEndId = endId;
+            mClients = new ArrayList<ClientRange>(INITIAL_CLIENTS_ARRAY_SIZE);
+            mClients.add(new ClientRange(startId, endId, client));
         }
 
         /**
@@ -75,10 +75,10 @@ public abstract class IntRangeManager {
          * @param clientRange the initial ClientRange to add
          */
         IntRange(ClientRange clientRange) {
-            startId = clientRange.startId;
-            endId = clientRange.endId;
-            clients = new ArrayList<ClientRange>(INITIAL_CLIENTS_ARRAY_SIZE);
-            clients.add(clientRange);
+            mStartId = clientRange.mStartId;
+            mEndId = clientRange.mEndId;
+            mClients = new ArrayList<ClientRange>(INITIAL_CLIENTS_ARRAY_SIZE);
+            mClients.add(clientRange);
         }
 
         /**
@@ -92,11 +92,11 @@ public abstract class IntRangeManager {
          * @param numElements the number of elements to copy from the original
          */
         IntRange(IntRange intRange, int numElements) {
-            this.startId = intRange.startId;
-            this.endId = intRange.endId;
-            this.clients = new ArrayList<ClientRange>(intRange.clients.size());
+            mStartId = intRange.mStartId;
+            mEndId = intRange.mEndId;
+            mClients = new ArrayList<ClientRange>(intRange.mClients.size());
             for (int i=0; i < numElements; i++) {
-                this.clients.add(intRange.clients.get(i));
+                mClients.add(intRange.mClients.get(i));
             }
         }
 
@@ -110,18 +110,18 @@ public abstract class IntRangeManager {
          * @param range the new ClientRange to insert
          */
         void insert(ClientRange range) {
-            int len = clients.size();
+            int len = mClients.size();
             for (int i=0; i < len; i++) {
-                ClientRange nextRange = clients.get(i);
-                if (range.startId <= nextRange.startId) {
+                ClientRange nextRange = mClients.get(i);
+                if (range.mStartId <= nextRange.mStartId) {
                     // ignore duplicate ranges from the same client
                     if (!range.equals(nextRange)) {
-                        clients.add(i, range);
+                        mClients.add(i, range);
                     }
                     return;
                 }
             }
-            clients.add(range);    // append to end of list
+            mClients.add(range);    // append to end of list
         }
     }
 
@@ -129,23 +129,23 @@ public abstract class IntRangeManager {
      * The message id range for a single client.
      */
     private class ClientRange {
-        final int startId;
-        final int endId;
-        final String client;
+        final int mStartId;
+        final int mEndId;
+        final String mClient;
 
         ClientRange(int startId, int endId, String client) {
-            this.startId = startId;
-            this.endId = endId;
-            this.client = client;
+            mStartId = startId;
+            mEndId = endId;
+            mClient = client;
         }
 
         @Override
         public boolean equals(Object o) {
             if (o != null && o instanceof ClientRange) {
                 ClientRange other = (ClientRange) o;
-                return startId == other.startId &&
-                        endId == other.endId &&
-                        client.equals(other.client);
+                return mStartId == other.mStartId &&
+                        mEndId == other.mEndId &&
+                        mClient.equals(other.mClient);
             } else {
                 return false;
             }
@@ -153,7 +153,7 @@ public abstract class IntRangeManager {
 
         @Override
         public int hashCode() {
-            return (startId * 31 + endId) * 31 + client.hashCode();
+            return (mStartId * 31 + mEndId) * 31 + mClient.hashCode();
         }
     }
 
@@ -189,10 +189,10 @@ public abstract class IntRangeManager {
 
         for (int startIndex = 0; startIndex < len; startIndex++) {
             IntRange range = mRanges.get(startIndex);
-            if (startId < range.startId) {
+            if (startId < range.mStartId) {
                 // test if new range completely precedes this range
                 // note that [1, 4] and [5, 6] coalesce to [1, 6]
-                if ((endId + 1) < range.startId) {
+                if ((endId + 1) < range.mStartId) {
                     // insert new int range before previous first range
                     if (tryAddSingleRange(startId, endId, true)) {
                         mRanges.add(startIndex, new IntRange(startId, endId, client));
@@ -200,11 +200,11 @@ public abstract class IntRangeManager {
                     } else {
                         return false;   // failed to update radio
                     }
-                } else if (endId <= range.endId) {
+                } else if (endId <= range.mEndId) {
                     // extend the start of this range
-                    if (tryAddSingleRange(startId, range.startId - 1, true)) {
-                        range.startId = startId;
-                        range.clients.add(0, new ClientRange(startId, endId, client));
+                    if (tryAddSingleRange(startId, range.mStartId - 1, true)) {
+                        range.mStartId = startId;
+                        range.mClients.add(0, new ClientRange(startId, endId, client));
                         return true;
                     } else {
                         return false;   // failed to update radio
@@ -213,13 +213,13 @@ public abstract class IntRangeManager {
                     // find last range that can coalesce into the new combined range
                     for (int endIndex = startIndex+1; endIndex < len; endIndex++) {
                         IntRange endRange = mRanges.get(endIndex);
-                        if ((endId + 1) < endRange.startId) {
+                        if ((endId + 1) < endRange.mStartId) {
                             // try to add entire new range
                             if (tryAddSingleRange(startId, endId, true)) {
-                                range.startId = startId;
-                                range.endId = endId;
+                                range.mStartId = startId;
+                                range.mEndId = endId;
                                 // insert new ClientRange before existing ranges
-                                range.clients.add(0, new ClientRange(startId, endId, client));
+                                range.mClients.add(0, new ClientRange(startId, endId, client));
                                 // coalesce range with following ranges up to endIndex-1
                                 // remove each range after adding its elements, so the index
                                 // of the next range to join is always startIndex+1.
@@ -228,21 +228,21 @@ public abstract class IntRangeManager {
                                 int joinIndex = startIndex + 1;
                                 for (int i = joinIndex; i < endIndex; i++) {
                                     IntRange joinRange = mRanges.get(joinIndex);
-                                    range.clients.addAll(joinRange.clients);
+                                    range.mClients.addAll(joinRange.mClients);
                                     mRanges.remove(joinRange);
                                 }
                                 return true;
                             } else {
                                 return false;   // failed to update radio
                             }
-                        } else if (endId <= endRange.endId) {
+                        } else if (endId <= endRange.mEndId) {
                             // add range from start id to start of last overlapping range,
                             // values from endRange.startId to endId are already enabled
-                            if (tryAddSingleRange(startId, endRange.startId - 1, true)) {
-                                range.startId = startId;
-                                range.endId = endRange.endId;
+                            if (tryAddSingleRange(startId, endRange.mStartId - 1, true)) {
+                                range.mStartId = startId;
+                                range.mEndId = endRange.mEndId;
                                 // insert new ClientRange before existing ranges
-                                range.clients.add(0, new ClientRange(startId, endId, client));
+                                range.mClients.add(0, new ClientRange(startId, endId, client));
                                 // coalesce range with following ranges up to endIndex
                                 // remove each range after adding its elements, so the index
                                 // of the next range to join is always startIndex+1.
@@ -251,7 +251,7 @@ public abstract class IntRangeManager {
                                 int joinIndex = startIndex + 1;
                                 for (int i = joinIndex; i <= endIndex; i++) {
                                     IntRange joinRange = mRanges.get(joinIndex);
-                                    range.clients.addAll(joinRange.clients);
+                                    range.mClients.addAll(joinRange.mClients);
                                     mRanges.remove(joinRange);
                                 }
                                 return true;
@@ -263,10 +263,10 @@ public abstract class IntRangeManager {
 
                     // endId extends past all existing IntRanges: combine them all together
                     if (tryAddSingleRange(startId, endId, true)) {
-                        range.startId = startId;
-                        range.endId = endId;
+                        range.mStartId = startId;
+                        range.mEndId = endId;
                         // insert new ClientRange before existing ranges
-                        range.clients.add(0, new ClientRange(startId, endId, client));
+                        range.mClients.add(0, new ClientRange(startId, endId, client));
                         // coalesce range with following ranges up to len-1
                         // remove each range after adding its elements, so the index
                         // of the next range to join is always startIndex+1.
@@ -275,7 +275,7 @@ public abstract class IntRangeManager {
                         int joinIndex = startIndex + 1;
                         for (int i = joinIndex; i < len; i++) {
                             IntRange joinRange = mRanges.get(joinIndex);
-                            range.clients.addAll(joinRange.clients);
+                            range.mClients.addAll(joinRange.mClients);
                             mRanges.remove(joinRange);
                         }
                         return true;
@@ -283,8 +283,8 @@ public abstract class IntRangeManager {
                         return false;   // failed to update radio
                     }
                 }
-            } else if ((startId + 1) <= range.endId) {
-                if (endId <= range.endId) {
+            } else if ((startId + 1) <= range.mEndId) {
+                if (endId <= range.mEndId) {
                     // completely contained in existing range; no radio changes
                     range.insert(new ClientRange(startId, endId, client));
                     return true;
@@ -293,7 +293,7 @@ public abstract class IntRangeManager {
                     int endIndex = startIndex;
                     for (int testIndex = startIndex+1; testIndex < len; testIndex++) {
                         IntRange testRange = mRanges.get(testIndex);
-                        if ((endId + 1) < testRange.startId) {
+                        if ((endId + 1) < testRange.mStartId) {
                             break;
                         } else {
                             endIndex = testIndex;
@@ -303,8 +303,8 @@ public abstract class IntRangeManager {
                     if (endIndex == startIndex) {
                         // add range from range.endId+1 to endId,
                         // values from startId to range.endId are already enabled
-                        if (tryAddSingleRange(range.endId + 1, endId, true)) {
-                            range.endId = endId;
+                        if (tryAddSingleRange(range.mEndId + 1, endId, true)) {
+                            range.mEndId = endId;
                             range.insert(new ClientRange(startId, endId, client));
                             return true;
                         } else {
@@ -317,9 +317,9 @@ public abstract class IntRangeManager {
                     // if endId > endRange.endId, then enable range from range.endId+1 to endId,
                     // else enable range from range.endId+1 to endRange.startId-1, because
                     // values from endRange.startId to endId have already been added.
-                    int newRangeEndId = (endId <= endRange.endId) ? endRange.startId - 1 : endId;
-                    if (tryAddSingleRange(range.endId + 1, newRangeEndId, true)) {
-                        range.endId = endId;
+                    int newRangeEndId = (endId <= endRange.mEndId) ? endRange.mStartId - 1 : endId;
+                    if (tryAddSingleRange(range.mEndId + 1, newRangeEndId, true)) {
+                        range.mEndId = endId;
                         // insert new ClientRange in place
                         range.insert(new ClientRange(startId, endId, client));
                         // coalesce range with following ranges up to endIndex-1
@@ -330,7 +330,7 @@ public abstract class IntRangeManager {
                         int joinIndex = startIndex + 1;
                         for (int i = joinIndex; i < endIndex; i++) {
                             IntRange joinRange = mRanges.get(joinIndex);
-                            range.clients.addAll(joinRange.clients);
+                            range.mClients.addAll(joinRange.mClients);
                             mRanges.remove(joinRange);
                         }
                         return true;
@@ -365,18 +365,18 @@ public abstract class IntRangeManager {
 
         for (int i=0; i < len; i++) {
             IntRange range = mRanges.get(i);
-            if (startId < range.startId) {
+            if (startId < range.mStartId) {
                 return false;   // not found
-            } else if (endId <= range.endId) {
+            } else if (endId <= range.mEndId) {
                 // found the IntRange that encloses the client range, if any
                 // search for it in the clients list
-                ArrayList<ClientRange> clients = range.clients;
+                ArrayList<ClientRange> clients = range.mClients;
 
                 // handle common case of IntRange containing one ClientRange
                 int crLength = clients.size();
                 if (crLength == 1) {
                     ClientRange cr = clients.get(0);
-                    if (cr.startId == startId && cr.endId == endId && cr.client.equals(client)) {
+                    if (cr.mStartId == startId && cr.mEndId == endId && cr.mClient.equals(client)) {
                         // disable range in radio then remove the entire IntRange
                         if (tryAddSingleRange(startId, endId, false)) {
                             mRanges.remove(i);
@@ -398,18 +398,18 @@ public abstract class IntRangeManager {
 
                 for (int crIndex=0; crIndex < crLength; crIndex++) {
                     ClientRange cr = clients.get(crIndex);
-                    if (cr.startId == startId && cr.endId == endId && cr.client.equals(client)) {
+                    if (cr.mStartId == startId && cr.mEndId == endId && cr.mClient.equals(client)) {
                         // found the ClientRange to remove, check if it's the last in the list
                         if (crIndex == crLength - 1) {
-                            if (range.endId == largestEndId) {
+                            if (range.mEndId == largestEndId) {
                                 // no channels to remove from radio; return success
                                 clients.remove(crIndex);
                                 return true;
                             } else {
                                 // disable the channels at the end and lower the end id
-                                if (tryAddSingleRange(largestEndId + 1, range.endId, false)) {
+                                if (tryAddSingleRange(largestEndId + 1, range.mEndId, false)) {
                                     clients.remove(crIndex);
-                                    range.endId = largestEndId;
+                                    range.mEndId = largestEndId;
                                     return true;
                                 } else {
                                     return false;
@@ -427,15 +427,15 @@ public abstract class IntRangeManager {
                             // the start id of the IntRange.
                             // We know there are at least two ClientRanges in the list,
                             // so clients.get(1) should always succeed.
-                            int nextStartId = clients.get(1).startId;
-                            if (nextStartId != range.startId) {
+                            int nextStartId = clients.get(1).mStartId;
+                            if (nextStartId != range.mStartId) {
                                 startUpdate();
                                 updateStarted = true;
-                                addRange(range.startId, nextStartId - 1, false);
-                                rangeCopy.startId = nextStartId;
+                                addRange(range.mStartId, nextStartId - 1, false);
+                                rangeCopy.mStartId = nextStartId;
                             }
                             // init largestEndId
-                            largestEndId = clients.get(1).endId;
+                            largestEndId = clients.get(1).mEndId;
                         }
 
                         // go through remaining ClientRanges, creating new IntRanges when
@@ -447,20 +447,20 @@ public abstract class IntRangeManager {
                         IntRange currentRange = rangeCopy;
                         for (int nextIndex = crIndex + 1; nextIndex < crLength; nextIndex++) {
                             ClientRange nextCr = clients.get(nextIndex);
-                            if (nextCr.startId > largestEndId + 1) {
+                            if (nextCr.mStartId > largestEndId + 1) {
                                 if (!updateStarted) {
                                     startUpdate();
                                     updateStarted = true;
                                 }
-                                addRange(largestEndId + 1, nextCr.startId - 1, false);
-                                currentRange.endId = largestEndId;
+                                addRange(largestEndId + 1, nextCr.mStartId - 1, false);
+                                currentRange.mEndId = largestEndId;
                                 newRanges.add(currentRange);
                                 currentRange = new IntRange(nextCr);
                             } else {
-                                currentRange.clients.add(nextCr);
+                                currentRange.mClients.add(nextCr);
                             }
-                            if (nextCr.endId > largestEndId) {
-                                largestEndId = nextCr.endId;
+                            if (nextCr.mEndId > largestEndId) {
+                                largestEndId = nextCr.mEndId;
                             }
                         }
 
@@ -471,7 +471,7 @@ public abstract class IntRangeManager {
                                 updateStarted = true;
                             }
                             addRange(largestEndId + 1, endId, false);
-                            currentRange.endId = largestEndId;
+                            currentRange.mEndId = largestEndId;
                         }
                         newRanges.add(currentRange);
 
@@ -485,8 +485,8 @@ public abstract class IntRangeManager {
                         return true;
                     } else {
                         // not the ClientRange to remove; save highest end ID seen so far
-                        if (cr.endId > largestEndId) {
-                            largestEndId = cr.endId;
+                        if (cr.mEndId > largestEndId) {
+                            largestEndId = cr.mEndId;
                         }
                     }
                 }
@@ -507,20 +507,20 @@ public abstract class IntRangeManager {
         Iterator<IntRange> iterator = mRanges.iterator();
         if (iterator.hasNext()) {
             IntRange range = iterator.next();
-            int start = range.startId;
-            int end = range.endId;
+            int start = range.mStartId;
+            int end = range.mEndId;
             // accumulate ranges of [startId, endId]
             while (iterator.hasNext()) {
                 IntRange nextNode = iterator.next();
                 // [startIdA, endIdA], [endIdA + 1, endIdB] -> [startIdA, endIdB]
-                if (nextNode.startId <= (end + 1)) {
-                    if (nextNode.endId > end) {
-                        end = nextNode.endId;
+                if (nextNode.mStartId <= (end + 1)) {
+                    if (nextNode.mEndId > end) {
+                        end = nextNode.mEndId;
                     }
                 } else {
                     addRange(start, end, true);
-                    start = nextNode.startId;
-                    end = nextNode.endId;
+                    start = nextNode.mStartId;
+                    end = nextNode.mEndId;
                 }
             }
             // add final range
index aee471a..2c5eb52 100644 (file)
@@ -42,31 +42,31 @@ public final class MccTable
 {
     static final String LOG_TAG = "MccTable";
 
-    static ArrayList<MccEntry> table;
+    static ArrayList<MccEntry> sTable;
 
     static class MccEntry implements Comparable<MccEntry>
     {
-        int mcc;
-        String iso;
-        int smallestDigitsMnc;
-        String language;
+        int mMcc;
+        String mIso;
+        int mSmallestDigitsMnc;
+        String mLanguage;
 
         MccEntry(int mnc, String iso, int smallestDigitsMCC) {
             this(mnc, iso, smallestDigitsMCC, null);
         }
 
         MccEntry(int mnc, String iso, int smallestDigitsMCC, String language) {
-            this.mcc = mnc;
-            this.iso = iso;
-            this.smallestDigitsMnc = smallestDigitsMCC;
-            this.language = language;
+            mMcc = mnc;
+            mIso = iso;
+            mSmallestDigitsMnc = smallestDigitsMCC;
+            mLanguage = language;
         }
 
 
         @Override
         public int compareTo(MccEntry o)
         {
-            return mcc - o.mcc;
+            return mMcc - o.mMcc;
         }
     }
 
@@ -79,12 +79,12 @@ public final class MccTable
 
         m = new MccEntry(mcc, null, 0);
 
-        index = Collections.binarySearch(table, m);
+        index = Collections.binarySearch(sTable, m);
 
         if (index < 0) {
             return null;
         } else {
-            return table.get(index);
+            return sTable.get(index);
         }
     }
 
@@ -97,14 +97,14 @@ public final class MccTable
         MccEntry entry;
 
         entry = entryForMcc(mcc);
-        if (entry == null || entry.iso == null) {
+        if (entry == null || entry.mIso == null) {
             return null;
         } else {
             Locale locale;
-            if (entry.language == null) {
-                locale = new Locale(entry.iso);
+            if (entry.mLanguage == null) {
+                locale = new Locale(entry.mIso);
             } else {
-                locale = new Locale(entry.language, entry.iso);
+                locale = new Locale(entry.mLanguage, entry.mIso);
             }
             String[] tz = TimeZones.forLocale(locale);
             if (tz.length == 0) return null;
@@ -127,7 +127,7 @@ public final class MccTable
         if (entry == null) {
             return "";
         } else {
-            return entry.iso;
+            return entry.mIso;
         }
     }
 
@@ -144,7 +144,7 @@ public final class MccTable
         if (entry == null) {
             return null;
         } else {
-            return entry.language;
+            return entry.mLanguage;
         }
     }
 
@@ -163,7 +163,7 @@ public final class MccTable
         if (entry == null) {
             return 2;
         } else {
-            return entry.smallestDigitsMnc;
+            return entry.mSmallestDigitsMnc;
         }
     }
 
@@ -314,7 +314,7 @@ public final class MccTable
     }
 
     static {
-        table = new ArrayList<MccEntry>(240);
+        sTable = new ArrayList<MccEntry>(240);
 
 
         /*
@@ -332,242 +332,242 @@ public final class MccTable
          *
          */
 
-               table.add(new MccEntry(202,"gr",2));    //Greece
-               table.add(new MccEntry(204,"nl",2,"nl"));       //Netherlands (Kingdom of the)
-               table.add(new MccEntry(206,"be",2));    //Belgium
-               table.add(new MccEntry(208,"fr",2,"fr"));       //France
-               table.add(new MccEntry(212,"mc",2));    //Monaco (Principality of)
-               table.add(new MccEntry(213,"ad",2));    //Andorra (Principality of)
-               table.add(new MccEntry(214,"es",2,"es"));       //Spain
-               table.add(new MccEntry(216,"hu",2));    //Hungary (Republic of)
-               table.add(new MccEntry(218,"ba",2));    //Bosnia and Herzegovina
-               table.add(new MccEntry(219,"hr",2));    //Croatia (Republic of)
-               table.add(new MccEntry(220,"rs",2));    //Serbia and Montenegro
-               table.add(new MccEntry(222,"it",2,"it"));       //Italy
-               table.add(new MccEntry(225,"va",2,"it"));       //Vatican City State
-               table.add(new MccEntry(226,"ro",2));    //Romania
-               table.add(new MccEntry(228,"ch",2,"de"));       //Switzerland (Confederation of)
-               table.add(new MccEntry(230,"cz",2,"cs"));       //Czech Republic
-               table.add(new MccEntry(231,"sk",2));    //Slovak Republic
-               table.add(new MccEntry(232,"at",2,"de"));       //Austria
-               table.add(new MccEntry(234,"gb",2,"en"));       //United Kingdom of Great Britain and Northern Ireland
-               table.add(new MccEntry(235,"gb",2,"en"));       //United Kingdom of Great Britain and Northern Ireland
-               table.add(new MccEntry(238,"dk",2));    //Denmark
-               table.add(new MccEntry(240,"se",2));    //Sweden
-               table.add(new MccEntry(242,"no",2));    //Norway
-               table.add(new MccEntry(244,"fi",2));    //Finland
-               table.add(new MccEntry(246,"lt",2));    //Lithuania (Republic of)
-               table.add(new MccEntry(247,"lv",2));    //Latvia (Republic of)
-               table.add(new MccEntry(248,"ee",2));    //Estonia (Republic of)
-               table.add(new MccEntry(250,"ru",2));    //Russian Federation
-               table.add(new MccEntry(255,"ua",2));    //Ukraine
-               table.add(new MccEntry(257,"by",2));    //Belarus (Republic of)
-               table.add(new MccEntry(259,"md",2));    //Moldova (Republic of)
-               table.add(new MccEntry(260,"pl",2));    //Poland (Republic of)
-               table.add(new MccEntry(262,"de",2,"de"));       //Germany (Federal Republic of)
-               table.add(new MccEntry(266,"gi",2));    //Gibraltar
-               table.add(new MccEntry(268,"pt",2));    //Portugal
-               table.add(new MccEntry(270,"lu",2));    //Luxembourg
-               table.add(new MccEntry(272,"ie",2,"en"));       //Ireland
-               table.add(new MccEntry(274,"is",2));    //Iceland
-               table.add(new MccEntry(276,"al",2));    //Albania (Republic of)
-               table.add(new MccEntry(278,"mt",2));    //Malta
-               table.add(new MccEntry(280,"cy",2));    //Cyprus (Republic of)
-               table.add(new MccEntry(282,"ge",2));    //Georgia
-               table.add(new MccEntry(283,"am",2));    //Armenia (Republic of)
-               table.add(new MccEntry(284,"bg",2));    //Bulgaria (Republic of)
-               table.add(new MccEntry(286,"tr",2));    //Turkey
-               table.add(new MccEntry(288,"fo",2));    //Faroe Islands
-                table.add(new MccEntry(289,"ge",2));    //Abkhazia (Georgia)
-               table.add(new MccEntry(290,"gl",2));    //Greenland (Denmark)
-               table.add(new MccEntry(292,"sm",2));    //San Marino (Republic of)
-               table.add(new MccEntry(293,"si",2));    //Slovenia (Republic of)
-                table.add(new MccEntry(294,"mk",2));   //The Former Yugoslav Republic of Macedonia
-               table.add(new MccEntry(295,"li",2));    //Liechtenstein (Principality of)
-                table.add(new MccEntry(297,"me",2));    //Montenegro (Republic of)
-               table.add(new MccEntry(302,"ca",3,"")); //Canada
-               table.add(new MccEntry(308,"pm",2));    //Saint Pierre and Miquelon (Collectivit territoriale de la Rpublique franaise)
-               table.add(new MccEntry(310,"us",3,"en"));       //United States of America
-               table.add(new MccEntry(311,"us",3,"en"));       //United States of America
-               table.add(new MccEntry(312,"us",3,"en"));       //United States of America
-               table.add(new MccEntry(313,"us",3,"en"));       //United States of America
-               table.add(new MccEntry(314,"us",3,"en"));       //United States of America
-               table.add(new MccEntry(315,"us",3,"en"));       //United States of America
-               table.add(new MccEntry(316,"us",3,"en"));       //United States of America
-               table.add(new MccEntry(330,"pr",2));    //Puerto Rico
-               table.add(new MccEntry(332,"vi",2));    //United States Virgin Islands
-               table.add(new MccEntry(334,"mx",3));    //Mexico
-               table.add(new MccEntry(338,"jm",3));    //Jamaica
-               table.add(new MccEntry(340,"gp",2));    //Guadeloupe (French Department of)
-               table.add(new MccEntry(342,"bb",3));    //Barbados
-               table.add(new MccEntry(344,"ag",3));    //Antigua and Barbuda
-               table.add(new MccEntry(346,"ky",3));    //Cayman Islands
-               table.add(new MccEntry(348,"vg",3));    //British Virgin Islands
-               table.add(new MccEntry(350,"bm",2));    //Bermuda
-               table.add(new MccEntry(352,"gd",2));    //Grenada
-               table.add(new MccEntry(354,"ms",2));    //Montserrat
-               table.add(new MccEntry(356,"kn",2));    //Saint Kitts and Nevis
-               table.add(new MccEntry(358,"lc",2));    //Saint Lucia
-               table.add(new MccEntry(360,"vc",2));    //Saint Vincent and the Grenadines
-               table.add(new MccEntry(362,"ai",2));    //Netherlands Antilles
-               table.add(new MccEntry(363,"aw",2));    //Aruba
-               table.add(new MccEntry(364,"bs",2));    //Bahamas (Commonwealth of the)
-               table.add(new MccEntry(365,"ai",3));    //Anguilla
-               table.add(new MccEntry(366,"dm",2));    //Dominica (Commonwealth of)
-               table.add(new MccEntry(368,"cu",2));    //Cuba
-               table.add(new MccEntry(370,"do",2));    //Dominican Republic
-               table.add(new MccEntry(372,"ht",2));    //Haiti (Republic of)
-               table.add(new MccEntry(374,"tt",2));    //Trinidad and Tobago
-               table.add(new MccEntry(376,"tc",2));    //Turks and Caicos Islands
-               table.add(new MccEntry(400,"az",2));    //Azerbaijani Republic
-               table.add(new MccEntry(401,"kz",2));    //Kazakhstan (Republic of)
-               table.add(new MccEntry(402,"bt",2));    //Bhutan (Kingdom of)
-               table.add(new MccEntry(404,"in",2));    //India (Republic of)
-               table.add(new MccEntry(405,"in",2));    //India (Republic of)
-               table.add(new MccEntry(410,"pk",2));    //Pakistan (Islamic Republic of)
-               table.add(new MccEntry(412,"af",2));    //Afghanistan
-               table.add(new MccEntry(413,"lk",2));    //Sri Lanka (Democratic Socialist Republic of)
-               table.add(new MccEntry(414,"mm",2));    //Myanmar (Union of)
-               table.add(new MccEntry(415,"lb",2));    //Lebanon
-               table.add(new MccEntry(416,"jo",2));    //Jordan (Hashemite Kingdom of)
-               table.add(new MccEntry(417,"sy",2));    //Syrian Arab Republic
-               table.add(new MccEntry(418,"iq",2));    //Iraq (Republic of)
-               table.add(new MccEntry(419,"kw",2));    //Kuwait (State of)
-               table.add(new MccEntry(420,"sa",2));    //Saudi Arabia (Kingdom of)
-               table.add(new MccEntry(421,"ye",2));    //Yemen (Republic of)
-               table.add(new MccEntry(422,"om",2));    //Oman (Sultanate of)
-                table.add(new MccEntry(423,"ps",2));    //Palestine
-               table.add(new MccEntry(424,"ae",2));    //United Arab Emirates
-               table.add(new MccEntry(425,"il",2));    //Israel (State of)
-               table.add(new MccEntry(426,"bh",2));    //Bahrain (Kingdom of)
-               table.add(new MccEntry(427,"qa",2));    //Qatar (State of)
-               table.add(new MccEntry(428,"mn",2));    //Mongolia
-               table.add(new MccEntry(429,"np",2));    //Nepal
-               table.add(new MccEntry(430,"ae",2));    //United Arab Emirates
-               table.add(new MccEntry(431,"ae",2));    //United Arab Emirates
-               table.add(new MccEntry(432,"ir",2));    //Iran (Islamic Republic of)
-               table.add(new MccEntry(434,"uz",2));    //Uzbekistan (Republic of)
-               table.add(new MccEntry(436,"tj",2));    //Tajikistan (Republic of)
-               table.add(new MccEntry(437,"kg",2));    //Kyrgyz Republic
-               table.add(new MccEntry(438,"tm",2));    //Turkmenistan
-               table.add(new MccEntry(440,"jp",2,"ja"));       //Japan
-               table.add(new MccEntry(441,"jp",2,"ja"));       //Japan
-               table.add(new MccEntry(450,"kr",2,"ko"));       //Korea (Republic of)
-               table.add(new MccEntry(452,"vn",2));    //Viet Nam (Socialist Republic of)
-               table.add(new MccEntry(454,"hk",2));    //"Hong Kong, China"
-               table.add(new MccEntry(455,"mo",2));    //"Macao, China"
-               table.add(new MccEntry(456,"kh",2));    //Cambodia (Kingdom of)
-               table.add(new MccEntry(457,"la",2));    //Lao People's Democratic Republic
-               table.add(new MccEntry(460,"cn",2,"zh"));       //China (People's Republic of)
-               table.add(new MccEntry(461,"cn",2,"zh"));       //China (People's Republic of)
-               table.add(new MccEntry(466,"tw",2));    //"Taiwan, China"
-               table.add(new MccEntry(467,"kp",2));    //Democratic People's Republic of Korea
-               table.add(new MccEntry(470,"bd",2));    //Bangladesh (People's Republic of)
-               table.add(new MccEntry(472,"mv",2));    //Maldives (Republic of)
-               table.add(new MccEntry(502,"my",2));    //Malaysia
-               table.add(new MccEntry(505,"au",2,"en"));       //Australia
-               table.add(new MccEntry(510,"id",2));    //Indonesia (Republic of)
-               table.add(new MccEntry(514,"tl",2));    //Democratic Republic of Timor-Leste
-               table.add(new MccEntry(515,"ph",2));    //Philippines (Republic of the)
-               table.add(new MccEntry(520,"th",2));    //Thailand
-               table.add(new MccEntry(525,"sg",2,"en"));       //Singapore (Republic of)
-               table.add(new MccEntry(528,"bn",2));    //Brunei Darussalam
-               table.add(new MccEntry(530,"nz",2, "en"));      //New Zealand
-               table.add(new MccEntry(534,"mp",2));    //Northern Mariana Islands (Commonwealth of the)
-               table.add(new MccEntry(535,"gu",2));    //Guam
-               table.add(new MccEntry(536,"nr",2));    //Nauru (Republic of)
-               table.add(new MccEntry(537,"pg",2));    //Papua New Guinea
-               table.add(new MccEntry(539,"to",2));    //Tonga (Kingdom of)
-               table.add(new MccEntry(540,"sb",2));    //Solomon Islands
-               table.add(new MccEntry(541,"vu",2));    //Vanuatu (Republic of)
-               table.add(new MccEntry(542,"fj",2));    //Fiji (Republic of)
-               table.add(new MccEntry(543,"wf",2));    //Wallis and Futuna (Territoire franais d'outre-mer)
-               table.add(new MccEntry(544,"as",2));    //American Samoa
-               table.add(new MccEntry(545,"ki",2));    //Kiribati (Republic of)
-               table.add(new MccEntry(546,"nc",2));    //New Caledonia (Territoire franais d'outre-mer)
-               table.add(new MccEntry(547,"pf",2));    //French Polynesia (Territoire franais d'outre-mer)
-               table.add(new MccEntry(548,"ck",2));    //Cook Islands
-               table.add(new MccEntry(549,"ws",2));    //Samoa (Independent State of)
-               table.add(new MccEntry(550,"fm",2));    //Micronesia (Federated States of)
-               table.add(new MccEntry(551,"mh",2));    //Marshall Islands (Republic of the)
-               table.add(new MccEntry(552,"pw",2));    //Palau (Republic of)
-               table.add(new MccEntry(602,"eg",2));    //Egypt (Arab Republic of)
-               table.add(new MccEntry(603,"dz",2));    //Algeria (People's Democratic Republic of)
-               table.add(new MccEntry(604,"ma",2));    //Morocco (Kingdom of)
-               table.add(new MccEntry(605,"tn",2));    //Tunisia
-               table.add(new MccEntry(606,"ly",2));    //Libya (Socialist People's Libyan Arab Jamahiriya)
-               table.add(new MccEntry(607,"gm",2));    //Gambia (Republic of the)
-               table.add(new MccEntry(608,"sn",2));    //Senegal (Republic of)
-               table.add(new MccEntry(609,"mr",2));    //Mauritania (Islamic Republic of)
-               table.add(new MccEntry(610,"ml",2));    //Mali (Republic of)
-               table.add(new MccEntry(611,"gn",2));    //Guinea (Republic of)
-               table.add(new MccEntry(612,"ci",2));    //Cte d'Ivoire (Republic of)
-               table.add(new MccEntry(613,"bf",2));    //Burkina Faso
-               table.add(new MccEntry(614,"ne",2));    //Niger (Republic of the)
-               table.add(new MccEntry(615,"tg",2));    //Togolese Republic
-               table.add(new MccEntry(616,"bj",2));    //Benin (Republic of)
-               table.add(new MccEntry(617,"mu",2));    //Mauritius (Republic of)
-               table.add(new MccEntry(618,"lr",2));    //Liberia (Republic of)
-               table.add(new MccEntry(619,"sl",2));    //Sierra Leone
-               table.add(new MccEntry(620,"gh",2));    //Ghana
-               table.add(new MccEntry(621,"ng",2));    //Nigeria (Federal Republic of)
-               table.add(new MccEntry(622,"td",2));    //Chad (Republic of)
-               table.add(new MccEntry(623,"cf",2));    //Central African Republic
-               table.add(new MccEntry(624,"cm",2));    //Cameroon (Republic of)
-               table.add(new MccEntry(625,"cv",2));    //Cape Verde (Republic of)
-               table.add(new MccEntry(626,"st",2));    //Sao Tome and Principe (Democratic Republic of)
-               table.add(new MccEntry(627,"gq",2));    //Equatorial Guinea (Republic of)
-               table.add(new MccEntry(628,"ga",2));    //Gabonese Republic
-               table.add(new MccEntry(629,"cg",2));    //Congo (Republic of the)
-               table.add(new MccEntry(630,"cg",2));    //Democratic Republic of the Congo
-               table.add(new MccEntry(631,"ao",2));    //Angola (Republic of)
-               table.add(new MccEntry(632,"gw",2));    //Guinea-Bissau (Republic of)
-               table.add(new MccEntry(633,"sc",2));    //Seychelles (Republic of)
-               table.add(new MccEntry(634,"sd",2));    //Sudan (Republic of the)
-               table.add(new MccEntry(635,"rw",2));    //Rwanda (Republic of)
-               table.add(new MccEntry(636,"et",2));    //Ethiopia (Federal Democratic Republic of)
-               table.add(new MccEntry(637,"so",2));    //Somali Democratic Republic
-               table.add(new MccEntry(638,"dj",2));    //Djibouti (Republic of)
-               table.add(new MccEntry(639,"ke",2));    //Kenya (Republic of)
-               table.add(new MccEntry(640,"tz",2));    //Tanzania (United Republic of)
-               table.add(new MccEntry(641,"ug",2));    //Uganda (Republic of)
-               table.add(new MccEntry(642,"bi",2));    //Burundi (Republic of)
-               table.add(new MccEntry(643,"mz",2));    //Mozambique (Republic of)
-               table.add(new MccEntry(645,"zm",2));    //Zambia (Republic of)
-               table.add(new MccEntry(646,"mg",2));    //Madagascar (Republic of)
-               table.add(new MccEntry(647,"re",2));    //Reunion (French Department of)
-               table.add(new MccEntry(648,"zw",2));    //Zimbabwe (Republic of)
-               table.add(new MccEntry(649,"na",2));    //Namibia (Republic of)
-               table.add(new MccEntry(650,"mw",2));    //Malawi
-               table.add(new MccEntry(651,"ls",2));    //Lesotho (Kingdom of)
-               table.add(new MccEntry(652,"bw",2));    //Botswana (Republic of)
-               table.add(new MccEntry(653,"sz",2));    //Swaziland (Kingdom of)
-               table.add(new MccEntry(654,"km",2));    //Comoros (Union of the)
-               table.add(new MccEntry(655,"za",2,"en"));       //South Africa (Republic of)
-               table.add(new MccEntry(657,"er",2));    //Eritrea
-               table.add(new MccEntry(702,"bz",2));    //Belize
-               table.add(new MccEntry(704,"gt",2));    //Guatemala (Republic of)
-               table.add(new MccEntry(706,"sv",2));    //El Salvador (Republic of)
-               table.add(new MccEntry(708,"hn",3));    //Honduras (Republic of)
-               table.add(new MccEntry(710,"ni",2));    //Nicaragua
-               table.add(new MccEntry(712,"cr",2));    //Costa Rica
-               table.add(new MccEntry(714,"pa",2));    //Panama (Republic of)
-               table.add(new MccEntry(716,"pe",2));    //Peru
-               table.add(new MccEntry(722,"ar",3));    //Argentine Republic
-               table.add(new MccEntry(724,"br",2));    //Brazil (Federative Republic of)
-               table.add(new MccEntry(730,"cl",2));    //Chile
-               table.add(new MccEntry(732,"co",3));    //Colombia (Republic of)
-               table.add(new MccEntry(734,"ve",2));    //Venezuela (Bolivarian Republic of)
-               table.add(new MccEntry(736,"bo",2));    //Bolivia (Republic of)
-               table.add(new MccEntry(738,"gy",2));    //Guyana
-               table.add(new MccEntry(740,"ec",2));    //Ecuador
-               table.add(new MccEntry(742,"gf",2));    //French Guiana (French Department of)
-               table.add(new MccEntry(744,"py",2));    //Paraguay (Republic of)
-               table.add(new MccEntry(746,"sr",2));    //Suriname (Republic of)
-               table.add(new MccEntry(748,"uy",2));    //Uruguay (Eastern Republic of)
-               table.add(new MccEntry(750,"fk",2));    //Falkland Islands (Malvinas)
+               sTable.add(new MccEntry(202,"gr",2));   //Greece
+               sTable.add(new MccEntry(204,"nl",2,"nl"));      //Netherlands (Kingdom of the)
+               sTable.add(new MccEntry(206,"be",2));   //Belgium
+               sTable.add(new MccEntry(208,"fr",2,"fr"));      //France
+               sTable.add(new MccEntry(212,"mc",2));   //Monaco (Principality of)
+               sTable.add(new MccEntry(213,"ad",2));   //Andorra (Principality of)
+               sTable.add(new MccEntry(214,"es",2,"es"));      //Spain
+               sTable.add(new MccEntry(216,"hu",2));   //Hungary (Republic of)
+               sTable.add(new MccEntry(218,"ba",2));   //Bosnia and Herzegovina
+               sTable.add(new MccEntry(219,"hr",2));   //Croatia (Republic of)
+               sTable.add(new MccEntry(220,"rs",2));   //Serbia and Montenegro
+               sTable.add(new MccEntry(222,"it",2,"it"));      //Italy
+               sTable.add(new MccEntry(225,"va",2,"it"));      //Vatican City State
+               sTable.add(new MccEntry(226,"ro",2));   //Romania
+               sTable.add(new MccEntry(228,"ch",2,"de"));      //Switzerland (Confederation of)
+               sTable.add(new MccEntry(230,"cz",2,"cs"));      //Czech Republic
+               sTable.add(new MccEntry(231,"sk",2));   //Slovak Republic
+               sTable.add(new MccEntry(232,"at",2,"de"));      //Austria
+               sTable.add(new MccEntry(234,"gb",2,"en"));      //United Kingdom of Great Britain and Northern Ireland
+               sTable.add(new MccEntry(235,"gb",2,"en"));      //United Kingdom of Great Britain and Northern Ireland
+               sTable.add(new MccEntry(238,"dk",2));   //Denmark
+               sTable.add(new MccEntry(240,"se",2));   //Sweden
+               sTable.add(new MccEntry(242,"no",2));   //Norway
+               sTable.add(new MccEntry(244,"fi",2));   //Finland
+               sTable.add(new MccEntry(246,"lt",2));   //Lithuania (Republic of)
+               sTable.add(new MccEntry(247,"lv",2));   //Latvia (Republic of)
+               sTable.add(new MccEntry(248,"ee",2));   //Estonia (Republic of)
+               sTable.add(new MccEntry(250,"ru",2));   //Russian Federation
+               sTable.add(new MccEntry(255,"ua",2));   //Ukraine
+               sTable.add(new MccEntry(257,"by",2));   //Belarus (Republic of)
+               sTable.add(new MccEntry(259,"md",2));   //Moldova (Republic of)
+               sTable.add(new MccEntry(260,"pl",2));   //Poland (Republic of)
+               sTable.add(new MccEntry(262,"de",2,"de"));      //Germany (Federal Republic of)
+               sTable.add(new MccEntry(266,"gi",2));   //Gibraltar
+               sTable.add(new MccEntry(268,"pt",2));   //Portugal
+               sTable.add(new MccEntry(270,"lu",2));   //Luxembourg
+               sTable.add(new MccEntry(272,"ie",2,"en"));      //Ireland
+               sTable.add(new MccEntry(274,"is",2));   //Iceland
+               sTable.add(new MccEntry(276,"al",2));   //Albania (Republic of)
+               sTable.add(new MccEntry(278,"mt",2));   //Malta
+               sTable.add(new MccEntry(280,"cy",2));   //Cyprus (Republic of)
+               sTable.add(new MccEntry(282,"ge",2));   //Georgia
+               sTable.add(new MccEntry(283,"am",2));   //Armenia (Republic of)
+               sTable.add(new MccEntry(284,"bg",2));   //Bulgaria (Republic of)
+               sTable.add(new MccEntry(286,"tr",2));   //Turkey
+               sTable.add(new MccEntry(288,"fo",2));   //Faroe Islands
+                sTable.add(new MccEntry(289,"ge",2));    //Abkhazia (Georgia)
+               sTable.add(new MccEntry(290,"gl",2));   //Greenland (Denmark)
+               sTable.add(new MccEntry(292,"sm",2));   //San Marino (Republic of)
+               sTable.add(new MccEntry(293,"si",2));   //Slovenia (Republic of)
+                sTable.add(new MccEntry(294,"mk",2));   //The Former Yugoslav Republic of Macedonia
+               sTable.add(new MccEntry(295,"li",2));   //Liechtenstein (Principality of)
+                sTable.add(new MccEntry(297,"me",2));    //Montenegro (Republic of)
+               sTable.add(new MccEntry(302,"ca",3,""));        //Canada
+               sTable.add(new MccEntry(308,"pm",2));   //Saint Pierre and Miquelon (Collectivit territoriale de la Rpublique franaise)
+               sTable.add(new MccEntry(310,"us",3,"en"));      //United States of America
+               sTable.add(new MccEntry(311,"us",3,"en"));      //United States of America
+               sTable.add(new MccEntry(312,"us",3,"en"));      //United States of America
+               sTable.add(new MccEntry(313,"us",3,"en"));      //United States of America
+               sTable.add(new MccEntry(314,"us",3,"en"));      //United States of America
+               sTable.add(new MccEntry(315,"us",3,"en"));      //United States of America
+               sTable.add(new MccEntry(316,"us",3,"en"));      //United States of America
+               sTable.add(new MccEntry(330,"pr",2));   //Puerto Rico
+               sTable.add(new MccEntry(332,"vi",2));   //United States Virgin Islands
+               sTable.add(new MccEntry(334,"mx",3));   //Mexico
+               sTable.add(new MccEntry(338,"jm",3));   //Jamaica
+               sTable.add(new MccEntry(340,"gp",2));   //Guadeloupe (French Department of)
+               sTable.add(new MccEntry(342,"bb",3));   //Barbados
+               sTable.add(new MccEntry(344,"ag",3));   //Antigua and Barbuda
+               sTable.add(new MccEntry(346,"ky",3));   //Cayman Islands
+               sTable.add(new MccEntry(348,"vg",3));   //British Virgin Islands
+               sTable.add(new MccEntry(350,"bm",2));   //Bermuda
+               sTable.add(new MccEntry(352,"gd",2));   //Grenada
+               sTable.add(new MccEntry(354,"ms",2));   //Montserrat
+               sTable.add(new MccEntry(356,"kn",2));   //Saint Kitts and Nevis
+               sTable.add(new MccEntry(358,"lc",2));   //Saint Lucia
+               sTable.add(new MccEntry(360,"vc",2));   //Saint Vincent and the Grenadines
+               sTable.add(new MccEntry(362,"ai",2));   //Netherlands Antilles
+               sTable.add(new MccEntry(363,"aw",2));   //Aruba
+               sTable.add(new MccEntry(364,"bs",2));   //Bahamas (Commonwealth of the)
+               sTable.add(new MccEntry(365,"ai",3));   //Anguilla
+               sTable.add(new MccEntry(366,"dm",2));   //Dominica (Commonwealth of)
+               sTable.add(new MccEntry(368,"cu",2));   //Cuba
+               sTable.add(new MccEntry(370,"do",2));   //Dominican Republic
+               sTable.add(new MccEntry(372,"ht",2));   //Haiti (Republic of)
+               sTable.add(new MccEntry(374,"tt",2));   //Trinidad and Tobago
+               sTable.add(new MccEntry(376,"tc",2));   //Turks and Caicos Islands
+               sTable.add(new MccEntry(400,"az",2));   //Azerbaijani Republic
+               sTable.add(new MccEntry(401,"kz",2));   //Kazakhstan (Republic of)
+               sTable.add(new MccEntry(402,"bt",2));   //Bhutan (Kingdom of)
+               sTable.add(new MccEntry(404,"in",2));   //India (Republic of)
+               sTable.add(new MccEntry(405,"in",2));   //India (Republic of)
+               sTable.add(new MccEntry(410,"pk",2));   //Pakistan (Islamic Republic of)
+               sTable.add(new MccEntry(412,"af",2));   //Afghanistan
+               sTable.add(new MccEntry(413,"lk",2));   //Sri Lanka (Democratic Socialist Republic of)
+               sTable.add(new MccEntry(414,"mm",2));   //Myanmar (Union of)
+               sTable.add(new MccEntry(415,"lb",2));   //Lebanon
+               sTable.add(new MccEntry(416,"jo",2));   //Jordan (Hashemite Kingdom of)
+               sTable.add(new MccEntry(417,"sy",2));   //Syrian Arab Republic
+               sTable.add(new MccEntry(418,"iq",2));   //Iraq (Republic of)
+               sTable.add(new MccEntry(419,"kw",2));   //Kuwait (State of)
+               sTable.add(new MccEntry(420,"sa",2));   //Saudi Arabia (Kingdom of)
+               sTable.add(new MccEntry(421,"ye",2));   //Yemen (Republic of)
+               sTable.add(new MccEntry(422,"om",2));   //Oman (Sultanate of)
+                sTable.add(new MccEntry(423,"ps",2));    //Palestine
+               sTable.add(new MccEntry(424,"ae",2));   //United Arab Emirates
+               sTable.add(new MccEntry(425,"il",2));   //Israel (State of)
+               sTable.add(new MccEntry(426,"bh",2));   //Bahrain (Kingdom of)
+               sTable.add(new MccEntry(427,"qa",2));   //Qatar (State of)
+               sTable.add(new MccEntry(428,"mn",2));   //Mongolia
+               sTable.add(new MccEntry(429,"np",2));   //Nepal
+               sTable.add(new MccEntry(430,"ae",2));   //United Arab Emirates
+               sTable.add(new MccEntry(431,"ae",2));   //United Arab Emirates
+               sTable.add(new MccEntry(432,"ir",2));   //Iran (Islamic Republic of)
+               sTable.add(new MccEntry(434,"uz",2));   //Uzbekistan (Republic of)
+               sTable.add(new MccEntry(436,"tj",2));   //Tajikistan (Republic of)
+               sTable.add(new MccEntry(437,"kg",2));   //Kyrgyz Republic
+               sTable.add(new MccEntry(438,"tm",2));   //Turkmenistan
+               sTable.add(new MccEntry(440,"jp",2,"ja"));      //Japan
+               sTable.add(new MccEntry(441,"jp",2,"ja"));      //Japan
+               sTable.add(new MccEntry(450,"kr",2,"ko"));      //Korea (Republic of)
+               sTable.add(new MccEntry(452,"vn",2));   //Viet Nam (Socialist Republic of)
+               sTable.add(new MccEntry(454,"hk",2));   //"Hong Kong, China"
+               sTable.add(new MccEntry(455,"mo",2));   //"Macao, China"
+               sTable.add(new MccEntry(456,"kh",2));   //Cambodia (Kingdom of)
+               sTable.add(new MccEntry(457,"la",2));   //Lao People's Democratic Republic
+               sTable.add(new MccEntry(460,"cn",2,"zh"));      //China (People's Republic of)
+               sTable.add(new MccEntry(461,"cn",2,"zh"));      //China (People's Republic of)
+               sTable.add(new MccEntry(466,"tw",2));   //"Taiwan, China"
+               sTable.add(new MccEntry(467,"kp",2));   //Democratic People's Republic of Korea
+               sTable.add(new MccEntry(470,"bd",2));   //Bangladesh (People's Republic of)
+               sTable.add(new MccEntry(472,"mv",2));   //Maldives (Republic of)
+               sTable.add(new MccEntry(502,"my",2));   //Malaysia
+               sTable.add(new MccEntry(505,"au",2,"en"));      //Australia
+               sTable.add(new MccEntry(510,"id",2));   //Indonesia (Republic of)
+               sTable.add(new MccEntry(514,"tl",2));   //Democratic Republic of Timor-Leste
+               sTable.add(new MccEntry(515,"ph",2));   //Philippines (Republic of the)
+               sTable.add(new MccEntry(520,"th",2));   //Thailand
+               sTable.add(new MccEntry(525,"sg",2,"en"));      //Singapore (Republic of)
+               sTable.add(new MccEntry(528,"bn",2));   //Brunei Darussalam
+               sTable.add(new MccEntry(530,"nz",2, "en"));     //New Zealand
+               sTable.add(new MccEntry(534,"mp",2));   //Northern Mariana Islands (Commonwealth of the)
+               sTable.add(new MccEntry(535,"gu",2));   //Guam
+               sTable.add(new MccEntry(536,"nr",2));   //Nauru (Republic of)
+               sTable.add(new MccEntry(537,"pg",2));   //Papua New Guinea
+               sTable.add(new MccEntry(539,"to",2));   //Tonga (Kingdom of)
+               sTable.add(new MccEntry(540,"sb",2));   //Solomon Islands
+               sTable.add(new MccEntry(541,"vu",2));   //Vanuatu (Republic of)
+               sTable.add(new MccEntry(542,"fj",2));   //Fiji (Republic of)
+               sTable.add(new MccEntry(543,"wf",2));   //Wallis and Futuna (Territoire franais d'outre-mer)
+               sTable.add(new MccEntry(544,"as",2));   //American Samoa
+               sTable.add(new MccEntry(545,"ki",2));   //Kiribati (Republic of)
+               sTable.add(new MccEntry(546,"nc",2));   //New Caledonia (Territoire franais d'outre-mer)
+               sTable.add(new MccEntry(547,"pf",2));   //French Polynesia (Territoire franais d'outre-mer)
+               sTable.add(new MccEntry(548,"ck",2));   //Cook Islands
+               sTable.add(new MccEntry(549,"ws",2));   //Samoa (Independent State of)
+               sTable.add(new MccEntry(550,"fm",2));   //Micronesia (Federated States of)
+               sTable.add(new MccEntry(551,"mh",2));   //Marshall Islands (Republic of the)
+               sTable.add(new MccEntry(552,"pw",2));   //Palau (Republic of)
+               sTable.add(new MccEntry(602,"eg",2));   //Egypt (Arab Republic of)
+               sTable.add(new MccEntry(603,"dz",2));   //Algeria (People's Democratic Republic of)
+               sTable.add(new MccEntry(604,"ma",2));   //Morocco (Kingdom of)
+               sTable.add(new MccEntry(605,"tn",2));   //Tunisia
+               sTable.add(new MccEntry(606,"ly",2));   //Libya (Socialist People's Libyan Arab Jamahiriya)
+               sTable.add(new MccEntry(607,"gm",2));   //Gambia (Republic of the)
+               sTable.add(new MccEntry(608,"sn",2));   //Senegal (Republic of)
+               sTable.add(new MccEntry(609,"mr",2));   //Mauritania (Islamic Republic of)
+               sTable.add(new MccEntry(610,"ml",2));   //Mali (Republic of)
+               sTable.add(new MccEntry(611,"gn",2));   //Guinea (Republic of)
+               sTable.add(new MccEntry(612,"ci",2));   //Cte d'Ivoire (Republic of)
+               sTable.add(new MccEntry(613,"bf",2));   //Burkina Faso
+               sTable.add(new MccEntry(614,"ne",2));   //Niger (Republic of the)
+               sTable.add(new MccEntry(615,"tg",2));   //Togolese Republic
+               sTable.add(new MccEntry(616,"bj",2));   //Benin (Republic of)
+               sTable.add(new MccEntry(617,"mu",2));   //Mauritius (Republic of)
+               sTable.add(new MccEntry(618,"lr",2));   //Liberia (Republic of)
+               sTable.add(new MccEntry(619,"sl",2));   //Sierra Leone
+               sTable.add(new MccEntry(620,"gh",2));   //Ghana
+               sTable.add(new MccEntry(621,"ng",2));   //Nigeria (Federal Republic of)
+               sTable.add(new MccEntry(622,"td",2));   //Chad (Republic of)
+               sTable.add(new MccEntry(623,"cf",2));   //Central African Republic
+               sTable.add(new MccEntry(624,"cm",2));   //Cameroon (Republic of)
+               sTable.add(new MccEntry(625,"cv",2));   //Cape Verde (Republic of)
+               sTable.add(new MccEntry(626,"st",2));   //Sao Tome and Principe (Democratic Republic of)
+               sTable.add(new MccEntry(627,"gq",2));   //Equatorial Guinea (Republic of)
+               sTable.add(new MccEntry(628,"ga",2));   //Gabonese Republic
+               sTable.add(new MccEntry(629,"cg",2));   //Congo (Republic of the)
+               sTable.add(new MccEntry(630,"cg",2));   //Democratic Republic of the Congo
+               sTable.add(new MccEntry(631,"ao",2));   //Angola (Republic of)
+               sTable.add(new MccEntry(632,"gw",2));   //Guinea-Bissau (Republic of)
+               sTable.add(new MccEntry(633,"sc",2));   //Seychelles (Republic of)
+               sTable.add(new MccEntry(634,"sd",2));   //Sudan (Republic of the)
+               sTable.add(new MccEntry(635,"rw",2));   //Rwanda (Republic of)
+               sTable.add(new MccEntry(636,"et",2));   //Ethiopia (Federal Democratic Republic of)
+               sTable.add(new MccEntry(637,"so",2));   //Somali Democratic Republic
+               sTable.add(new MccEntry(638,"dj",2));   //Djibouti (Republic of)
+               sTable.add(new MccEntry(639,"ke",2));   //Kenya (Republic of)
+               sTable.add(new MccEntry(640,"tz",2));   //Tanzania (United Republic of)
+               sTable.add(new MccEntry(641,"ug",2));   //Uganda (Republic of)
+               sTable.add(new MccEntry(642,"bi",2));   //Burundi (Republic of)
+               sTable.add(new MccEntry(643,"mz",2));   //Mozambique (Republic of)
+               sTable.add(new MccEntry(645,"zm",2));   //Zambia (Republic of)
+               sTable.add(new MccEntry(646,"mg",2));   //Madagascar (Republic of)
+               sTable.add(new MccEntry(647,"re",2));   //Reunion (French Department of)
+               sTable.add(new MccEntry(648,"zw",2));   //Zimbabwe (Republic of)
+               sTable.add(new MccEntry(649,"na",2));   //Namibia (Republic of)
+               sTable.add(new MccEntry(650,"mw",2));   //Malawi
+               sTable.add(new MccEntry(651,"ls",2));   //Lesotho (Kingdom of)
+               sTable.add(new MccEntry(652,"bw",2));   //Botswana (Republic of)
+               sTable.add(new MccEntry(653,"sz",2));   //Swaziland (Kingdom of)
+               sTable.add(new MccEntry(654,"km",2));   //Comoros (Union of the)
+               sTable.add(new MccEntry(655,"za",2,"en"));      //South Africa (Republic of)
+               sTable.add(new MccEntry(657,"er",2));   //Eritrea
+               sTable.add(new MccEntry(702,"bz",2));   //Belize
+               sTable.add(new MccEntry(704,"gt",2));   //Guatemala (Republic of)
+               sTable.add(new MccEntry(706,"sv",2));   //El Salvador (Republic of)
+               sTable.add(new MccEntry(708,"hn",3));   //Honduras (Republic of)
+               sTable.add(new MccEntry(710,"ni",2));   //Nicaragua
+               sTable.add(new MccEntry(712,"cr",2));   //Costa Rica
+               sTable.add(new MccEntry(714,"pa",2));   //Panama (Republic of)
+               sTable.add(new MccEntry(716,"pe",2));   //Peru
+               sTable.add(new MccEntry(722,"ar",3));   //Argentine Republic
+               sTable.add(new MccEntry(724,"br",2));   //Brazil (Federative Republic of)
+               sTable.add(new MccEntry(730,"cl",2));   //Chile
+               sTable.add(new MccEntry(732,"co",3));   //Colombia (Republic of)
+               sTable.add(new MccEntry(734,"ve",2));   //Venezuela (Bolivarian Republic of)
+               sTable.add(new MccEntry(736,"bo",2));   //Bolivia (Republic of)
+               sTable.add(new MccEntry(738,"gy",2));   //Guyana
+               sTable.add(new MccEntry(740,"ec",2));   //Ecuador
+               sTable.add(new MccEntry(742,"gf",2));   //French Guiana (French Department of)
+               sTable.add(new MccEntry(744,"py",2));   //Paraguay (Republic of)
+               sTable.add(new MccEntry(746,"sr",2));   //Suriname (Republic of)
+               sTable.add(new MccEntry(748,"uy",2));   //Uruguay (Eastern Republic of)
+               sTable.add(new MccEntry(750,"fk",2));   //Falkland Islands (Malvinas)
         //table.add(new MccEntry(901,"",2));   //"International Mobile, shared code"
 
-        Collections.sort(table);
+        Collections.sort(sTable);
     }
 }
index 336d9af..49c96a9 100644 (file)
@@ -30,31 +30,31 @@ public class OperatorInfo implements Parcelable {
         FORBIDDEN;
     }
 
-    private String operatorAlphaLong;
-    private String operatorAlphaShort;
-    private String operatorNumeric;
+    private String mOperatorAlphaLong;
+    private String mOperatorAlphaShort;
+    private String mOperatorNumeric;
 
-    private State state = State.UNKNOWN;
+    private State mState = State.UNKNOWN;
 
 
     public String
     getOperatorAlphaLong() {
-        return operatorAlphaLong;
+        return mOperatorAlphaLong;
     }
 
     public String
     getOperatorAlphaShort() {
-        return operatorAlphaShort;
+        return mOperatorAlphaShort;
     }
 
     public String
     getOperatorNumeric() {
-        return operatorNumeric;
+        return mOperatorNumeric;
     }
 
     public State
     getState() {
-        return state;
+        return mState;
     }
 
     OperatorInfo(String operatorAlphaLong,
@@ -62,11 +62,11 @@ public class OperatorInfo implements Parcelable {
                 String operatorNumeric,
                 State state) {
 
-        this.operatorAlphaLong = operatorAlphaLong;
-        this.operatorAlphaShort = operatorAlphaShort;
-        this.operatorNumeric = operatorNumeric;
+        mOperatorAlphaLong = operatorAlphaLong;
+        mOperatorAlphaShort = operatorAlphaShort;
+        mOperatorNumeric = operatorNumeric;
 
-        this.state = state;
+        mState = state;
     }
 
 
@@ -99,10 +99,10 @@ public class OperatorInfo implements Parcelable {
 
     @Override
     public String toString() {
-        return "OperatorInfo " + operatorAlphaLong
-                + "/" + operatorAlphaShort
-                + "/" + operatorNumeric
-                + "/" + state;
+        return "OperatorInfo " + mOperatorAlphaLong
+                + "/" + mOperatorAlphaShort
+                + "/" + mOperatorNumeric
+                + "/" + mState;
     }
 
     /**
@@ -124,10 +124,10 @@ public class OperatorInfo implements Parcelable {
      */
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(operatorAlphaLong);
-        dest.writeString(operatorAlphaShort);
-        dest.writeString(operatorNumeric);
-        dest.writeSerializable(state);
+        dest.writeString(mOperatorAlphaLong);
+        dest.writeString(mOperatorAlphaShort);
+        dest.writeString(mOperatorNumeric);
+        dest.writeSerializable(mState);
     }
 
     /**
index 7e8ef3f..145cbea 100644 (file)
@@ -120,7 +120,7 @@ public abstract class PhoneBase extends Handler implements Phone {
     public static final String DNS_SERVER_CHECK_DISABLED_KEY = "dns_server_check_disabled_key";
 
     /* Instance Variables */
-    public CommandsInterface mCM;
+    public CommandsInterface mCi;
     boolean mDnsCheckDisabled;
     public DataConnectionTrackerBase mDataConnectionTracker;
     boolean mDoesRilSendMultipleCallRing;
@@ -214,10 +214,10 @@ public abstract class PhoneBase extends Handler implements Phone {
      */
     protected PhoneBase(PhoneNotifier notifier, Context context, CommandsInterface ci,
             boolean unitTestMode) {
-        this.mNotifier = notifier;
-        this.mContext = context;
+        mNotifier = notifier;
+        mContext = context;
         mLooper = Looper.myLooper();
-        mCM = ci;
+        mCi = ci;
 
         setPropertiesByCarrier();
 
@@ -225,7 +225,7 @@ public abstract class PhoneBase extends Handler implements Phone {
 
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
         mDnsCheckDisabled = sp.getBoolean(DNS_SERVER_CHECK_DISABLED_KEY, false);
-        mCM.setOnCallRing(this, EVENT_CALL_RING, null);
+        mCi.setOnCallRing(this, EVENT_CALL_RING, null);
 
         /* "Voice capable" means that this device supports circuit-switched
         * (i.e. voice) phone calls over the telephony network, and is allowed
@@ -264,7 +264,7 @@ public abstract class PhoneBase extends Handler implements Phone {
     @Override
     public void dispose() {
         synchronized(PhoneProxy.lockForRadioTechnologyChange) {
-            mCM.unSetOnCallRing(this);
+            mCi.unSetOnCallRing(this);
             // Must cleanup all connectionS and needs to use sendMessage!
             mDataConnectionTracker.cleanUpAllConnections(null);
             mIsTheCurrentActivePhone = false;
@@ -416,25 +416,25 @@ public abstract class PhoneBase extends Handler implements Phone {
     // Inherited documentation suffices.
     @Override
     public void registerForInCallVoicePrivacyOn(Handler h, int what, Object obj){
-        mCM.registerForInCallVoicePrivacyOn(h,what,obj);
+        mCi.registerForInCallVoicePrivacyOn(h,what,obj);
     }
 
     // Inherited documentation suffices.
     @Override
     public void unregisterForInCallVoicePrivacyOn(Handler h){
-        mCM.unregisterForInCallVoicePrivacyOn(h);
+        mCi.unregisterForInCallVoicePrivacyOn(h);
     }
 
     // Inherited documentation suffices.
     @Override
     public void registerForInCallVoicePrivacyOff(Handler h, int what, Object obj){
-        mCM.registerForInCallVoicePrivacyOff(h,what,obj);
+        mCi.registerForInCallVoicePrivacyOff(h,what,obj);
     }
 
     // Inherited documentation suffices.
     @Override
     public void unregisterForInCallVoicePrivacyOff(Handler h){
-        mCM.unregisterForInCallVoicePrivacyOff(h);
+        mCi.unregisterForInCallVoicePrivacyOff(h);
     }
 
     // Inherited documentation suffices.
@@ -530,9 +530,9 @@ public abstract class PhoneBase extends Handler implements Phone {
 
         // set to auto if the id is empty, otherwise select the network.
         if (TextUtils.isEmpty(networkSelection)) {
-            mCM.setNetworkSelectionModeAutomatic(response);
+            mCi.setNetworkSelectionModeAutomatic(response);
         } else {
-            mCM.setNetworkSelectionModeManual(networkSelection, response);
+            mCi.setNetworkSelectionModeManual(networkSelection, response);
         }
     }
 
@@ -577,25 +577,25 @@ public abstract class PhoneBase extends Handler implements Phone {
     // Inherited documentation suffices.
     @Override
     public void registerForRingbackTone(Handler h, int what, Object obj) {
-        mCM.registerForRingbackTone(h,what,obj);
+        mCi.registerForRingbackTone(h,what,obj);
     }
 
     // Inherited documentation suffices.
     @Override
     public void unregisterForRingbackTone(Handler h) {
-        mCM.unregisterForRingbackTone(h);
+        mCi.unregisterForRingbackTone(h);
     }
 
     // Inherited documentation suffices.
     @Override
     public void registerForResendIncallMute(Handler h, int what, Object obj) {
-        mCM.registerForResendIncallMute(h,what,obj);
+        mCi.registerForResendIncallMute(h,what,obj);
     }
 
     // Inherited documentation suffices.
     @Override
     public void unregisterForResendIncallMute(Handler h) {
-        mCM.unregisterForResendIncallMute(h);
+        mCi.unregisterForResendIncallMute(h);
     }
 
     @Override
@@ -730,7 +730,7 @@ public abstract class PhoneBase extends Handler implements Phone {
     @Override
     public String getIccSerialNumber() {
         IccRecords r = mIccRecords.get();
-        return (r != null) ? r.iccid : "";
+        return (r != null) ? r.iccId : "";
     }
 
     @Override
@@ -764,7 +764,7 @@ public abstract class PhoneBase extends Handler implements Phone {
      */
     @Override
     public void queryCdmaRoamingPreference(Message response) {
-        mCM.queryCdmaRoamingPreference(response);
+        mCi.queryCdmaRoamingPreference(response);
     }
 
     /**
@@ -785,7 +785,7 @@ public abstract class PhoneBase extends Handler implements Phone {
      */
     @Override
     public void setCdmaRoamingPreference(int cdmaRoamingType, Message response) {
-        mCM.setCdmaRoamingPreference(cdmaRoamingType, response);
+        mCi.setCdmaRoamingPreference(cdmaRoamingType, response);
     }
 
     /**
@@ -793,7 +793,7 @@ public abstract class PhoneBase extends Handler implements Phone {
      */
     @Override
     public void setCdmaSubscription(int cdmaSubscriptionType, Message response) {
-        mCM.setCdmaSubscriptionSource(cdmaSubscriptionType, response);
+        mCi.setCdmaSubscriptionSource(cdmaSubscriptionType, response);
     }
 
     /**
@@ -801,32 +801,32 @@ public abstract class PhoneBase extends Handler implements Phone {
      */
     @Override
     public void setPreferredNetworkType(int networkType, Message response) {
-        mCM.setPreferredNetworkType(networkType, response);
+        mCi.setPreferredNetworkType(networkType, response);
     }
 
     @Override
     public void getPreferredNetworkType(Message response) {
-        mCM.getPreferredNetworkType(response);
+        mCi.getPreferredNetworkType(response);
     }
 
     @Override
     public void getSmscAddress(Message result) {
-        mCM.getSmscAddress(result);
+        mCi.getSmscAddress(result);
     }
 
     @Override
     public void setSmscAddress(String address, Message result) {
-        mCM.setSmscAddress(address, result);
+        mCi.setSmscAddress(address, result);
     }
 
     @Override
     public void setTTYMode(int ttyMode, Message onComplete) {
-        mCM.setTTYMode(ttyMode, onComplete);
+        mCi.setTTYMode(ttyMode, onComplete);
     }
 
     @Override
     public void queryTTYMode(Message onComplete) {
-        mCM.queryTTYMode(onComplete);
+        mCi.queryTTYMode(onComplete);
     }
 
     @Override
@@ -843,22 +843,22 @@ public abstract class PhoneBase extends Handler implements Phone {
 
     @Override
     public void setBandMode(int bandMode, Message response) {
-        mCM.setBandMode(bandMode, response);
+        mCi.setBandMode(bandMode, response);
     }
 
     @Override
     public void queryAvailableBandMode(Message response) {
-        mCM.queryAvailableBandMode(response);
+        mCi.queryAvailableBandMode(response);
     }
 
     @Override
     public void invokeOemRilRequestRaw(byte[] data, Message response) {
-        mCM.invokeOemRilRequestRaw(data, response);
+        mCi.invokeOemRilRequestRaw(data, response);
     }
 
     @Override
     public void invokeOemRilRequestStrings(String[] strings, Message response) {
-        mCM.invokeOemRilRequestStrings(strings, response);
+        mCi.invokeOemRilRequestStrings(strings, response);
     }
 
     @Override
@@ -1061,72 +1061,72 @@ public abstract class PhoneBase extends Handler implements Phone {
 
     @Override
     public void registerForSignalInfo(Handler h, int what, Object obj) {
-        mCM.registerForSignalInfo(h, what, obj);
+        mCi.registerForSignalInfo(h, what, obj);
     }
 
     @Override
     public void unregisterForSignalInfo(Handler h) {
-        mCM.unregisterForSignalInfo(h);
+        mCi.unregisterForSignalInfo(h);
     }
 
     @Override
     public void registerForDisplayInfo(Handler h, int what, Object obj) {
-        mCM.registerForDisplayInfo(h, what, obj);
+        mCi.registerForDisplayInfo(h, what, obj);
     }
 
      @Override
     public void unregisterForDisplayInfo(Handler h) {
-         mCM.unregisterForDisplayInfo(h);
+         mCi.unregisterForDisplayInfo(h);
      }
 
     @Override
     public void registerForNumberInfo(Handler h, int what, Object obj) {
-        mCM.registerForNumberInfo(h, what, obj);
+        mCi.registerForNumberInfo(h, what, obj);
     }
 
     @Override
     public void unregisterForNumberInfo(Handler h) {
-        mCM.unregisterForNumberInfo(h);
+        mCi.unregisterForNumberInfo(h);
     }
 
     @Override
     public void registerForRedirectedNumberInfo(Handler h, int what, Object obj) {
-        mCM.registerForRedirectedNumberInfo(h, what, obj);
+        mCi.registerForRedirectedNumberInfo(h, what, obj);
     }
 
     @Override
     public void unregisterForRedirectedNumberInfo(Handler h) {
-        mCM.unregisterForRedirectedNumberInfo(h);
+        mCi.unregisterForRedirectedNumberInfo(h);
     }
 
     @Override
     public void registerForLineControlInfo(Handler h, int what, Object obj) {
-        mCM.registerForLineControlInfo( h, what, obj);
+        mCi.registerForLineControlInfo( h, what, obj);
     }
 
     @Override
     public void unregisterForLineControlInfo(Handler h) {
-        mCM.unregisterForLineControlInfo(h);
+        mCi.unregisterForLineControlInfo(h);
     }
 
     @Override
     public void registerFoT53ClirlInfo(Handler h, int what, Object obj) {
-        mCM.registerFoT53ClirlInfo(h, what, obj);
+        mCi.registerFoT53ClirlInfo(h, what, obj);
     }
 
     @Override
     public void unregisterForT53ClirInfo(Handler h) {
-        mCM.unregisterForT53ClirInfo(h);
+        mCi.unregisterForT53ClirInfo(h);
     }
 
     @Override
     public void registerForT53AudioControlInfo(Handler h, int what, Object obj) {
-        mCM.registerForT53AudioControlInfo( h, what, obj);
+        mCi.registerForT53AudioControlInfo( h, what, obj);
     }
 
     @Override
     public void unregisterForT53AudioControlInfo(Handler h) {
-        mCM.unregisterForT53AudioControlInfo(h);
+        mCi.unregisterForT53AudioControlInfo(h);
     }
 
      @Override
@@ -1285,7 +1285,7 @@ public abstract class PhoneBase extends Handler implements Phone {
      */
     @Override
     public int getLteOnCdmaMode() {
-        return mCM.getLteOnCdmaMode();
+        return mCi.getLteOnCdmaMode();
     }
 
     /**
@@ -1315,7 +1315,7 @@ public abstract class PhoneBase extends Handler implements Phone {
 
     public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         pw.println("PhoneBase:");
-        pw.println(" mCM=" + mCM);
+        pw.println(" mCi=" + mCi);
         pw.println(" mDnsCheckDisabled=" + mDnsCheckDisabled);
         pw.println(" mDataConnectionTracker=" + mDataConnectionTracker);
         pw.println(" mDoesRilSendMultipleCallRing=" + mDoesRilSendMultipleCallRing);
index f1bce68..b7a2b77 100644 (file)
@@ -48,7 +48,7 @@ public class PhoneFactory {
     static private Looper sLooper;
     static private Context sContext;
 
-    static final int preferredCdmaSubscription =
+    static final int sPreferredCdmaSubscription =
                          CdmaSubscriptionSourceManager.PREFERRED_CDMA_SUBSCRIPTION;
 
     //***** Class Methods
@@ -128,7 +128,7 @@ public class PhoneFactory {
                         //Get cdmaSubscription mode from Settings.System
                         cdmaSubscription = Settings.Global.getInt(context.getContentResolver(),
                                 Settings.Global.PREFERRED_CDMA_SUBSCRIPTION,
-                                preferredCdmaSubscription);
+                                sPreferredCdmaSubscription);
                         Rlog.i(LOG_TAG, "lteOnCdma not set, using PREFERRED_CDMA_SUBSCRIPTION");
                         break;
                 }
index 8a05ab1..bd322b3 100644 (file)
@@ -72,7 +72,7 @@ public class PhoneProxy extends Handler implements Phone {
         mIccPhoneBookInterfaceManagerProxy = new IccPhoneBookInterfaceManagerProxy(
                 phone.getIccPhoneBookInterfaceManager());
         mPhoneSubInfoProxy = new PhoneSubInfoProxy(phone.getPhoneSubInfo());
-        mCommandsInterface = ((PhoneBase)mActivePhone).mCM;
+        mCommandsInterface = ((PhoneBase)mActivePhone).mCi;
 
         mCommandsInterface.registerForRilConnected(this, EVENT_RIL_CONNECTED, null);
         mCommandsInterface.registerForOn(this, EVENT_RADIO_ON, null);
@@ -94,7 +94,7 @@ public class PhoneProxy extends Handler implements Phone {
         case EVENT_RADIO_ON:
             /* Proactively query voice radio technologies */
             mCommandsInterface.getVoiceRadioTechnology(
-                    this.obtainMessage(EVENT_REQUEST_VOICE_RADIO_TECH_DONE));
+                    obtainMessage(EVENT_REQUEST_VOICE_RADIO_TECH_DONE));
             break;
 
         case EVENT_RIL_CONNECTED:
@@ -199,9 +199,9 @@ public class PhoneProxy extends Handler implements Phone {
                 mActivePhone.getIccSmsInterfaceManager());
         mIccPhoneBookInterfaceManagerProxy.setmIccPhoneBookInterfaceManager(mActivePhone
                 .getIccPhoneBookInterfaceManager());
-        mPhoneSubInfoProxy.setmPhoneSubInfo(this.mActivePhone.getPhoneSubInfo());
+        mPhoneSubInfoProxy.setmPhoneSubInfo(mActivePhone.getPhoneSubInfo());
 
-        mCommandsInterface = ((PhoneBase)mActivePhone).mCM;
+        mCommandsInterface = ((PhoneBase)mActivePhone).mCi;
         mIccCardProxy.setVoiceRadioTech(newVoiceRadioTech);
 
         // Send an Intent to the PhoneApp that we had a radio technology change
index 610f0c2..3c13b97 100755 (executable)
@@ -33,7 +33,7 @@ public class PhoneSubInfoProxy extends IPhoneSubInfo.Stub {
     }
 
     public void setmPhoneSubInfo(PhoneSubInfo phoneSubInfo) {
-        this.mPhoneSubInfo = phoneSubInfo;
+        mPhoneSubInfo = phoneSubInfo;
     }
 
     @Override
index 3301f44..c1e4bec 100644 (file)
@@ -89,7 +89,7 @@ class RILRequest {
     int mSerial;
     int mRequest;
     Message mResult;
-    Parcel mp;
+    Parcel mParcel;
     RILRequest mNext;
 
     /**
@@ -120,15 +120,15 @@ class RILRequest {
         }
         rr.mRequest = request;
         rr.mResult = result;
-        rr.mp = Parcel.obtain();
+        rr.mParcel = Parcel.obtain();
 
         if (result != null && result.getTarget() == null) {
             throw new NullPointerException("Message target must not be null");
         }
 
         // first elements in any RIL Parcel
-        rr.mp.writeInt(request);
-        rr.mp.writeInt(rr.mSerial);
+        rr.mParcel.writeInt(request);
+        rr.mParcel.writeInt(rr.mSerial);
 
         return rr;
     }
@@ -141,7 +141,7 @@ class RILRequest {
     void release() {
         synchronized (sPoolSync) {
             if (sPoolSize < MAX_POOL_SIZE) {
-                this.mNext = sPool;
+                mNext = sPool;
                 sPool = this;
                 sPoolSize++;
                 mResult = null;
@@ -193,9 +193,9 @@ class RILRequest {
             mResult.sendToTarget();
         }
 
-        if (mp != null) {
-            mp.recycle();
-            mp = null;
+        if (mParcel != null) {
+            mParcel.recycle();
+            mParcel = null;
         }
     }
 }
@@ -334,9 +334,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
                         byte[] data;
 
-                        data = rr.mp.marshall();
-                        rr.mp.recycle();
-                        rr.mp = null;
+                        data = rr.mParcel.marshall();
+                        rr.mParcel.recycle();
+                        rr.mParcel = null;
 
                         if (data.length > RIL_MAX_COMMAND_BYTES) {
                             throw new RuntimeException(
@@ -709,9 +709,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeInt(2);
-        rr.mp.writeString(pin);
-        rr.mp.writeString(aid);
+        rr.mParcel.writeInt(2);
+        rr.mParcel.writeString(pin);
+        rr.mParcel.writeString(aid);
 
         send(rr);
     }
@@ -729,10 +729,10 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeInt(3);
-        rr.mp.writeString(puk);
-        rr.mp.writeString(newPin);
-        rr.mp.writeString(aid);
+        rr.mParcel.writeInt(3);
+        rr.mParcel.writeString(puk);
+        rr.mParcel.writeString(newPin);
+        rr.mParcel.writeString(aid);
 
         send(rr);
     }
@@ -750,9 +750,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeInt(2);
-        rr.mp.writeString(pin);
-        rr.mp.writeString(aid);
+        rr.mParcel.writeInt(2);
+        rr.mParcel.writeString(pin);
+        rr.mParcel.writeString(aid);
 
         send(rr);
     }
@@ -770,10 +770,10 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeInt(3);
-        rr.mp.writeString(puk);
-        rr.mp.writeString(newPin2);
-        rr.mp.writeString(aid);
+        rr.mParcel.writeInt(3);
+        rr.mParcel.writeString(puk);
+        rr.mParcel.writeString(newPin2);
+        rr.mParcel.writeString(aid);
 
         send(rr);
     }
@@ -791,10 +791,10 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeInt(3);
-        rr.mp.writeString(oldPin);
-        rr.mp.writeString(newPin);
-        rr.mp.writeString(aid);
+        rr.mParcel.writeInt(3);
+        rr.mParcel.writeString(oldPin);
+        rr.mParcel.writeString(newPin);
+        rr.mParcel.writeString(aid);
 
         send(rr);
     }
@@ -812,10 +812,10 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeInt(3);
-        rr.mp.writeString(oldPin2);
-        rr.mp.writeString(newPin2);
-        rr.mp.writeString(aid);
+        rr.mParcel.writeInt(3);
+        rr.mParcel.writeString(oldPin2);
+        rr.mParcel.writeString(newPin2);
+        rr.mParcel.writeString(aid);
 
         send(rr);
     }
@@ -827,10 +827,10 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeInt(3);
-        rr.mp.writeString(facility);
-        rr.mp.writeString(oldPwd);
-        rr.mp.writeString(newPwd);
+        rr.mParcel.writeInt(3);
+        rr.mParcel.writeString(facility);
+        rr.mParcel.writeString(oldPwd);
+        rr.mParcel.writeString(newPwd);
 
         send(rr);
     }
@@ -842,8 +842,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeInt(1);
-        rr.mp.writeString(netpin);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeString(netpin);
 
         send(rr);
     }
@@ -885,17 +885,17 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     dial(String address, int clirMode, UUSInfo uusInfo, Message result) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_DIAL, result);
 
-        rr.mp.writeString(address);
-        rr.mp.writeInt(clirMode);
-        rr.mp.writeInt(0); // UUS information is absent
+        rr.mParcel.writeString(address);
+        rr.mParcel.writeInt(clirMode);
+        rr.mParcel.writeInt(0); // UUS information is absent
 
         if (uusInfo == null) {
-            rr.mp.writeInt(0); // UUS information is absent
+            rr.mParcel.writeInt(0); // UUS information is absent
         } else {
-            rr.mp.writeInt(1); // UUS information is present
-            rr.mp.writeInt(uusInfo.getType());
-            rr.mp.writeInt(uusInfo.getDcs());
-            rr.mp.writeByteArray(uusInfo.getUserData());
+            rr.mParcel.writeInt(1); // UUS information is present
+            rr.mParcel.writeInt(uusInfo.getType());
+            rr.mParcel.writeInt(uusInfo.getDcs());
+            rr.mParcel.writeByteArray(uusInfo.getUserData());
         }
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
@@ -914,8 +914,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     getIMSIForApp(String aid, Message result) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_GET_IMSI, result);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeString(aid);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeString(aid);
 
         if (RILJ_LOGD) riljLog(rr.serialString() +
                               "> getIMSI: " + requestToString(rr.mRequest)
@@ -955,8 +955,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " " +
                 gsmIndex);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(gsmIndex);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(gsmIndex);
 
         send(rr);
     }
@@ -1013,8 +1013,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE,
                 result);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(enable ? 1:0);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(enable ? 1:0);
 
         send(rr);
     }
@@ -1035,8 +1035,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                             + " " + gsmIndex);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(gsmIndex);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(gsmIndex);
 
         send(rr);
     }
@@ -1118,8 +1118,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                             + " " + enableMute);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(enableMute ? 1 : 0);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(enableMute ? 1 : 0);
 
         send(rr);
     }
@@ -1187,7 +1187,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeString(Character.toString(c));
+        rr.mParcel.writeString(Character.toString(c));
 
         send(rr);
     }
@@ -1200,7 +1200,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeString(Character.toString(c));
+        rr.mParcel.writeString(Character.toString(c));
 
         send(rr);
     }
@@ -1221,10 +1221,10 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     sendBurstDtmf(String dtmfString, int on, int off, Message result) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_CDMA_BURST_DTMF, result);
 
-        rr.mp.writeInt(3);
-        rr.mp.writeString(dtmfString);
-        rr.mp.writeString(Integer.toString(on));
-        rr.mp.writeString(Integer.toString(off));
+        rr.mParcel.writeInt(3);
+        rr.mParcel.writeString(dtmfString);
+        rr.mParcel.writeString(Integer.toString(on));
+        rr.mParcel.writeString(Integer.toString(off));
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " : " + dtmfString);
@@ -1238,9 +1238,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_SEND_SMS, result);
 
-        rr.mp.writeInt(2);
-        rr.mp.writeString(smscPDU);
-        rr.mp.writeString(pdu);
+        rr.mParcel.writeInt(2);
+        rr.mParcel.writeString(smscPDU);
+        rr.mParcel.writeString(pdu);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
@@ -1260,30 +1260,30 @@ public final class RIL extends BaseCommands implements CommandsInterface {
                 = RILRequest.obtain(RIL_REQUEST_CDMA_SEND_SMS, result);
 
         try {
-            rr.mp.writeInt(dis.readInt()); //teleServiceId
-            rr.mp.writeByte((byte) dis.readInt()); //servicePresent
-            rr.mp.writeInt(dis.readInt()); //serviceCategory
-            rr.mp.writeInt(dis.read()); //address_digit_mode
-            rr.mp.writeInt(dis.read()); //address_nbr_mode
-            rr.mp.writeInt(dis.read()); //address_ton
-            rr.mp.writeInt(dis.read()); //address_nbr_plan
+            rr.mParcel.writeInt(dis.readInt()); //teleServiceId
+            rr.mParcel.writeByte((byte) dis.readInt()); //servicePresent
+            rr.mParcel.writeInt(dis.readInt()); //serviceCategory
+            rr.mParcel.writeInt(dis.read()); //address_digit_mode
+            rr.mParcel.writeInt(dis.read()); //address_nbr_mode
+            rr.mParcel.writeInt(dis.read()); //address_ton
+            rr.mParcel.writeInt(dis.read()); //address_nbr_plan
             address_nbr_of_digits = (byte) dis.read();
-            rr.mp.writeByte((byte) address_nbr_of_digits);
+            rr.mParcel.writeByte((byte) address_nbr_of_digits);
             for(int i=0; i < address_nbr_of_digits; i++){
-                rr.mp.writeByte(dis.readByte()); // address_orig_bytes[i]
+                rr.mParcel.writeByte(dis.readByte()); // address_orig_bytes[i]
             }
-            rr.mp.writeInt(dis.read()); //subaddressType
-            rr.mp.writeByte((byte) dis.read()); //subaddr_odd
+            rr.mParcel.writeInt(dis.read()); //subaddressType
+            rr.mParcel.writeByte((byte) dis.read()); //subaddr_odd
             subaddr_nbr_of_digits = (byte) dis.read();
-            rr.mp.writeByte((byte) subaddr_nbr_of_digits);
+            rr.mParcel.writeByte((byte) subaddr_nbr_of_digits);
             for(int i=0; i < subaddr_nbr_of_digits; i++){
-                rr.mp.writeByte(dis.readByte()); //subaddr_orig_bytes[i]
+                rr.mParcel.writeByte(dis.readByte()); //subaddr_orig_bytes[i]
             }
 
             bearerDataLength = dis.read();
-            rr.mp.writeInt(bearerDataLength);
+            rr.mParcel.writeInt(bearerDataLength);
             for(int i=0; i < bearerDataLength; i++){
-                rr.mp.writeByte(dis.readByte()); //bearerData[i]
+                rr.mParcel.writeByte(dis.readByte()); //bearerData[i]
             }
         }catch (IOException ex){
             if (RILJ_LOGD) riljLog("sendSmsCdma: conversion from input stream to object failed: "
@@ -1300,8 +1300,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_DELETE_SMS_ON_SIM,
                 response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(index);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(index);
 
         if (RILJ_LOGV) riljLog(rr.serialString() + "> "
                 + requestToString(rr.mRequest)
@@ -1315,8 +1315,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM,
                 response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(index);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(index);
 
         if (RILJ_LOGV) riljLog(rr.serialString() + "> "
                 + requestToString(rr.mRequest)
@@ -1332,9 +1332,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_WRITE_SMS_TO_SIM,
                 response);
 
-        rr.mp.writeInt(status);
-        rr.mp.writeString(pdu);
-        rr.mp.writeString(smsc);
+        rr.mParcel.writeInt(status);
+        rr.mParcel.writeString(pdu);
+        rr.mParcel.writeString(smsc);
 
         if (RILJ_LOGV) riljLog(rr.serialString() + "> "
                 + requestToString(rr.mRequest)
@@ -1350,8 +1350,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM,
                 response);
 
-        rr.mp.writeInt(status);
-        rr.mp.writeString(pdu);
+        rr.mParcel.writeInt(status);
+        rr.mParcel.writeString(pdu);
 
         if (RILJ_LOGV) riljLog(rr.serialString() + "> "
                 + requestToString(rr.mRequest)
@@ -1388,15 +1388,15 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_SETUP_DATA_CALL, result);
 
-        rr.mp.writeInt(7);
+        rr.mParcel.writeInt(7);
 
-        rr.mp.writeString(radioTechnology);
-        rr.mp.writeString(profile);
-        rr.mp.writeString(apn);
-        rr.mp.writeString(user);
-        rr.mp.writeString(password);
-        rr.mp.writeString(authType);
-        rr.mp.writeString(protocol);
+        rr.mParcel.writeString(radioTechnology);
+        rr.mParcel.writeString(profile);
+        rr.mParcel.writeString(apn);
+        rr.mParcel.writeString(user);
+        rr.mParcel.writeString(password);
+        rr.mParcel.writeString(authType);
+        rr.mParcel.writeString(protocol);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> "
                 + requestToString(rr.mRequest) + " " + radioTechnology + " "
@@ -1412,9 +1412,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_DEACTIVATE_DATA_CALL, result);
 
-        rr.mp.writeInt(2);
-        rr.mp.writeString(Integer.toString(cid));
-        rr.mp.writeString(Integer.toString(reason));
+        rr.mParcel.writeInt(2);
+        rr.mParcel.writeString(Integer.toString(cid));
+        rr.mParcel.writeString(Integer.toString(reason));
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " +
                 requestToString(rr.mRequest) + " " + cid + " " + reason);
@@ -1427,8 +1427,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     setRadioPower(boolean on, Message result) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_RADIO_POWER, result);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(on ? 1 : 0);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(on ? 1 : 0);
 
         if (RILJ_LOGD) {
             riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
@@ -1444,8 +1444,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION, result);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(enable ? 1 : 0);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(enable ? 1 : 0);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> "
                 + requestToString(rr.mRequest));
@@ -1459,9 +1459,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_SMS_ACKNOWLEDGE, result);
 
-        rr.mp.writeInt(2);
-        rr.mp.writeInt(success ? 1 : 0);
-        rr.mp.writeInt(cause);
+        rr.mParcel.writeInt(2);
+        rr.mParcel.writeInt(success ? 1 : 0);
+        rr.mParcel.writeInt(cause);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " " + success + " " + cause);
@@ -1475,9 +1475,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE, result);
 
-        rr.mp.writeInt(success ? 0 : 1); //RIL_CDMA_SMS_ErrorClass
+        rr.mParcel.writeInt(success ? 0 : 1); //RIL_CDMA_SMS_ErrorClass
         // cause code according to X.S004-550E
-        rr.mp.writeInt(cause);
+        rr.mParcel.writeInt(cause);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " " + success + " " + cause);
@@ -1491,9 +1491,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU, result);
 
-        rr.mp.writeInt(2);
-        rr.mp.writeString(success ? "1" : "0");
-        rr.mp.writeString(ackPdu);
+        rr.mParcel.writeInt(2);
+        rr.mParcel.writeString(success ? "1" : "0");
+        rr.mParcel.writeString(ackPdu);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + ' ' + success + " [" + ackPdu + ']');
@@ -1516,15 +1516,15 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_SIM_IO, result);
 
-        rr.mp.writeInt(command);
-        rr.mp.writeInt(fileid);
-        rr.mp.writeString(path);
-        rr.mp.writeInt(p1);
-        rr.mp.writeInt(p2);
-        rr.mp.writeInt(p3);
-        rr.mp.writeString(data);
-        rr.mp.writeString(pin2);
-        rr.mp.writeString(aid);
+        rr.mParcel.writeInt(command);
+        rr.mParcel.writeInt(fileid);
+        rr.mParcel.writeString(path);
+        rr.mParcel.writeInt(p1);
+        rr.mParcel.writeInt(p2);
+        rr.mParcel.writeInt(p3);
+        rr.mParcel.writeString(data);
+        rr.mParcel.writeString(pin2);
+        rr.mParcel.writeString(aid);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> iccIO: "
                 + requestToString(rr.mRequest)
@@ -1555,9 +1555,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
                 = RILRequest.obtain(RIL_REQUEST_SET_CLIR, result);
 
         // count ints
-        rr.mp.writeInt(1);
+        rr.mParcel.writeInt(1);
 
-        rr.mp.writeInt(clirMode);
+        rr.mParcel.writeInt(clirMode);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                     + " " + clirMode);
@@ -1571,8 +1571,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_QUERY_CALL_WAITING, response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(serviceClass);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(serviceClass);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                     + " " + serviceClass);
@@ -1586,9 +1586,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_SET_CALL_WAITING, response);
 
-        rr.mp.writeInt(2);
-        rr.mp.writeInt(enable ? 1 : 0);
-        rr.mp.writeInt(serviceClass);
+        rr.mParcel.writeInt(2);
+        rr.mParcel.writeInt(enable ? 1 : 0);
+        rr.mParcel.writeInt(serviceClass);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " " + enable + ", " + serviceClass);
@@ -1618,7 +1618,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                     + " " + operatorNumeric);
 
-        rr.mp.writeString(operatorNumeric);
+        rr.mParcel.writeString(operatorNumeric);
 
         send(rr);
     }
@@ -1654,12 +1654,12 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_SET_CALL_FORWARD, response);
 
-        rr.mp.writeInt(action);
-        rr.mp.writeInt(cfReason);
-        rr.mp.writeInt(serviceClass);
-        rr.mp.writeInt(PhoneNumberUtils.toaFromString(number));
-        rr.mp.writeString(number);
-        rr.mp.writeInt (timeSeconds);
+        rr.mParcel.writeInt(action);
+        rr.mParcel.writeInt(cfReason);
+        rr.mParcel.writeInt(serviceClass);
+        rr.mParcel.writeInt(PhoneNumberUtils.toaFromString(number));
+        rr.mParcel.writeString(number);
+        rr.mParcel.writeInt (timeSeconds);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                     + " " + action + " " + cfReason + " " + serviceClass
@@ -1675,12 +1675,12 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
             = RILRequest.obtain(RIL_REQUEST_QUERY_CALL_FORWARD_STATUS, response);
 
-        rr.mp.writeInt(2); // 2 is for query action, not in used anyway
-        rr.mp.writeInt(cfReason);
-        rr.mp.writeInt(serviceClass);
-        rr.mp.writeInt(PhoneNumberUtils.toaFromString(number));
-        rr.mp.writeString(number);
-        rr.mp.writeInt (0);
+        rr.mParcel.writeInt(2); // 2 is for query action, not in used anyway
+        rr.mParcel.writeInt(cfReason);
+        rr.mParcel.writeInt(serviceClass);
+        rr.mParcel.writeInt(PhoneNumberUtils.toaFromString(number));
+        rr.mParcel.writeString(number);
+        rr.mParcel.writeInt (0);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " " + cfReason + " " + serviceClass);
@@ -1729,13 +1729,13 @@ public final class RIL extends BaseCommands implements CommandsInterface {
                                                  + " " + appId + "]");
 
         // count strings
-        rr.mp.writeInt(4);
+        rr.mParcel.writeInt(4);
 
-        rr.mp.writeString(facility);
-        rr.mp.writeString(password);
+        rr.mParcel.writeString(facility);
+        rr.mParcel.writeString(password);
 
-        rr.mp.writeString(Integer.toString(serviceClass));
-        rr.mp.writeString(appId);
+        rr.mParcel.writeString(Integer.toString(serviceClass));
+        rr.mParcel.writeString(appId);
 
         send(rr);
     }
@@ -1760,14 +1760,14 @@ public final class RIL extends BaseCommands implements CommandsInterface {
                                                         + " " + serviceClass + " " + appId + "]");
 
         // count strings
-        rr.mp.writeInt(5);
+        rr.mParcel.writeInt(5);
 
-        rr.mp.writeString(facility);
+        rr.mParcel.writeString(facility);
         lockString = (lockState)?"1":"0";
-        rr.mp.writeString(lockString);
-        rr.mp.writeString(password);
-        rr.mp.writeString(Integer.toString(serviceClass));
-        rr.mp.writeString(appId);
+        rr.mParcel.writeString(lockString);
+        rr.mParcel.writeString(password);
+        rr.mParcel.writeString(Integer.toString(serviceClass));
+        rr.mParcel.writeString(appId);
 
         send(rr);
 
@@ -1786,7 +1786,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
                                    + " " + logUssdString);
         }
 
-        rr.mp.writeString(ussdString);
+        rr.mParcel.writeString(ussdString);
 
         send(rr);
     }
@@ -1822,7 +1822,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                + "[" + IccUtils.bytesToHexString(data) + "]");
 
-        rr.mp.writeByteArray(data);
+        rr.mParcel.writeByteArray(data);
 
         send(rr);
 
@@ -1835,7 +1835,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeStringArray(strings);
+        rr.mParcel.writeStringArray(strings);
 
         send(rr);
     }
@@ -1851,8 +1851,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr
                 = RILRequest.obtain(RIL_REQUEST_SET_BAND_MODE, response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(bandMode);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(bandMode);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                  + " " + bandMode);
@@ -1888,7 +1888,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeString(contents);
+        rr.mParcel.writeString(contents);
         send(rr);
     }
 
@@ -1902,7 +1902,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
-        rr.mp.writeString(contents);
+        rr.mParcel.writeString(contents);
         send(rr);
     }
 
@@ -1917,7 +1917,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + '[' + contents + ']');
 
-        rr.mp.writeString(contents);
+        rr.mParcel.writeString(contents);
         send(rr);
     }
 
@@ -1936,7 +1936,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
         int[] param = new int[1];
         param[0] = accept ? 1 : 0;
-        rr.mp.writeIntArray(param);
+        rr.mParcel.writeIntArray(param);
         send(rr);
     }
 
@@ -1958,8 +1958,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(
                 RILConstants.RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(networkType);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(networkType);
 
         mSetPreferredNetworkType = networkType;
         mPreferredNetworkType = networkType;
@@ -2002,8 +2002,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     @Override
     public void setLocationUpdates(boolean enable, Message response) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_SET_LOCATION_UPDATES, response);
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(enable ? 1 : 0);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(enable ? 1 : 0);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> "
                 + requestToString(rr.mRequest) + ": " + enable);
@@ -2030,7 +2030,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     public void setSmscAddress(String address, Message result) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_SET_SMSC_ADDRESS, result);
 
-        rr.mp.writeString(address);
+        rr.mParcel.writeString(address);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " : " + address);
@@ -2044,8 +2044,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     @Override
     public void reportSmsMemoryStatus(boolean available, Message result) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_REPORT_SMS_MEMORY_STATUS, result);
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(available ? 1 : 0);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(available ? 1 : 0);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> "
                 + requestToString(rr.mRequest) + ": " + available);
@@ -2085,14 +2085,14 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_GSM_SET_BROADCAST_CONFIG, response);
 
         int numOfConfig = config.length;
-        rr.mp.writeInt(numOfConfig);
+        rr.mParcel.writeInt(numOfConfig);
 
         for(int i = 0; i < numOfConfig; i++) {
-            rr.mp.writeInt(config[i].getFromServiceId());
-            rr.mp.writeInt(config[i].getToServiceId());
-            rr.mp.writeInt(config[i].getFromCodeScheme());
-            rr.mp.writeInt(config[i].getToCodeScheme());
-            rr.mp.writeInt(config[i].isSelected() ? 1 : 0);
+            rr.mParcel.writeInt(config[i].getFromServiceId());
+            rr.mParcel.writeInt(config[i].getToServiceId());
+            rr.mParcel.writeInt(config[i].getFromCodeScheme());
+            rr.mParcel.writeInt(config[i].getToCodeScheme());
+            rr.mParcel.writeInt(config[i].isSelected() ? 1 : 0);
         }
 
         if (RILJ_LOGD) {
@@ -2113,8 +2113,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     public void setGsmBroadcastActivation(boolean activate, Message response) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_GSM_BROADCAST_ACTIVATION, response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(activate ? 0 : 1);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(activate ? 0 : 1);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
@@ -2125,8 +2125,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
 
     private void sendScreenState(boolean on) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_SCREEN_STATE, null);
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(on ? 1 : 0);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(on ? 1 : 0);
 
         if (RILJ_LOGD) riljLog(rr.serialString()
                 + "> " + requestToString(rr.mRequest) + ": " + on);
@@ -3820,8 +3820,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(
                 RILConstants.RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE, response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(cdmaRoamingType);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(cdmaRoamingType);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " : " + cdmaRoamingType);
@@ -3837,8 +3837,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(
                 RILConstants.RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE, response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(cdmaSubscription);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(cdmaSubscription);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " : " + cdmaSubscription);
@@ -3880,8 +3880,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         RILRequest rr = RILRequest.obtain(
                 RILConstants.RIL_REQUEST_SET_TTY_MODE, response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(ttyMode);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(ttyMode);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " : " + ttyMode);
@@ -3897,7 +3897,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     sendCDMAFeatureCode(String FeatureCode, Message response) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_CDMA_FLASH, response);
 
-        rr.mp.writeString(FeatureCode);
+        rr.mParcel.writeString(FeatureCode);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
                 + " : " + FeatureCode);
@@ -3929,11 +3929,11 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         }
 
         CdmaSmsBroadcastConfigInfo[] rilConfigs = processedConfigs.toArray(configs);
-        rr.mp.writeInt(rilConfigs.length);
+        rr.mParcel.writeInt(rilConfigs.length);
         for(int i = 0; i < rilConfigs.length; i++) {
-            rr.mp.writeInt(rilConfigs[i].getFromServiceCategory());
-            rr.mp.writeInt(rilConfigs[i].getLanguage());
-            rr.mp.writeInt(rilConfigs[i].isSelected() ? 1 : 0);
+            rr.mParcel.writeInt(rilConfigs[i].getFromServiceCategory());
+            rr.mParcel.writeInt(rilConfigs[i].getLanguage());
+            rr.mParcel.writeInt(rilConfigs[i].isSelected() ? 1 : 0);
         }
 
         if (RILJ_LOGD) {
@@ -3951,8 +3951,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     public void setCdmaBroadcastActivation(boolean activate, Message response) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_CDMA_BROADCAST_ACTIVATION, response);
 
-        rr.mp.writeInt(1);
-        rr.mp.writeInt(activate ? 0 :1);
+        rr.mParcel.writeInt(1);
+        rr.mParcel.writeInt(activate ? 0 :1);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
@@ -3975,7 +3975,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     public void requestIsimAuthentication(String nonce, Message response) {
         RILRequest rr = RILRequest.obtain(RIL_REQUEST_ISIM_AUTHENTICATION, response);
 
-        rr.mp.writeString(nonce);
+        rr.mParcel.writeString(nonce);
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
index 81ad54d..c0222e9 100644 (file)
@@ -106,7 +106,7 @@ public class RetryManager {
     private int mRetryCount;
 
     /** Random number generator */
-    private Random rng = new Random();
+    private Random mRng = new Random();
 
     private String mConfig;
 
@@ -401,7 +401,7 @@ public class RetryManager {
         if (randomTime == 0) {
             return 0;
         } else {
-            return rng.nextInt(randomTime);
+            return mRng.nextInt(randomTime);
         }
     }
 
index d804eeb..b4e71e7 100644 (file)
@@ -148,7 +148,7 @@ public abstract class SMSDispatcher extends Handler {
     protected final Phone mPhone;
     protected final Context mContext;
     protected final ContentResolver mResolver;
-    protected final CommandsInterface mCm;
+    protected final CommandsInterface mCi;
     protected final SmsStorageMonitor mStorageMonitor;
     protected final TelephonyManager mTelephonyManager;
 
@@ -212,7 +212,7 @@ public abstract class SMSDispatcher extends Handler {
         mWapPush = new WapPushOverSms(phone, this);
         mContext = phone.getContext();
         mResolver = mContext.getContentResolver();
-        mCm = phone.mCM;
+        mCi = phone.mCi;
         mStorageMonitor = storageMonitor;
         mUsageMonitor = usageMonitor;
         mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
@@ -433,7 +433,7 @@ public abstract class SMSDispatcher extends Handler {
 
             if (tracker.mDeliveryIntent != null) {
                 // Expecting a status report.  Add it to the list.
-                int messageRef = ((SmsResponse)ar.result).messageRef;
+                int messageRef = ((SmsResponse)ar.result).mMessageRef;
                 tracker.mMessageRef = messageRef;
                 deliveryPendingList.add(tracker);
             }
@@ -485,7 +485,7 @@ public abstract class SMSDispatcher extends Handler {
                 try {
                     Intent fillIn = new Intent();
                     if (ar.result != null) {
-                        fillIn.putExtra("errorCode", ((SmsResponse)ar.result).errorCode);
+                        fillIn.putExtra("errorCode", ((SmsResponse)ar.result).mErrorCode);
                     }
                     if (mRemainingMessages > -1) {
                         mRemainingMessages--;
index 60e73cf..86777c6 100644 (file)
@@ -41,15 +41,15 @@ import com.android.internal.telephony.uicc.UiccController;
  */
 public abstract class ServiceStateTracker extends Handler {
 
-    protected CommandsInterface cm;
+    protected CommandsInterface mCi;
     protected UiccController mUiccController = null;
     protected UiccCardApplication mUiccApplcation = null;
     protected IccRecords mIccRecords = null;
 
     protected PhoneBase mPhoneBase;
 
-    public ServiceState ss = new ServiceState();
-    protected ServiceState newSS = new ServiceState();
+    public ServiceState mSS = new ServiceState();
+    protected ServiceState mNewSS = new ServiceState();
 
     protected CellInfo mLastCellInfo = null;
 
@@ -73,7 +73,7 @@ public abstract class ServiceStateTracker extends Handler {
      * and ignore stale responses.  The value is a count-down of
      * expected responses in this pollingContext.
      */
-    protected int[] pollingContext;
+    protected int[] mPollingContext;
     protected boolean mDesiredPowerState;
 
     /**
@@ -81,7 +81,7 @@ public abstract class ServiceStateTracker extends Handler {
      * getting unsolicited signal strength updates from the radio, set
      * value to true and don't bother polling any more.
      */
-    protected boolean dontPollSignalStrength = false;
+    protected boolean mDontPollSignalStrength = false;
 
     protected RegistrantList mRoamingOnRegistrants = new RegistrantList();
     protected RegistrantList mRoamingOffRegistrants = new RegistrantList();
@@ -184,14 +184,14 @@ public abstract class ServiceStateTracker extends Handler {
     protected ServiceStateTracker(PhoneBase phoneBase, CommandsInterface ci, CellInfo cellInfo) {
         mPhoneBase = phoneBase;
         mCellInfo = cellInfo;
-        cm = ci;
+        mCi = ci;
         mUiccController = UiccController.getInstance();
         mUiccController.registerForIccChanged(this, EVENT_ICC_CHANGED, null);
-        cm.setOnSignalStrengthUpdate(this, EVENT_SIGNAL_STRENGTH_UPDATE, null);
+        mCi.setOnSignalStrengthUpdate(this, EVENT_SIGNAL_STRENGTH_UPDATE, null);
     }
 
     public void dispose() {
-        cm.unSetOnSignalStrengthUpdate(this);
+        mCi.unSetOnSignalStrengthUpdate(this);
         mUiccController.unregisterForIccChanged(this);
     }
 
@@ -228,7 +228,7 @@ public abstract class ServiceStateTracker extends Handler {
         Registrant r = new Registrant(h, what, obj);
         mRoamingOnRegistrants.add(r);
 
-        if (ss.getRoaming()) {
+        if (mSS.getRoaming()) {
             r.notifyRegistrant();
         }
     }
@@ -249,7 +249,7 @@ public abstract class ServiceStateTracker extends Handler {
         Registrant r = new Registrant(h, what, obj);
         mRoamingOffRegistrants.add(r);
 
-        if (!ss.getRoaming()) {
+        if (!mSS.getRoaming()) {
             r.notifyRegistrant();
         }
     }
@@ -268,7 +268,7 @@ public abstract class ServiceStateTracker extends Handler {
      * on failure.
      */
     public void reRegisterNetwork(Message onComplete) {
-        cm.getPreferredNetworkType(
+        mCi.getPreferredNetworkType(
                 obtainMessage(EVENT_GET_PREFERRED_NETWORK_TYPE, onComplete));
     }
 
@@ -295,26 +295,26 @@ public abstract class ServiceStateTracker extends Handler {
     public void enableSingleLocationUpdate() {
         if (mWantSingleLocationUpdate || mWantContinuousLocationUpdates) return;
         mWantSingleLocationUpdate = true;
-        cm.setLocationUpdates(true, obtainMessage(EVENT_LOCATION_UPDATES_ENABLED));
+        mCi.setLocationUpdates(true, obtainMessage(EVENT_LOCATION_UPDATES_ENABLED));
     }
 
     public void enableLocationUpdates() {
         if (mWantSingleLocationUpdate || mWantContinuousLocationUpdates) return;
         mWantContinuousLocationUpdates = true;
-        cm.setLocationUpdates(true, obtainMessage(EVENT_LOCATION_UPDATES_ENABLED));
+        mCi.setLocationUpdates(true, obtainMessage(EVENT_LOCATION_UPDATES_ENABLED));
     }
 
     protected void disableSingleLocationUpdate() {
         mWantSingleLocationUpdate = false;
         if (!mWantSingleLocationUpdate && !mWantContinuousLocationUpdates) {
-            cm.setLocationUpdates(false, null);
+            mCi.setLocationUpdates(false, null);
         }
     }
 
     public void disableLocationUpdates() {
         mWantContinuousLocationUpdates = false;
         if (!mWantSingleLocationUpdate && !mWantContinuousLocationUpdates) {
-            cm.setLocationUpdates(false, null);
+            mCi.setLocationUpdates(false, null);
         }
     }
 
@@ -403,7 +403,7 @@ public abstract class ServiceStateTracker extends Handler {
         Registrant r = new Registrant(h, what, obj);
 
         mNetworkAttachedRegistrants.add(r);
-        if (ss.getVoiceRegState() == ServiceState.STATE_IN_SERVICE) {
+        if (mSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE) {
             r.notifyRegistrant();
         }
     }
@@ -531,7 +531,7 @@ public abstract class ServiceStateTracker extends Handler {
     /** Cancel a pending (if any) pollState() operation */
     protected void cancelPollState() {
         // This will effectively cancel the rest of the poll requests.
-        pollingContext = new int[1];
+        mPollingContext = new int[1];
     }
 
     /**
@@ -609,13 +609,13 @@ public abstract class ServiceStateTracker extends Handler {
 
     public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         pw.println("ServiceStateTracker:");
-        pw.println(" ss=" + ss);
-        pw.println(" newSS=" + newSS);
+        pw.println(" mSS=" + mSS);
+        pw.println(" mNewSS=" + mNewSS);
         pw.println(" mCellInfo=" + mCellInfo);
         pw.println(" mRestrictedState=" + mRestrictedState);
-        pw.println(" pollingContext=" + pollingContext);
+        pw.println(" mPollingContext=" + mPollingContext);
         pw.println(" mDesiredPowerState=" + mDesiredPowerState);
-        pw.println(" dontPollSignalStrength=" + dontPollSignalStrength);
+        pw.println(" mDontPollSignalStrength=" + mDontPollSignalStrength);
         pw.println(" mPendingRadioPowerOffAfterDataOff=" + mPendingRadioPowerOffAfterDataOff);
         pw.println(" mPendingRadioPowerOffAfterDataOffTag=" + mPendingRadioPowerOffAfterDataOffTag);
     }
index 105566c..b027b1e 100644 (file)
@@ -28,61 +28,61 @@ import android.provider.Telephony;
  */
 public abstract class SmsMessageBase {
     /** {@hide} The address of the SMSC. May be null */
-    protected String scAddress;
+    protected String mScAddress;
 
     /** {@hide} The address of the sender */
-    protected SmsAddress originatingAddress;
+    protected SmsAddress mOriginatingAddress;
 
     /** {@hide} The message body as a string. May be null if the message isn't text */
-    protected String messageBody;
+    protected String mMessageBody;
 
     /** {@hide} */
-    protected String pseudoSubject;
+    protected String mPseudoSubject;
 
     /** {@hide} Non-null if this is an email gateway message */
-    protected String emailFrom;
+    protected String mEmailFrom;
 
     /** {@hide} Non-null if this is an email gateway message */
-    protected String emailBody;
+    protected String mEmailBody;
 
     /** {@hide} */
-    protected boolean isEmail;
+    protected boolean mIsEmail;
 
     /** {@hide} */
-    protected long scTimeMillis;
+    protected long mScTimeMillis;
 
     /** {@hide} The raw PDU of the message */
     protected byte[] mPdu;
 
     /** {@hide} The raw bytes for the user data section of the message */
-    protected byte[] userData;
+    protected byte[] mUserData;
 
     /** {@hide} */
-    protected SmsHeader userDataHeader;
+    protected SmsHeader mUserDataHeader;
 
     // "Message Waiting Indication Group"
     // 23.038 Section 4
     /** {@hide} */
-    protected boolean isMwi;
+    protected boolean mIsMwi;
 
     /** {@hide} */
-    protected boolean mwiSense;
+    protected boolean mMwiSense;
 
     /** {@hide} */
-    protected boolean mwiDontStore;
+    protected boolean mMwiDontStore;
 
     /**
      * Indicates status for messages stored on the ICC.
      */
-    protected int statusOnIcc = -1;
+    protected int mStatusOnIcc = -1;
 
     /**
      * Record index of message in the EF.
      */
-    protected int indexOnIcc = -1;
+    protected int mIndexOnIcc = -1;
 
     /** TP-Message-Reference - Message Reference of sent message. @hide */
-    public int messageRef;
+    public int mMessageRef;
 
     // TODO(): This class is duplicated in SmsMessage.java. Refactor accordingly.
     public static abstract class SubmitPduBase  {
@@ -103,7 +103,7 @@ public abstract class SmsMessageBase {
      * or null if there is none.
      */
     public String getServiceCenterAddress() {
-        return scAddress;
+        return mScAddress;
     }
 
     /**
@@ -111,11 +111,11 @@ public abstract class SmsMessageBase {
      * form or null if unavailable
      */
     public String getOriginatingAddress() {
-        if (originatingAddress == null) {
+        if (mOriginatingAddress == null) {
             return null;
         }
 
-        return originatingAddress.getAddressString();
+        return mOriginatingAddress.getAddressString();
     }
 
     /**
@@ -124,8 +124,8 @@ public abstract class SmsMessageBase {
      * unavailable.
      */
     public String getDisplayOriginatingAddress() {
-        if (isEmail) {
-            return emailFrom;
+        if (mIsEmail) {
+            return mEmailFrom;
         } else {
             return getOriginatingAddress();
         }
@@ -136,7 +136,7 @@ public abstract class SmsMessageBase {
      * @return message body is there is one, otherwise null
      */
     public String getMessageBody() {
-        return messageBody;
+        return mMessageBody;
     }
 
     /**
@@ -149,8 +149,8 @@ public abstract class SmsMessageBase {
      * an email gateway. Returns null if message body unavailable.
      */
     public String getDisplayMessageBody() {
-        if (isEmail) {
-            return emailBody;
+        if (mIsEmail) {
+            return mEmailBody;
         } else {
             return getMessageBody();
         }
@@ -161,14 +161,14 @@ public abstract class SmsMessageBase {
      * if not present
      */
     public String getPseudoSubject() {
-        return pseudoSubject == null ? "" : pseudoSubject;
+        return mPseudoSubject == null ? "" : mPseudoSubject;
     }
 
     /**
      * Returns the service centre timestamp in currentTimeMillis() format
      */
     public long getTimestampMillis() {
-        return scTimeMillis;
+        return mScTimeMillis;
     }
 
     /**
@@ -178,7 +178,7 @@ public abstract class SmsMessageBase {
      *         sender / subject / parsed body are available
      */
     public boolean isEmail() {
-        return isEmail;
+        return mIsEmail;
     }
 
     /**
@@ -186,7 +186,7 @@ public abstract class SmsMessageBase {
      *         null otherwise
      */
     public String getEmailBody() {
-        return emailBody;
+        return mEmailBody;
     }
 
     /**
@@ -194,7 +194,7 @@ public abstract class SmsMessageBase {
      *         the gateway. null otherwise
      */
     public String getEmailFrom() {
-        return emailFrom;
+        return mEmailFrom;
     }
 
     /**
@@ -239,7 +239,7 @@ public abstract class SmsMessageBase {
      * present.
      */
     public byte[] getUserData() {
-        return userData;
+        return mUserData;
     }
 
     /**
@@ -248,7 +248,7 @@ public abstract class SmsMessageBase {
      * {@hide}
      */
     public SmsHeader getUserDataHeader() {
-        return userDataHeader;
+        return mUserDataHeader;
     }
 
     /**
@@ -299,7 +299,7 @@ public abstract class SmsMessageBase {
      *         SmsManager.STATUS_ON_ICC_UNSENT
      */
     public int getStatusOnIcc() {
-        return statusOnIcc;
+        return mStatusOnIcc;
     }
 
     /**
@@ -308,13 +308,13 @@ public abstract class SmsMessageBase {
      *         SmsMessage was not created from a ICC SMS EF record.
      */
     public int getIndexOnIcc() {
-        return indexOnIcc;
+        return mIndexOnIcc;
     }
 
     protected void parseMessageBody() {
         // originatingAddress could be null if this message is from a status
         // report.
-        if (originatingAddress != null && originatingAddress.couldBeEmailGateway()) {
+        if (mOriginatingAddress != null && mOriginatingAddress.couldBeEmailGateway()) {
             extractEmailAddressFromMessageBody();
         }
     }
@@ -339,11 +339,11 @@ public abstract class SmsMessageBase {
          * -or-
          * 2. [x@y][ ]/[body]
          */
-         String[] parts = messageBody.split("( /)|( )", 2);
+         String[] parts = mMessageBody.split("( /)|( )", 2);
          if (parts.length < 2) return;
-         emailFrom = parts[0];
-         emailBody = parts[1];
-         isEmail = Telephony.Mms.isEmailAddress(emailFrom);
+         mEmailFrom = parts[0];
+         mEmailBody = parts[1];
+         mIsEmail = Telephony.Mms.isEmailAddress(mEmailFrom);
     }
 
 }
index 633a53e..40f71e7 100644 (file)
@@ -23,26 +23,26 @@ package com.android.internal.telephony;
  */
 public class SmsResponse {
     /** Message reference of the just-sent SMS. */
-    int messageRef;
+    int mMessageRef;
     /** ackPdu for the just-sent SMS. */
-    String ackPdu;
+    String mAckPdu;
     /**
      * errorCode: See 3GPP 27.005, 3.2.5 for GSM/UMTS,
      * 3GPP2 N.S0005 (IS-41C) Table 171 for CDMA, -1 if unknown or not applicable.
      */
-    int errorCode;
+    int mErrorCode;
 
     public SmsResponse(int messageRef, String ackPdu, int errorCode) {
-        this.messageRef = messageRef;
-        this.ackPdu = ackPdu;
-        this.errorCode = errorCode;
+        mMessageRef = messageRef;
+        mAckPdu = ackPdu;
+        mErrorCode = errorCode;
     }
 
     @Override
     public String toString() {
-        String ret = "{ messageRef = " + messageRef
-                        + ", errorCode = " + errorCode
-                        + ", ackPdu = " + ackPdu
+        String ret = "{ mMessageRef = " + mMessageRef
+                        + ", mErrorCode = " + mErrorCode
+                        + ", mAckPdu = " + mAckPdu
                         + "}";
         return ret;
     }
index 6a9283f..b30afe0 100644 (file)
@@ -54,7 +54,7 @@ public final class SmsStorageMonitor extends Handler {
 
     private boolean mReportMemoryStatusPending;
 
-    final CommandsInterface mCm;                            // accessed from inner class
+    final CommandsInterface mCi;                            // accessed from inner class
     boolean mStorageAvailable = true;                       // accessed from inner class
 
     /**
@@ -69,12 +69,12 @@ public final class SmsStorageMonitor extends Handler {
      */
     public SmsStorageMonitor(PhoneBase phone) {
         mContext = phone.getContext();
-        mCm = phone.mCM;
+        mCi = phone.mCi;
 
         createWakelock();
 
-        mCm.setOnIccSmsFull(this, EVENT_ICC_FULL, null);
-        mCm.registerForOn(this, EVENT_RADIO_ON, null);
+        mCi.setOnIccSmsFull(this, EVENT_ICC_FULL, null);
+        mCi.registerForOn(this, EVENT_RADIO_ON, null);
 
         // Register for device storage intents.  Use these to notify the RIL
         // that storage for SMS is or is not available.
@@ -85,8 +85,8 @@ public final class SmsStorageMonitor extends Handler {
     }
 
     public void dispose() {
-        mCm.unSetOnIccSmsFull(this);
-        mCm.unregisterForOn(this);
+        mCi.unSetOnIccSmsFull(this);
+        mCi.unregisterForOn(this);
         mContext.unregisterReceiver(mResultReceiver);
     }
 
@@ -118,7 +118,7 @@ public final class SmsStorageMonitor extends Handler {
                 if (mReportMemoryStatusPending) {
                     Rlog.v(TAG, "Sending pending memory status report : mStorageAvailable = "
                             + mStorageAvailable);
-                    mCm.reportSmsMemoryStatus(mStorageAvailable,
+                    mCi.reportSmsMemoryStatus(mStorageAvailable,
                             obtainMessage(EVENT_REPORT_MEMORY_STATUS_DONE));
                 }
                 break;
@@ -152,10 +152,10 @@ public final class SmsStorageMonitor extends Handler {
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals(Intent.ACTION_DEVICE_STORAGE_FULL)) {
                 mStorageAvailable = false;
-                mCm.reportSmsMemoryStatus(false, obtainMessage(EVENT_REPORT_MEMORY_STATUS_DONE));
+                mCi.reportSmsMemoryStatus(false, obtainMessage(EVENT_REPORT_MEMORY_STATUS_DONE));
             } else if (intent.getAction().equals(Intent.ACTION_DEVICE_STORAGE_NOT_FULL)) {
                 mStorageAvailable = true;
-                mCm.reportSmsMemoryStatus(true, obtainMessage(EVENT_REPORT_MEMORY_STATUS_DONE));
+                mCi.reportSmsMemoryStatus(true, obtainMessage(EVENT_REPORT_MEMORY_STATUS_DONE));
             }
         }
     };
index 801b845..300887c 100644 (file)
@@ -56,45 +56,45 @@ public class UUSInfo {
 
     public static final int UUS_DCS_IA5c = 4; /* IA5 characters */
 
-    private int uusType;
+    private int mUusType;
 
-    private int uusDcs;
+    private int mUusDcs;
 
-    private byte[] uusData;
+    private byte[] mUusData;
 
     public UUSInfo() {
-        this.uusType = UUS_TYPE1_IMPLICIT;
-        this.uusDcs = UUS_DCS_IA5c;
-        this.uusData = null;
+        mUusType = UUS_TYPE1_IMPLICIT;
+        mUusDcs = UUS_DCS_IA5c;
+        mUusData = null;
     }
 
     public UUSInfo(int uusType, int uusDcs, byte[] uusData) {
-        this.uusType = uusType;
-        this.uusDcs = uusDcs;
-        this.uusData = uusData;
+        mUusType = uusType;
+        mUusDcs = uusDcs;
+        mUusData = uusData;
     }
 
     public int getDcs() {
-        return uusDcs;
+        return mUusDcs;
     }
 
     public void setDcs(int uusDcs) {
-        this.uusDcs = uusDcs;
+        mUusDcs = uusDcs;
     }
 
     public int getType() {
-        return uusType;
+        return mUusType;
     }
 
     public void setType(int uusType) {
-        this.uusType = uusType;
+        mUusType = uusType;
     }
 
     public byte[] getUserData() {
-        return uusData;
+        return mUusData;
     }
 
     public void setUserData(byte[] uusData) {
-        this.uusData = uusData;
+        mUusData = uusData;
     }
 }
index a19546a..281488a 100755 (executable)
@@ -196,15 +196,15 @@ public class WspTypeDecoder {
     public static final String CONTENT_TYPE_B_MMS = "application/vnd.wap.mms-message";
     public static final String CONTENT_TYPE_B_PUSH_SYNCML_NOTI = "application/vnd.syncml.notification";
 
-    byte[] wspData;
-    int    dataLength;
-    long   unsigned32bit;
-    String stringValue;
+    byte[] mWspData;
+    int    mDataLength;
+    long   mUnsigned32bit;
+    String mStringValue;
 
-    HashMap<String, String> contentParameters;
+    HashMap<String, String> mContentParameters;
 
     public WspTypeDecoder(byte[] pdu) {
-        wspData = pdu;
+        mWspData = pdu;
     }
 
     /**
@@ -218,14 +218,14 @@ public class WspTypeDecoder {
      */
     public boolean decodeTextString(int startIndex) {
         int index = startIndex;
-        while (wspData[index] != 0) {
+        while (mWspData[index] != 0) {
             index++;
         }
-        dataLength = index - startIndex + 1;
-        if (wspData[startIndex] == 127) {
-            stringValue = new String(wspData, startIndex + 1, dataLength - 2);
+        mDataLength = index - startIndex + 1;
+        if (mWspData[startIndex] == 127) {
+            mStringValue = new String(mWspData, startIndex + 1, mDataLength - 2);
         } else {
-            stringValue = new String(wspData, startIndex, dataLength - 1);
+            mStringValue = new String(mWspData, startIndex, mDataLength - 1);
         }
         return true;
     }
@@ -241,11 +241,11 @@ public class WspTypeDecoder {
      */
     public boolean decodeTokenText(int startIndex) {
         int index = startIndex;
-        while (wspData[index] != 0) {
+        while (mWspData[index] != 0) {
             index++;
         }
-        dataLength = index - startIndex + 1;
-        stringValue = new String(wspData, startIndex, dataLength - 1);
+        mDataLength = index - startIndex + 1;
+        mStringValue = new String(mWspData, startIndex, mDataLength - 1);
 
         return true;
     }
@@ -260,11 +260,11 @@ public class WspTypeDecoder {
      *         length of data in pdu can be retrieved by getDecodedDataLength() method
      */
     public boolean decodeShortInteger(int startIndex) {
-        if ((wspData[startIndex] & 0x80) == 0) {
+        if ((mWspData[startIndex] & 0x80) == 0) {
             return false;
         }
-        unsigned32bit = wspData[startIndex] & 0x7f;
-        dataLength = 1;
+        mUnsigned32bit = mWspData[startIndex] & 0x7f;
+        mDataLength = 1;
         return true;
     }
 
@@ -278,16 +278,16 @@ public class WspTypeDecoder {
      *         length of data in pdu can be retrieved by getDecodedDataLength() method
      */
     public boolean decodeLongInteger(int startIndex) {
-        int lengthMultiOctet = wspData[startIndex] & 0xff;
+        int lengthMultiOctet = mWspData[startIndex] & 0xff;
 
         if (lengthMultiOctet > WAP_PDU_SHORT_LENGTH_MAX) {
             return false;
         }
-        unsigned32bit = 0;
+        mUnsigned32bit = 0;
         for (int i = 1; i <= lengthMultiOctet; i++) {
-            unsigned32bit = (unsigned32bit << 8) | (wspData[startIndex + i] & 0xff);
+            mUnsigned32bit = (mUnsigned32bit << 8) | (mWspData[startIndex + i] & 0xff);
         }
-        dataLength = 1 + lengthMultiOctet;
+        mDataLength = 1 + lengthMultiOctet;
         return true;
     }
 
@@ -319,16 +319,16 @@ public class WspTypeDecoder {
     public boolean decodeUintvarInteger(int startIndex) {
         int index = startIndex;
 
-        unsigned32bit = 0;
-        while ((wspData[index] & 0x80) != 0) {
+        mUnsigned32bit = 0;
+        while ((mWspData[index] & 0x80) != 0) {
             if ((index - startIndex) >= 4) {
                 return false;
             }
-            unsigned32bit = (unsigned32bit << 7) | (wspData[index] & 0x7f);
+            mUnsigned32bit = (mUnsigned32bit << 7) | (mWspData[index] & 0x7f);
             index++;
         }
-        unsigned32bit = (unsigned32bit << 7) | (wspData[index] & 0x7f);
-        dataLength = index - startIndex + 1;
+        mUnsigned32bit = (mUnsigned32bit << 7) | (mWspData[index] & 0x7f);
+        mDataLength = index - startIndex + 1;
         return true;
     }
 
@@ -342,15 +342,15 @@ public class WspTypeDecoder {
      *         length of data in pdu can be retrieved by getDecodedDataLength() method
      */
     public boolean decodeValueLength(int startIndex) {
-        if ((wspData[startIndex] & 0xff) > WAP_PDU_LENGTH_QUOTE) {
+        if ((mWspData[startIndex] & 0xff) > WAP_PDU_LENGTH_QUOTE) {
             return false;
         }
-        if (wspData[startIndex] < WAP_PDU_LENGTH_QUOTE) {
-            unsigned32bit = wspData[startIndex];
-            dataLength = 1;
+        if (mWspData[startIndex] < WAP_PDU_LENGTH_QUOTE) {
+            mUnsigned32bit = mWspData[startIndex];
+            mDataLength = 1;
         } else {
             decodeUintvarInteger(startIndex + 1);
-            dataLength++;
+            mDataLength++;
         }
         return true;
     }
@@ -367,17 +367,17 @@ public class WspTypeDecoder {
      */
     public boolean decodeExtensionMedia(int startIndex) {
         int index = startIndex;
-        dataLength = 0;
-        stringValue = null;
-        int length = wspData.length;
+        mDataLength = 0;
+        mStringValue = null;
+        int length = mWspData.length;
         boolean rtrn = index < length;
 
-        while (index < length && wspData[index] != 0) {
+        while (index < length && mWspData[index] != 0) {
             index++;
         }
 
-        dataLength = index - startIndex + 1;
-        stringValue = new String(wspData, startIndex, dataLength - 1);
+        mDataLength = index - startIndex + 1;
+        mStringValue = new String(mWspData, startIndex, mDataLength - 1);
 
         return rtrn;
     }
@@ -393,7 +393,7 @@ public class WspTypeDecoder {
      */
     public boolean decodeConstrainedEncoding(int startIndex) {
         if (decodeShortInteger(startIndex) == true) {
-            stringValue = null;
+            mStringValue = null;
             return true;
         }
         return decodeExtensionMedia(startIndex);
@@ -414,7 +414,7 @@ public class WspTypeDecoder {
      */
     public boolean decodeContentType(int startIndex) {
         int mediaPrefixLength;
-        contentParameters = new HashMap<String, String>();
+        mContentParameters = new HashMap<String, String>();
 
         try {
             if (decodeValueLength(startIndex) == false) {
@@ -424,35 +424,35 @@ public class WspTypeDecoder {
                 }
                 return found;
             }
-            int headersLength = (int) unsigned32bit;
+            int headersLength = (int) mUnsigned32bit;
             mediaPrefixLength = getDecodedDataLength();
             if (decodeIntegerValue(startIndex + mediaPrefixLength) == true) {
-                dataLength += mediaPrefixLength;
-                int readLength = dataLength;
-                stringValue = null;
+                mDataLength += mediaPrefixLength;
+                int readLength = mDataLength;
+                mStringValue = null;
                 expandWellKnownMimeType();
-                long wellKnownValue = unsigned32bit;
-                String mimeType = stringValue;
-                if (readContentParameters(startIndex + dataLength,
-                        (headersLength - (dataLength - mediaPrefixLength)), 0)) {
-                    dataLength += readLength;
-                    unsigned32bit = wellKnownValue;
-                    stringValue = mimeType;
+                long wellKnownValue = mUnsigned32bit;
+                String mimeType = mStringValue;
+                if (readContentParameters(startIndex + mDataLength,
+                        (headersLength - (mDataLength - mediaPrefixLength)), 0)) {
+                    mDataLength += readLength;
+                    mUnsigned32bit = wellKnownValue;
+                    mStringValue = mimeType;
                     return true;
                 }
                 return false;
             }
             if (decodeExtensionMedia(startIndex + mediaPrefixLength) == true) {
-                dataLength += mediaPrefixLength;
-                int readLength = dataLength;
+                mDataLength += mediaPrefixLength;
+                int readLength = mDataLength;
                 expandWellKnownMimeType();
-                long wellKnownValue = unsigned32bit;
-                String mimeType = stringValue;
-                if (readContentParameters(startIndex + dataLength,
-                        (headersLength - (dataLength - mediaPrefixLength)), 0)) {
-                    dataLength += readLength;
-                    unsigned32bit = wellKnownValue;
-                    stringValue = mimeType;
+                long wellKnownValue = mUnsigned32bit;
+                String mimeType = mStringValue;
+                if (readContentParameters(startIndex + mDataLength,
+                        (headersLength - (mDataLength - mediaPrefixLength)), 0)) {
+                    mDataLength += readLength;
+                    mUnsigned32bit = wellKnownValue;
+                    mStringValue = mimeType;
                     return true;
                 }
             }
@@ -468,17 +468,17 @@ public class WspTypeDecoder {
         int totalRead = 0;
 
         if (leftToRead > 0) {
-            byte nextByte = wspData[startIndex];
+            byte nextByte = mWspData[startIndex];
             String value = null;
             String param = null;
             if ((nextByte & 0x80) == 0x00 && nextByte > 31) { // untyped
                 decodeTokenText(startIndex);
-                param = stringValue;
-                totalRead += dataLength;
+                param = mStringValue;
+                totalRead += mDataLength;
             } else { // typed
                 if (decodeIntegerValue(startIndex)) {
-                    totalRead += dataLength;
-                    int wellKnownParameterValue = (int) unsigned32bit;
+                    totalRead += mDataLength;
+                    int wellKnownParameterValue = (int) mUnsigned32bit;
                     param = WELL_KNOWN_PARAMETERS.get(wellKnownParameterValue);
                     if (param == null) {
                         param = "unassigned/0x" + Long.toHexString(wellKnownParameterValue);
@@ -486,9 +486,9 @@ public class WspTypeDecoder {
                     // special case for the "Q" parameter, value is a uintvar
                     if (wellKnownParameterValue == Q_VALUE) {
                         if (decodeUintvarInteger(startIndex + totalRead)) {
-                            totalRead += dataLength;
-                            value = String.valueOf(unsigned32bit);
-                            contentParameters.put(param, value);
+                            totalRead += mDataLength;
+                            value = String.valueOf(mUnsigned32bit);
+                            mContentParameters.put(param, value);
                             return readContentParameters(startIndex + totalRead, leftToRead
                                                             - totalRead, accumulator + totalRead);
                         } else {
@@ -501,27 +501,27 @@ public class WspTypeDecoder {
             }
 
             if (decodeNoValue(startIndex + totalRead)) {
-                totalRead += dataLength;
+                totalRead += mDataLength;
                 value = null;
             } else if (decodeIntegerValue(startIndex + totalRead)) {
-                totalRead += dataLength;
-                int intValue = (int) unsigned32bit;
+                totalRead += mDataLength;
+                int intValue = (int) mUnsigned32bit;
                 value = String.valueOf(intValue);
             } else {
                 decodeTokenText(startIndex + totalRead);
-                totalRead += dataLength;
-                value = stringValue;
+                totalRead += mDataLength;
+                value = mStringValue;
                 if (value.startsWith("\"")) {
                     // quoted string, so remove the quote
                     value = value.substring(1);
                 }
             }
-            contentParameters.put(param, value);
+            mContentParameters.put(param, value);
             return readContentParameters(startIndex + totalRead, leftToRead - totalRead,
                                             accumulator + totalRead);
 
         } else {
-            dataLength = accumulator;
+            mDataLength = accumulator;
             return true;
         }
     }
@@ -534,8 +534,8 @@ public class WspTypeDecoder {
      * @return true if and only if the next byte is 0x00
      */
     private boolean decodeNoValue(int startIndex) {
-        if (wspData[startIndex] == 0) {
-            dataLength = 1;
+        if (mWspData[startIndex] == 0) {
+            mDataLength = 1;
             return true;
         } else {
             return false;
@@ -548,11 +548,11 @@ public class WspTypeDecoder {
      * Sets unsigned32bit to -1 if stringValue is already populated
      */
     private void expandWellKnownMimeType() {
-        if (stringValue == null) {
-            int binaryContentType = (int) unsigned32bit;
-            stringValue = WELL_KNOWN_MIME_TYPES.get(binaryContentType);
+        if (mStringValue == null) {
+            int binaryContentType = (int) mUnsigned32bit;
+            mStringValue = WELL_KNOWN_MIME_TYPES.get(binaryContentType);
         } else {
-            unsigned32bit = -1;
+            mUnsigned32bit = -1;
         }
     }
 
@@ -594,7 +594,7 @@ public class WspTypeDecoder {
      */
     public boolean decodeXWapApplicationId(int startIndex) {
         if (decodeIntegerValue(startIndex) == true) {
-            stringValue = null;
+            mStringValue = null;
             return true;
         }
         return decodeTextString(startIndex);
@@ -622,7 +622,7 @@ public class WspTypeDecoder {
                     int fieldValue = (int) getValue32();
 
                     if (fieldValue == PARAMETER_ID_X_WAP_APPLICATION_ID) {
-                        unsigned32bit = index + 1;
+                        mUnsigned32bit = index + 1;
                         return true;
                     }
                 } else {
@@ -642,9 +642,9 @@ public class WspTypeDecoder {
                         (NUL character)
                  * 128 - 255 It is an encoded 7-bit value; this header has no more data
                  */
-                byte val = wspData[index];
+                byte val = mWspData[index];
                 if (0 <= val && val <= WAP_PDU_SHORT_LENGTH_MAX) {
-                    index += wspData[index] + 1;
+                    index += mWspData[index] + 1;
                 } else if (val == WAP_PDU_LENGTH_QUOTE) {
                     if (index + 1 >= endIndex) return false;
                     index++;
@@ -694,21 +694,21 @@ public class WspTypeDecoder {
      * The data length of latest operation.
      */
     public int getDecodedDataLength() {
-        return dataLength;
+        return mDataLength;
     }
 
     /**
      * The 32-bits result of latest operation.
      */
     public long getValue32() {
-        return unsigned32bit;
+        return mUnsigned32bit;
     }
 
     /**
      * The String result of latest operation.
      */
     public String getValueString() {
-        return stringValue;
+        return mStringValue;
     }
 
     /**
@@ -722,6 +722,6 @@ public class WspTypeDecoder {
      *
      */
     public HashMap<String, String> getContentParameters() {
-        return contentParameters;
+        return mContentParameters;
     }
 }
index 8a1982f..4e06f60 100644 (file)
@@ -51,11 +51,11 @@ public class CatCmdMessage implements Parcelable {
     }
 
     CatCmdMessage(CommandParams cmdParams) {
-        mCmdDet = cmdParams.cmdDet;
+        mCmdDet = cmdParams.mCmdDet;
         switch(getCmdType()) {
         case SET_UP_MENU:
         case SELECT_ITEM:
-            mMenu = ((SelectItemParams) cmdParams).menu;
+            mMenu = ((SelectItemParams) cmdParams).mMenu;
             break;
         case DISPLAY_TEXT:
         case SET_UP_IDLE_MODE_TEXT:
@@ -63,37 +63,37 @@ public class CatCmdMessage implements Parcelable {
         case SEND_SMS:
         case SEND_SS:
         case SEND_USSD:
-            mTextMsg = ((DisplayTextParams) cmdParams).textMsg;
+            mTextMsg = ((DisplayTextParams) cmdParams).mTextMsg;
             break;
         case GET_INPUT:
         case GET_INKEY:
-            mInput = ((GetInputParams) cmdParams).input;
+            mInput = ((GetInputParams) cmdParams).mInput;
             break;
         case LAUNCH_BROWSER:
-            mTextMsg = ((LaunchBrowserParams) cmdParams).confirmMsg;
+            mTextMsg = ((LaunchBrowserParams) cmdParams).mConfirmMsg;
             mBrowserSettings = new BrowserSettings();
-            mBrowserSettings.url = ((LaunchBrowserParams) cmdParams).url;
-            mBrowserSettings.mode = ((LaunchBrowserParams) cmdParams).mode;
+            mBrowserSettings.url = ((LaunchBrowserParams) cmdParams).mUrl;
+            mBrowserSettings.mode = ((LaunchBrowserParams) cmdParams).mMode;
             break;
         case PLAY_TONE:
             PlayToneParams params = (PlayToneParams) cmdParams;
-            mToneSettings = params.settings;
-            mTextMsg = params.textMsg;
+            mToneSettings = params.mSettings;
+            mTextMsg = params.mTextMsg;
             break;
         case GET_CHANNEL_STATUS:
-            mTextMsg = ((CallSetupParams) cmdParams).confirmMsg;
+            mTextMsg = ((CallSetupParams) cmdParams).mConfirmMsg;
             break;
         case SET_UP_CALL:
             mCallSettings = new CallSettings();
-            mCallSettings.confirmMsg = ((CallSetupParams) cmdParams).confirmMsg;
-            mCallSettings.callMsg = ((CallSetupParams) cmdParams).callMsg;
+            mCallSettings.confirmMsg = ((CallSetupParams) cmdParams).mConfirmMsg;
+            mCallSettings.callMsg = ((CallSetupParams) cmdParams).mCallMsg;
             break;
         case OPEN_CHANNEL:
         case CLOSE_CHANNEL:
         case RECEIVE_DATA:
         case SEND_DATA:
             BIPClientParams param = (BIPClientParams) cmdParams;
-            mTextMsg = param.textMsg;
+            mTextMsg = param.mTextMsg;
             break;
         case PROVIDE_LOCAL_INFORMATION:
         case REFRESH:
index 15309e4..a3fc04e 100644 (file)
 package com.android.internal.telephony.cat;
 
 public class CatResponseMessage {
-        CommandDetails cmdDet = null;
-        ResultCode resCode  = ResultCode.OK;
-        int usersMenuSelection = 0;
-        String usersInput  = null;
-        boolean usersYesNoSelection = false;
-        boolean usersConfirm = false;
-        boolean includeAdditionalInfo = false;
-        int additionalInfo = 0;
+        CommandDetails mCmdDet = null;
+        ResultCode mResCode  = ResultCode.OK;
+        int mUsersMenuSelection = 0;
+        String mUsersInput  = null;
+        boolean mUsersYesNoSelection = false;
+        boolean mUsersConfirm = false;
+        boolean mIncludeAdditionalInfo = false;
+        int mAdditionalInfo = 0;
         public CatResponseMessage(CatCmdMessage cmdMsg) {
-            this.cmdDet = cmdMsg.mCmdDet;
+            mCmdDet = cmdMsg.mCmdDet;
         }
 
         public void setResultCode(ResultCode resCode) {
-            this.resCode = resCode;
+            mResCode = resCode;
         }
 
         public void setMenuSelection(int selection) {
-            this.usersMenuSelection = selection;
+            mUsersMenuSelection = selection;
         }
 
         public void setInput(String input) {
-            this.usersInput = input;
+            mUsersInput = input;
         }
 
         public void setYesNo(boolean yesNo) {
-            usersYesNoSelection = yesNo;
+            mUsersYesNoSelection = yesNo;
         }
 
         public void setConfirmation(boolean confirm) {
-            usersConfirm = confirm;
+            mUsersConfirm = confirm;
         }
 
         public void setAdditionalInfo(int info) {
-            this.includeAdditionalInfo = true;
-            this.additionalInfo = info;
+            mIncludeAdditionalInfo = true;
+            mAdditionalInfo = info;
         }
 
         CommandDetails getCmdDetails() {
-            return cmdDet;
+            return mCmdDet;
         }
     }
index a513c23..5814604 100644 (file)
@@ -49,9 +49,9 @@ class RilMessage {
     }
 
     RilMessage(RilMessage other) {
-        this.mId = other.mId;
-        this.mData = other.mData;
-        this.mResCode = other.mResCode;
+        mId = other.mId;
+        mData = other.mData;
+        mResCode = other.mResCode;
     }
 }
 
@@ -140,7 +140,7 @@ public class CatService extends Handler implements AppInterface {
         mCmdIf.unSetOnCatEvent(this);
         mCmdIf.unSetOnCatCallSetUp(this);
 
-        this.removeCallbacksAndMessages(null);
+        removeCallbacksAndMessages(null);
     }
 
     @Override
@@ -184,7 +184,7 @@ public class CatService extends Handler implements AppInterface {
                     // for proactive commands that couldn't be decoded
                     // successfully respond with the code generated by the
                     // message decoder.
-                    sendTerminalResponse(cmdParams.cmdDet, rilMsg.mResCode,
+                    sendTerminalResponse(cmdParams.mCmdDet, rilMsg.mResCode,
                             false, 0, null);
                 }
             }
@@ -224,43 +224,43 @@ public class CatService extends Handler implements AppInterface {
                 } else {
                     mMenuCmd = cmdMsg;
                 }
-                sendTerminalResponse(cmdParams.cmdDet, ResultCode.OK, false, 0, null);
+                sendTerminalResponse(cmdParams.mCmdDet, ResultCode.OK, false, 0, null);
                 break;
             case DISPLAY_TEXT:
                 // when application is not required to respond, send an immediate response.
                 if (!cmdMsg.geTextMessage().responseNeeded) {
-                    sendTerminalResponse(cmdParams.cmdDet, ResultCode.OK, false, 0, null);
+                    sendTerminalResponse(cmdParams.mCmdDet, ResultCode.OK, false, 0, null);
                 }
                 break;
             case REFRESH:
                 // ME side only handles refresh commands which meant to remove IDLE
                 // MODE TEXT.
-                cmdParams.cmdDet.typeOfCommand = CommandType.SET_UP_IDLE_MODE_TEXT.value();
+                cmdParams.mCmdDet.typeOfCommand = CommandType.SET_UP_IDLE_MODE_TEXT.value();
                 break;
             case SET_UP_IDLE_MODE_TEXT:
-                sendTerminalResponse(cmdParams.cmdDet, ResultCode.OK, false, 0, null);
+                sendTerminalResponse(cmdParams.mCmdDet, ResultCode.OK, false, 0, null);
                 break;
             case PROVIDE_LOCAL_INFORMATION:
                 ResponseData resp;
-                switch (cmdParams.cmdDet.commandQualifier) {
+                switch (cmdParams.mCmdDet.commandQualifier) {
                     case CommandParamsFactory.DTTZ_SETTING:
                         resp = new DTTZResponseData(null);
-                        sendTerminalResponse(cmdParams.cmdDet, ResultCode.OK, false, 0, resp);
+                        sendTerminalResponse(cmdParams.mCmdDet, ResultCode.OK, false, 0, resp);
                         break;
                     case CommandParamsFactory.LANGUAGE_SETTING:
                         resp = new LanguageResponseData(Locale.getDefault().getLanguage());
-                        sendTerminalResponse(cmdParams.cmdDet, ResultCode.OK, false, 0, resp);
+                        sendTerminalResponse(cmdParams.mCmdDet, ResultCode.OK, false, 0, resp);
                         break;
                     default:
-                        sendTerminalResponse(cmdParams.cmdDet, ResultCode.OK, false, 0, null);
+                        sendTerminalResponse(cmdParams.mCmdDet, ResultCode.OK, false, 0, null);
                 }
                 // No need to start STK app here.
                 return;
             case LAUNCH_BROWSER:
-                if ((((LaunchBrowserParams) cmdParams).confirmMsg.text != null)
-                        && (((LaunchBrowserParams) cmdParams).confirmMsg.text.equals(STK_DEFAULT))) {
+                if ((((LaunchBrowserParams) cmdParams).mConfirmMsg.text != null)
+                        && (((LaunchBrowserParams) cmdParams).mConfirmMsg.text.equals(STK_DEFAULT))) {
                     message = mContext.getText(com.android.internal.R.string.launchBrowserDefault);
-                    ((LaunchBrowserParams) cmdParams).confirmMsg.text = message.toString();
+                    ((LaunchBrowserParams) cmdParams).mConfirmMsg.text = message.toString();
                 }
                 break;
             case SELECT_ITEM:
@@ -271,19 +271,19 @@ public class CatService extends Handler implements AppInterface {
             case SEND_SMS:
             case SEND_SS:
             case SEND_USSD:
-                if ((((DisplayTextParams)cmdParams).textMsg.text != null)
-                        && (((DisplayTextParams)cmdParams).textMsg.text.equals(STK_DEFAULT))) {
+                if ((((DisplayTextParams)cmdParams).mTextMsg.text != null)
+                        && (((DisplayTextParams)cmdParams).mTextMsg.text.equals(STK_DEFAULT))) {
                     message = mContext.getText(com.android.internal.R.string.sending);
-                    ((DisplayTextParams)cmdParams).textMsg.text = message.toString();
+                    ((DisplayTextParams)cmdParams).mTextMsg.text = message.toString();
                 }
                 break;
             case PLAY_TONE:
                 break;
             case SET_UP_CALL:
-                if ((((CallSetupParams) cmdParams).confirmMsg.text != null)
-                        && (((CallSetupParams) cmdParams).confirmMsg.text.equals(STK_DEFAULT))) {
+                if ((((CallSetupParams) cmdParams).mConfirmMsg.text != null)
+                        && (((CallSetupParams) cmdParams).mConfirmMsg.text.equals(STK_DEFAULT))) {
                     message = mContext.getText(com.android.internal.R.string.SetupCallDefault);
-                    ((CallSetupParams) cmdParams).confirmMsg.text = message.toString();
+                    ((CallSetupParams) cmdParams).mConfirmMsg.text = message.toString();
                 }
                 break;
             case OPEN_CHANNEL:
@@ -291,11 +291,11 @@ public class CatService extends Handler implements AppInterface {
             case RECEIVE_DATA:
             case SEND_DATA:
                 BIPClientParams cmd = (BIPClientParams) cmdParams;
-                if (cmd.bHasAlphaId && (cmd.textMsg.text == null)) {
+                if (cmd.mHasAlphaId && (cmd.mTextMsg.text == null)) {
                     CatLog.d(this, "cmd " + cmdParams.getCommandType() + " with null alpha id");
                     // If alpha length is zero, we just respond with OK.
                     if (isProactiveCmd) {
-                        sendTerminalResponse(cmdParams.cmdDet, ResultCode.OK, false, 0, null);
+                        sendTerminalResponse(cmdParams.mCmdDet, ResultCode.OK, false, 0, null);
                     }
                     return;
                 }
@@ -303,7 +303,7 @@ public class CatService extends Handler implements AppInterface {
                 if (!mStkAppInstalled) {
                     CatLog.d(this, "No STK application found.");
                     if (isProactiveCmd) {
-                        sendTerminalResponse(cmdParams.cmdDet,
+                        sendTerminalResponse(cmdParams.mCmdDet,
                                              ResultCode.BEYOND_TERMINAL_CAPABILITY,
                                              false, 0, null);
                         return;
@@ -319,7 +319,7 @@ public class CatService extends Handler implements AppInterface {
                     ((cmdParams.getCommandType() == CommandType.CLOSE_CHANNEL) ||
                      (cmdParams.getCommandType() == CommandType.RECEIVE_DATA) ||
                      (cmdParams.getCommandType() == CommandType.SEND_DATA))) {
-                    sendTerminalResponse(cmdParams.cmdDet, ResultCode.OK, false, 0, null);
+                    sendTerminalResponse(cmdParams.mCmdDet, ResultCode.OK, false, 0, null);
                 }
                 break;
             default:
@@ -618,13 +618,13 @@ public class CatService extends Handler implements AppInterface {
             return;
         }
         // queue a response message.
-        Message msg = this.obtainMessage(MSG_ID_RESPONSE, resMsg);
+        Message msg = obtainMessage(MSG_ID_RESPONSE, resMsg);
         msg.sendToTarget();
     }
 
     private boolean validateResponse(CatResponseMessage resMsg) {
         if (mCurrntCmd != null) {
-            return (resMsg.cmdDet.compareTo(mCurrntCmd.mCmdDet));
+            return (resMsg.mCmdDet.compareTo(mCurrntCmd.mCmdDet));
         }
         return false;
     }
@@ -659,7 +659,7 @@ public class CatService extends Handler implements AppInterface {
         boolean helpRequired = false;
         CommandDetails cmdDet = resMsg.getCmdDetails();
 
-        switch (resMsg.resCode) {
+        switch (resMsg.mResCode) {
         case HELP_INFO_REQUIRED:
             helpRequired = true;
             // fall through
@@ -676,11 +676,11 @@ public class CatService extends Handler implements AppInterface {
         case TERMINAL_CRNTLY_UNABLE_TO_PROCESS:
             switch (AppInterface.CommandType.fromInt(cmdDet.typeOfCommand)) {
             case SET_UP_MENU:
-                helpRequired = resMsg.resCode == ResultCode.HELP_INFO_REQUIRED;
-                sendMenuSelection(resMsg.usersMenuSelection, helpRequired);
+                helpRequired = resMsg.mResCode == ResultCode.HELP_INFO_REQUIRED;
+                sendMenuSelection(resMsg.mUsersMenuSelection, helpRequired);
                 return;
             case SELECT_ITEM:
-                resp = new SelectItemResponseData(resMsg.usersMenuSelection);
+                resp = new SelectItemResponseData(resMsg.mUsersMenuSelection);
                 break;
             case GET_INPUT:
             case GET_INKEY:
@@ -689,19 +689,19 @@ public class CatService extends Handler implements AppInterface {
                     // when help is requested there is no need to send the text
                     // string object.
                     if (!helpRequired) {
-                        resp = new GetInkeyInputResponseData(resMsg.usersInput,
+                        resp = new GetInkeyInputResponseData(resMsg.mUsersInput,
                                 input.ucs2, input.packed);
                     }
                 } else {
                     resp = new GetInkeyInputResponseData(
-                            resMsg.usersYesNoSelection);
+                            resMsg.mUsersYesNoSelection);
                 }
                 break;
             case DISPLAY_TEXT:
             case LAUNCH_BROWSER:
                 break;
             case SET_UP_CALL:
-                mCmdIf.handleCallSetupRequestFromSim(resMsg.usersConfirm, null);
+                mCmdIf.handleCallSetupRequestFromSim(resMsg.mUsersConfirm, null);
                 // No need to send terminal response for SET UP CALL. The user's
                 // confirmation result is send back using a dedicated ril message
                 // invoked by the CommandInterface call above.
@@ -720,8 +720,8 @@ public class CatService extends Handler implements AppInterface {
         default:
             return;
         }
-        sendTerminalResponse(cmdDet, resMsg.resCode, resMsg.includeAdditionalInfo,
-                resMsg.additionalInfo, resp);
+        sendTerminalResponse(cmdDet, resMsg.mResCode, resMsg.mIncludeAdditionalInfo,
+                resMsg.mAdditionalInfo, resp);
         mCurrntCmd = null;
     }
 
index 8c04e37..cf206bb 100644 (file)
@@ -23,36 +23,36 @@ import android.graphics.Bitmap;
  *
  */
 class CommandParams {
-    CommandDetails cmdDet;
+    CommandDetails mCmdDet;
 
     CommandParams(CommandDetails cmdDet) {
-        this.cmdDet = cmdDet;
+        mCmdDet = cmdDet;
     }
 
     AppInterface.CommandType getCommandType() {
-        return AppInterface.CommandType.fromInt(cmdDet.typeOfCommand);
+        return AppInterface.CommandType.fromInt(mCmdDet.typeOfCommand);
     }
 
     boolean setIcon(Bitmap icon) { return true; }
 
     @Override
     public String toString() {
-        return cmdDet.toString();
+        return mCmdDet.toString();
     }
 }
 
 class DisplayTextParams extends CommandParams {
-    TextMessage textMsg;
+    TextMessage mTextMsg;
 
     DisplayTextParams(CommandDetails cmdDet, TextMessage textMsg) {
         super(cmdDet);
-        this.textMsg = textMsg;
+        mTextMsg = textMsg;
     }
 
     @Override
     boolean setIcon(Bitmap icon) {
-        if (icon != null && textMsg != null) {
-            textMsg.icon = icon;
+        if (icon != null && mTextMsg != null) {
+            mTextMsg.icon = icon;
             return true;
         }
         return false;
@@ -60,22 +60,22 @@ class DisplayTextParams extends CommandParams {
 }
 
 class LaunchBrowserParams extends CommandParams {
-    TextMessage confirmMsg;
-    LaunchBrowserMode mode;
-    String url;
+    TextMessage mConfirmMsg;
+    LaunchBrowserMode mMode;
+    String mUrl;
 
     LaunchBrowserParams(CommandDetails cmdDet, TextMessage confirmMsg,
             String url, LaunchBrowserMode mode) {
         super(cmdDet);
-        this.confirmMsg = confirmMsg;
-        this.mode = mode;
-        this.url = url;
+        mConfirmMsg = confirmMsg;
+        mMode = mode;
+        mUrl = url;
     }
 
     @Override
     boolean setIcon(Bitmap icon) {
-        if (icon != null && confirmMsg != null) {
-            confirmMsg.icon = icon;
+        if (icon != null && mConfirmMsg != null) {
+            mConfirmMsg.icon = icon;
             return true;
         }
         return false;
@@ -83,20 +83,20 @@ class LaunchBrowserParams extends CommandParams {
 }
 
 class PlayToneParams extends CommandParams {
-    TextMessage textMsg;
-    ToneSettings settings;
+    TextMessage mTextMsg;
+    ToneSettings mSettings;
 
     PlayToneParams(CommandDetails cmdDet, TextMessage textMsg,
             Tone tone, Duration duration, boolean vibrate) {
         super(cmdDet);
-        this.textMsg = textMsg;
-        this.settings = new ToneSettings(duration, tone, vibrate);
+        mTextMsg = textMsg;
+        mSettings = new ToneSettings(duration, tone, vibrate);
     }
 
     @Override
     boolean setIcon(Bitmap icon) {
-        if (icon != null && textMsg != null) {
-            textMsg.icon = icon;
+        if (icon != null && mTextMsg != null) {
+            mTextMsg.icon = icon;
             return true;
         }
         return false;
@@ -104,14 +104,14 @@ class PlayToneParams extends CommandParams {
 }
 
 class CallSetupParams extends CommandParams {
-    TextMessage confirmMsg;
-    TextMessage callMsg;
+    TextMessage mConfirmMsg;
+    TextMessage mCallMsg;
 
     CallSetupParams(CommandDetails cmdDet, TextMessage confirmMsg,
             TextMessage callMsg) {
         super(cmdDet);
-        this.confirmMsg = confirmMsg;
-        this.callMsg = callMsg;
+        mConfirmMsg = confirmMsg;
+        mCallMsg = callMsg;
     }
 
     @Override
@@ -119,11 +119,11 @@ class CallSetupParams extends CommandParams {
         if (icon == null) {
             return false;
         }
-        if (confirmMsg != null && confirmMsg.icon == null) {
-            confirmMsg.icon = icon;
+        if (mConfirmMsg != null && mConfirmMsg.icon == null) {
+            mConfirmMsg.icon = icon;
             return true;
-        } else if (callMsg != null && callMsg.icon == null) {
-            callMsg.icon = icon;
+        } else if (mCallMsg != null && mCallMsg.icon == null) {
+            mCallMsg.icon = icon;
             return true;
         }
         return false;
@@ -131,22 +131,22 @@ class CallSetupParams extends CommandParams {
 }
 
 class SelectItemParams extends CommandParams {
-    Menu menu = null;
-    boolean loadTitleIcon = false;
+    Menu mMenu = null;
+    boolean mLoadTitleIcon = false;
 
     SelectItemParams(CommandDetails cmdDet, Menu menu, boolean loadTitleIcon) {
         super(cmdDet);
-        this.menu = menu;
-        this.loadTitleIcon = loadTitleIcon;
+        mMenu = menu;
+        mLoadTitleIcon = loadTitleIcon;
     }
 
     @Override
     boolean setIcon(Bitmap icon) {
-        if (icon != null && menu != null) {
-            if (loadTitleIcon && menu.titleIcon == null) {
-                menu.titleIcon = icon;
+        if (icon != null && mMenu != null) {
+            if (mLoadTitleIcon && mMenu.titleIcon == null) {
+                mMenu.titleIcon = icon;
             } else {
-                for (Item item : menu.items) {
+                for (Item item : mMenu.items) {
                     if (item.icon != null) {
                         continue;
                     }
@@ -161,17 +161,17 @@ class SelectItemParams extends CommandParams {
 }
 
 class GetInputParams extends CommandParams {
-    Input input = null;
+    Input mInput = null;
 
     GetInputParams(CommandDetails cmdDet, Input input) {
         super(cmdDet);
-        this.input = input;
+        mInput = input;
     }
 
     @Override
     boolean setIcon(Bitmap icon) {
-        if (icon != null && input != null) {
-            input.icon = icon;
+        if (icon != null && mInput != null) {
+            mInput.icon = icon;
         }
         return true;
     }
@@ -186,19 +186,19 @@ class GetInputParams extends CommandParams {
  * the details of proactive commands procedures and their structures.
  */
 class BIPClientParams extends CommandParams {
-    TextMessage textMsg;
-    boolean bHasAlphaId;
+    TextMessage mTextMsg;
+    boolean mHasAlphaId;
 
     BIPClientParams(CommandDetails cmdDet, TextMessage textMsg, boolean has_alpha_id) {
         super(cmdDet);
-        this.textMsg = textMsg;
-        this.bHasAlphaId = has_alpha_id;
+        mTextMsg = textMsg;
+        mHasAlphaId = has_alpha_id;
     }
 
     @Override
     boolean setIcon(Bitmap icon) {
-        if (icon != null && textMsg != null) {
-            textMsg.icon = icon;
+        if (icon != null && mTextMsg != null) {
+            mTextMsg.icon = icon;
             return true;
         }
         return false;
index 75e8513..0a21c28 100644 (file)
@@ -916,7 +916,7 @@ class CommandParamsFactory extends Handler {
 
         if (iconId != null) {
             mIconLoadState = LOAD_SINGLE_ICON;
-            mIconLoader.loadIcon(iconId.recordNumber, this.obtainMessage(MSG_ID_LOAD_ICON_DONE));
+            mIconLoader.loadIcon(iconId.recordNumber, obtainMessage(MSG_ID_LOAD_ICON_DONE));
             return true;
         }
         return false;
index e2f0172..b7319a2 100644 (file)
@@ -142,11 +142,11 @@ class IconLoader extends Handler {
             case EVENT_READ_ICON_DONE:
                 ar = (AsyncResult) msg.obj;
                 byte[] rawData = ((byte[]) ar.result);
-                if (mId.codingScheme == ImageDescriptor.CODING_SCHEME_BASIC) {
+                if (mId.mCodingScheme == ImageDescriptor.CODING_SCHEME_BASIC) {
                     mCurrentIcon = parseToBnW(rawData, rawData.length);
                     mIconsCache.put(mRecordNumber, mCurrentIcon);
                     postIcon();
-                } else if (mId.codingScheme == ImageDescriptor.CODING_SCHEME_COLOUR) {
+                } else if (mId.mCodingScheme == ImageDescriptor.CODING_SCHEME_COLOUR) {
                     mIconData = rawData;
                     readClut();
                 }
@@ -185,8 +185,8 @@ class IconLoader extends Handler {
     // Start reading color lookup table from SIM card.
     private void readClut() {
         int length = mIconData[3] * CLUT_ENTRY_SIZE;
-        Message msg = this.obtainMessage(EVENT_READ_CLUT_DONE);
-        mSimFH.loadEFImgTransparent(mId.imageId,
+        Message msg = obtainMessage(EVENT_READ_CLUT_DONE);
+        mSimFH.loadEFImgTransparent(mId.mImageId,
                 mIconData[CLUT_LOCATION_OFFSET],
                 mIconData[CLUT_LOCATION_OFFSET + 1], length, msg);
     }
@@ -198,14 +198,14 @@ class IconLoader extends Handler {
             postIcon();
             return;
         }
-        Message msg = this.obtainMessage(EVENT_READ_EF_IMG_RECOED_DONE);
+        Message msg = obtainMessage(EVENT_READ_EF_IMG_RECOED_DONE);
         mSimFH.loadEFImgLinearFixed(mRecordNumber, msg);
     }
 
     // Start reading icon bytes array from SIM card.
     private void readIconData() {
-        Message msg = this.obtainMessage(EVENT_READ_ICON_DONE);
-        mSimFH.loadEFImgTransparent(mId.imageId, 0, 0, mId.length ,msg);
+        Message msg = obtainMessage(EVENT_READ_ICON_DONE);
+        mSimFH.loadEFImgTransparent(mId.mImageId, 0, 0, mId.mLength ,msg);
     }
 
     // When all is done pass icon back to caller.
index 711d977..139a4e0 100644 (file)
@@ -21,13 +21,13 @@ package com.android.internal.telephony.cat;
  */
 public class ImageDescriptor {
     // members
-    int width;
-    int height;
-    int codingScheme;
-    int imageId;
-    int highOffset;
-    int lowOffset;
-    int length;
+    int mWidth;
+    int mHeight;
+    int mCodingScheme;
+    int mImageId;
+    int mHighOffset;
+    int mLowOffset;
+    int mLength;
 
     // constants
     static final int CODING_SCHEME_BASIC = 0x11;
@@ -37,13 +37,13 @@ public class ImageDescriptor {
     // ID_LENGTH substituted by IccFileHandlerBase.GET_RESPONSE_EF_IMG_SIZE_BYTES
 
     ImageDescriptor() {
-        width = 0;
-        height = 0;
-        codingScheme = 0;
-        imageId = 0;
-        highOffset = 0;
-        lowOffset = 0;
-        length = 0;
+        mWidth = 0;
+        mHeight = 0;
+        mCodingScheme = 0;
+        mImageId = 0;
+        mHighOffset = 0;
+        mLowOffset = 0;
+        mLength = 0;
     }
 
     /**
@@ -56,18 +56,18 @@ public class ImageDescriptor {
     static ImageDescriptor parse(byte[] rawData, int valueIndex) {
         ImageDescriptor d = new ImageDescriptor();
         try {
-            d.width = rawData[valueIndex++] & 0xff;
-            d.height = rawData[valueIndex++] & 0xff;
-            d.codingScheme = rawData[valueIndex++] & 0xff;
+            d.mWidth = rawData[valueIndex++] & 0xff;
+            d.mHeight = rawData[valueIndex++] & 0xff;
+            d.mCodingScheme = rawData[valueIndex++] & 0xff;
 
             // parse image id
-            d.imageId = (rawData[valueIndex++] & 0xff) << 8;
-            d.imageId |= rawData[valueIndex++] & 0xff;
+            d.mImageId = (rawData[valueIndex++] & 0xff) << 8;
+            d.mImageId |= rawData[valueIndex++] & 0xff;
             // parse offset
-            d.highOffset = (rawData[valueIndex++] & 0xff); // high byte offset
-            d.lowOffset = rawData[valueIndex++] & 0xff; // low byte offset
+            d.mHighOffset = (rawData[valueIndex++] & 0xff); // high byte offset
+            d.mLowOffset = rawData[valueIndex++] & 0xff; // low byte offset
 
-            d.length = ((rawData[valueIndex++] & 0xff) << 8 | (rawData[valueIndex++] & 0xff));
+            d.mLength = ((rawData[valueIndex++] & 0xff) << 8 | (rawData[valueIndex++] & 0xff));
         } catch (IndexOutOfBoundsException e) {
             CatLog.d("ImageDescripter", "parse; failed parsing image descriptor");
             d = null;
index 814ec0d..2d2e257 100644 (file)
@@ -48,11 +48,11 @@ abstract class ResponseData {
 
 class SelectItemResponseData extends ResponseData {
     // members
-    private int id;
+    private int mId;
 
     public SelectItemResponseData(int id) {
         super();
-        this.id = id;
+        mId = id;
     }
 
     @Override
@@ -61,7 +61,7 @@ class SelectItemResponseData extends ResponseData {
         int tag = 0x80 | ComprehensionTlvTag.ITEM_ID.value();
         buf.write(tag); // tag
         buf.write(1); // length
-        buf.write(id); // identifier of item chosen
+        buf.write(mId); // identifier of item chosen
     }
 }
 
@@ -79,19 +79,19 @@ class GetInkeyInputResponseData extends ResponseData {
 
     public GetInkeyInputResponseData(String inData, boolean ucs2, boolean packed) {
         super();
-        this.mIsUcs2 = ucs2;
-        this.mIsPacked = packed;
-        this.mInData = inData;
-        this.mIsYesNo = false;
+        mIsUcs2 = ucs2;
+        mIsPacked = packed;
+        mInData = inData;
+        mIsYesNo = false;
     }
 
     public GetInkeyInputResponseData(boolean yesNoResponse) {
         super();
-        this.mIsUcs2 = false;
-        this.mIsPacked = false;
-        this.mInData = "";
-        this.mIsYesNo = true;
-        this.mYesNoResponse = yesNoResponse;
+        mIsUcs2 = false;
+        mIsPacked = false;
+        mInData = "";
+        mIsYesNo = true;
+        mYesNoResponse = yesNoResponse;
     }
 
     @Override
@@ -160,11 +160,11 @@ class GetInkeyInputResponseData extends ResponseData {
 // See TS 31.111 section 6.4.15/ETSI TS 102 223
 // TS 31.124 section 27.22.4.15 for test spec
 class LanguageResponseData extends ResponseData {
-    private String lang;
+    private String mLang;
 
     public LanguageResponseData(String lang) {
         super();
-        this.lang = lang;
+        mLang = lang;
     }
 
     @Override
@@ -179,8 +179,8 @@ class LanguageResponseData extends ResponseData {
 
         byte[] data;
 
-        if (lang != null && lang.length() > 0) {
-            data = GsmAlphabet.stringToGsm8BitPacked(lang);
+        if (mLang != null && mLang.length() > 0) {
+            data = GsmAlphabet.stringToGsm8BitPacked(mLang);
         }
         else {
             data = new byte[0];
@@ -198,11 +198,11 @@ class LanguageResponseData extends ResponseData {
 // See TS 31.111 section 6.4.15/ETSI TS 102 223
 // TS 31.124 section 27.22.4.15 for test spec
 class DTTZResponseData extends ResponseData {
-    private Calendar calendar;
+    private Calendar mCalendar;
 
     public DTTZResponseData(Calendar cal) {
         super();
-        calendar = cal;
+        mCalendar = cal;
     }
 
     @Override
@@ -219,26 +219,26 @@ class DTTZResponseData extends ResponseData {
 
         data[0] = 0x07; // Write length of DTTZ data
 
-        if (calendar == null) {
-            calendar = Calendar.getInstance();
+        if (mCalendar == null) {
+            mCalendar = Calendar.getInstance();
         }
         // Fill year byte
-        data[1] = byteToBCD(calendar.get(java.util.Calendar.YEAR) % 100);
+        data[1] = byteToBCD(mCalendar.get(java.util.Calendar.YEAR) % 100);
 
         // Fill month byte
-        data[2] = byteToBCD(calendar.get(java.util.Calendar.MONTH) + 1);
+        data[2] = byteToBCD(mCalendar.get(java.util.Calendar.MONTH) + 1);
 
         // Fill day byte
-        data[3] = byteToBCD(calendar.get(java.util.Calendar.DATE));
+        data[3] = byteToBCD(mCalendar.get(java.util.Calendar.DATE));
 
         // Fill hour byte
-        data[4] = byteToBCD(calendar.get(java.util.Calendar.HOUR_OF_DAY));
+        data[4] = byteToBCD(mCalendar.get(java.util.Calendar.HOUR_OF_DAY));
 
         // Fill minute byte
-        data[5] = byteToBCD(calendar.get(java.util.Calendar.MINUTE));
+        data[5] = byteToBCD(mCalendar.get(java.util.Calendar.MINUTE));
 
         // Fill second byte
-        data[6] = byteToBCD(calendar.get(java.util.Calendar.SECOND));
+        data[6] = byteToBCD(mCalendar.get(java.util.Calendar.SECOND));
 
         String tz = SystemProperties.get("persist.sys.timezone", "");
         if (TextUtils.isEmpty(tz)) {
index 97f3da2..988f36a 100644 (file)
@@ -131,7 +131,7 @@ public class CDMALTEPhone extends CDMAPhone {
 
                 case CONNECTED:
                 case DISCONNECTING:
-                    if (mCT.state != PhoneConstants.State.IDLE &&
+                    if (mCT.mState != PhoneConstants.State.IDLE &&
                             !mSST.isConcurrentVoiceAndDataAllowed()) {
                         ret = PhoneConstants.DataState.SUSPENDED;
                     } else {
@@ -164,7 +164,7 @@ public class CDMALTEPhone extends CDMAPhone {
         // get the message
         Message msg = obtainMessage(EVENT_SET_NETWORK_MANUAL_COMPLETE, nsm);
 
-        mCM.setNetworkSelectionModeManual(network.getOperatorNumeric(), msg);
+        mCi.setNetworkSelectionModeManual(network.getOperatorNumeric(), msg);
     }
 
     /**
@@ -251,12 +251,12 @@ public class CDMALTEPhone extends CDMAPhone {
 
     @Override
     public void getAvailableNetworks(Message response) {
-        mCM.getAvailableNetworks(response);
+        mCi.getAvailableNetworks(response);
     }
 
     @Override
     public void requestIsimAuthentication(String nonce, Message result) {
-        mCM.requestIsimAuthentication(nonce, result);
+        mCi.requestIsimAuthentication(nonce, result);
     }
 
     @Override
index 7ae933c..b304e81 100755 (executable)
@@ -155,9 +155,9 @@ public class CDMAPhone extends PhoneBase {
     }
 
     protected void init(Context context, PhoneNotifier notifier) {
-        mCM.setPhoneType(PhoneConstants.PHONE_TYPE_CDMA);
+        mCi.setPhoneType(PhoneConstants.PHONE_TYPE_CDMA);
         mCT = new CdmaCallTracker(this);
-        mCdmaSSM = CdmaSubscriptionSourceManager.getInstance(context, mCM, this,
+        mCdmaSSM = CdmaSubscriptionSourceManager.getInstance(context, mCi, this,
                 EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED, null);
         mSMS = new CdmaSMSDispatcher(this, mSmsStorageMonitor, mSmsUsageMonitor);
         mDataConnectionTracker = new DataConnectionTracker (this);
@@ -166,12 +166,12 @@ public class CDMAPhone extends PhoneBase {
         mSubInfo = new PhoneSubInfo(this);
         mEriManager = new EriManager(this, context, EriManager.ERI_FROM_XML);
 
-        mCM.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
-        mCM.registerForOffOrNotAvailable(this, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
-        mCM.registerForOn(this, EVENT_RADIO_ON, null);
-        mCM.setOnSuppServiceNotification(this, EVENT_SSN, null);
+        mCi.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
+        mCi.registerForOffOrNotAvailable(this, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
+        mCi.registerForOn(this, EVENT_RADIO_ON, null);
+        mCi.setOnSuppServiceNotification(this, EVENT_SSN, null);
         mSST.registerForNetworkAttached(this, EVENT_REGISTERED_TO_NETWORK, null);
-        mCM.setEmergencyCallbackMode(this, EVENT_EMERGENCY_CALLBACK_MODE_ENTER, null);
+        mCi.setEmergencyCallbackMode(this, EVENT_EMERGENCY_CALLBACK_MODE_ENTER, null);
 
         PowerManager pm
             = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
@@ -186,7 +186,7 @@ public class CDMAPhone extends PhoneBase {
         mIsPhoneInEcmState = inEcm.equals("true");
         if (mIsPhoneInEcmState) {
             // Send a message which will invoke handleExitEmergencyCallbackMode
-            mCM.exitEmergencyCallbackMode(obtainMessage(EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE));
+            mCi.exitEmergencyCallbackMode(obtainMessage(EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE));
         }
 
         // get the string that specifies the carrier OTA Sp number
@@ -221,11 +221,11 @@ public class CDMAPhone extends PhoneBase {
 
             //Unregister from all former registered events
             unregisterForRuimRecordEvents();
-            mCM.unregisterForAvailable(this); //EVENT_RADIO_AVAILABLE
-            mCM.unregisterForOffOrNotAvailable(this); //EVENT_RADIO_OFF_OR_NOT_AVAILABLE
-            mCM.unregisterForOn(this); //EVENT_RADIO_ON
+            mCi.unregisterForAvailable(this); //EVENT_RADIO_AVAILABLE
+            mCi.unregisterForOffOrNotAvailable(this); //EVENT_RADIO_OFF_OR_NOT_AVAILABLE
+            mCi.unregisterForOn(this); //EVENT_RADIO_ON
             mSST.unregisterForNetworkAttached(this); //EVENT_REGISTERED_TO_NETWORK
-            mCM.unSetOnSuppServiceNotification(this);
+            mCi.unSetOnSuppServiceNotification(this);
             removeCallbacks(mExitEcmRunnable);
 
             mPendingMmis.clear();
@@ -267,7 +267,7 @@ public class CDMAPhone extends PhoneBase {
 
     @Override
     public ServiceState getServiceState() {
-        return mSST.ss;
+        return mSST.mSS;
     }
 
     @Override
@@ -277,7 +277,7 @@ public class CDMAPhone extends PhoneBase {
 
     @Override
     public PhoneConstants.State getState() {
-        return mCT.state;
+        return mCT.mState;
     }
 
     @Override
@@ -303,7 +303,7 @@ public class CDMAPhone extends PhoneBase {
 
     @Override
     public CdmaCall getRingingCall() {
-        return mCT.ringingCall;
+        return mCT.mRingingCall;
     }
 
     @Override
@@ -324,12 +324,12 @@ public class CDMAPhone extends PhoneBase {
 
     @Override
     public void enableEnhancedVoicePrivacy(boolean enable, Message onComplete) {
-        this.mCM.setPreferredVoicePrivacy(enable, onComplete);
+        mCi.setPreferredVoicePrivacy(enable, onComplete);
     }
 
     @Override
     public void getEnhancedVoicePrivacy(Message onComplete) {
-        this.mCM.getPreferredVoicePrivacy(onComplete);
+        mCi.getPreferredVoicePrivacy(onComplete);
     }
 
     @Override
@@ -401,7 +401,7 @@ public class CDMAPhone extends PhoneBase {
 
     @Override
     public CdmaCall getBackgroundCall() {
-        return mCT.backgroundCall;
+        return mCT.mBackgroundCall;
     }
 
     @Override
@@ -470,7 +470,7 @@ public class CDMAPhone extends PhoneBase {
 
     @Override
     public void getCallWaiting(Message onComplete) {
-        mCM.queryCallWaiting(CommandsInterface.SERVICE_CLASS_VOICE, onComplete);
+        mCi.queryCallWaiting(CommandsInterface.SERVICE_CLASS_VOICE, onComplete);
     }
 
     @Override
@@ -525,12 +525,12 @@ public class CDMAPhone extends PhoneBase {
 
     @Override
     public CellLocation getCellLocation() {
-        return mSST.cellLoc;
+        return mSST.mCellLoc;
     }
 
     @Override
     public CdmaCall getForegroundCall() {
-        return mCT.foregroundCall;
+        return mCT.mForegroundCall;
     }
 
     @Override
@@ -600,12 +600,12 @@ public class CDMAPhone extends PhoneBase {
 
     @Override
     public void registerForCdmaOtaStatusChange(Handler h, int what, Object obj) {
-        mCM.registerForCdmaOtaProvision(h, what, obj);
+        mCi.registerForCdmaOtaProvision(h, what, obj);
     }
 
     @Override
     public void unregisterForCdmaOtaStatusChange(Handler h) {
-        mCM.unregisterForCdmaOtaProvision(h);
+        mCi.unregisterForCdmaOtaProvision(h);
     }
 
     @Override
@@ -682,7 +682,7 @@ public class CDMAPhone extends PhoneBase {
 
                 case CONNECTED:
                 case DISCONNECTING:
-                    if ( mCT.state != PhoneConstants.State.IDLE
+                    if ( mCT.mState != PhoneConstants.State.IDLE
                             && !mSST.isConcurrentVoiceAndDataAllowed()) {
                         ret = PhoneConstants.DataState.SUSPENDED;
                     } else {
@@ -712,8 +712,8 @@ public class CDMAPhone extends PhoneBase {
             Rlog.e(LOG_TAG,
                     "sendDtmf called with invalid character '" + c + "'");
         } else {
-            if (mCT.state ==  PhoneConstants.State.OFFHOOK) {
-                mCM.sendDtmf(c, null);
+            if (mCT.mState ==  PhoneConstants.State.OFFHOOK) {
+                mCi.sendDtmf(c, null);
             }
         }
     }
@@ -724,13 +724,13 @@ public class CDMAPhone extends PhoneBase {
             Rlog.e(LOG_TAG,
                     "startDtmf called with invalid character '" + c + "'");
         } else {
-            mCM.startDtmf(c, null);
+            mCi.startDtmf(c, null);
         }
     }
 
     @Override
     public void stopDtmf() {
-        mCM.stopDtmf(null);
+        mCi.stopDtmf(null);
     }
 
     @Override
@@ -744,8 +744,8 @@ public class CDMAPhone extends PhoneBase {
                 break;
             }
         }
-        if ((mCT.state ==  PhoneConstants.State.OFFHOOK)&&(check)) {
-            mCM.sendBurstDtmf(dtmfString, on, off, onComplete);
+        if ((mCT.mState ==  PhoneConstants.State.OFFHOOK)&&(check)) {
+            mCi.sendBurstDtmf(dtmfString, on, off, onComplete);
         }
      }
 
@@ -771,7 +771,7 @@ public class CDMAPhone extends PhoneBase {
 
     @Override
     public void getDataCallList(Message response) {
-        mCM.getDataCallList(response);
+        mCi.getDataCallList(response);
     }
 
     @Override
@@ -941,7 +941,7 @@ public class CDMAPhone extends PhoneBase {
             mWakeLock.release();
         }
         // Send a message which will invoke handleExitEmergencyCallbackMode
-        mCM.exitEmergencyCallbackMode(obtainMessage(EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE));
+        mCi.exitEmergencyCallbackMode(obtainMessage(EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE));
     }
 
     private void handleEnterEmergencyCallbackMode(Message msg) {
@@ -1036,9 +1036,9 @@ public class CDMAPhone extends PhoneBase {
 
         switch(msg.what) {
             case EVENT_RADIO_AVAILABLE: {
-                mCM.getBasebandVersion(obtainMessage(EVENT_GET_BASEBAND_VERSION_DONE));
+                mCi.getBasebandVersion(obtainMessage(EVENT_GET_BASEBAND_VERSION_DONE));
 
-                mCM.getDeviceIdentity(obtainMessage(EVENT_GET_DEVICE_IDENTITY_DONE));
+                mCi.getDeviceIdentity(obtainMessage(EVENT_GET_DEVICE_IDENTITY_DONE));
             }
             break;
 
index c6a881f..4f7047a 100644 (file)
@@ -30,7 +30,7 @@ import com.android.internal.telephony.Phone;
 public final class CdmaCall extends Call {
     /*************************** Instance Variables **************************/
 
-    /*package*/ CdmaCallTracker owner;
+    /*package*/ CdmaCallTracker mOwner;
 
     /***************************** Class Methods *****************************/
 
@@ -51,7 +51,7 @@ public final class CdmaCall extends Call {
     /****************************** Constructors *****************************/
     /*package*/
     CdmaCall (CdmaCallTracker owner) {
-        this.owner = owner;
+        mOwner = owner;
     }
 
     public void dispose() {
@@ -62,18 +62,18 @@ public final class CdmaCall extends Call {
     public List<Connection>
     getConnections() {
         // FIXME should return Collections.unmodifiableList();
-        return connections;
+        return mConnections;
     }
 
     @Override
     public Phone
     getPhone() {
-        return owner.phone;
+        return mOwner.mPhone;
     }
 
     @Override
     public boolean isMultiparty() {
-        return connections.size() > 1;
+        return mConnections.size() > 1;
     }
 
     /** Please note: if this is the foreground call and a
@@ -83,29 +83,29 @@ public final class CdmaCall extends Call {
     @Override
     public void
     hangup() throws CallStateException {
-        owner.hangup(this);
+        mOwner.hangup(this);
     }
 
     @Override
     public String
     toString() {
-        return state.toString();
+        return mState.toString();
     }
 
     //***** Called from CdmaConnection
 
     /*package*/ void
     attach(Connection conn, DriverCall dc) {
-        connections.add(conn);
+        mConnections.add(conn);
 
-        state = stateFromDCState (dc.state);
+        mState = stateFromDCState (dc.state);
     }
 
     /*package*/ void
     attachFake(Connection conn, State state) {
-        connections.add(conn);
+        mConnections.add(conn);
 
-        this.state = state;
+        mState = state;
     }
 
     /**
@@ -113,13 +113,13 @@ public final class CdmaCall extends Call {
      */
     void
     connectionDisconnected(CdmaConnection conn) {
-        if (state != State.DISCONNECTED) {
+        if (mState != State.DISCONNECTED) {
             /* If only disconnected connections remain, we are disconnected*/
 
             boolean hasOnlyDisconnectedConnections = true;
 
-            for (int i = 0, s = connections.size()  ; i < s; i ++) {
-                if (connections.get(i).getState()
+            for (int i = 0, s = mConnections.size()  ; i < s; i ++) {
+                if (mConnections.get(i).getState()
                     != State.DISCONNECTED
                 ) {
                     hasOnlyDisconnectedConnections = false;
@@ -128,7 +128,7 @@ public final class CdmaCall extends Call {
             }
 
             if (hasOnlyDisconnectedConnections) {
-                state = State.DISCONNECTED;
+                mState = State.DISCONNECTED;
             }
         }
     }
@@ -136,10 +136,10 @@ public final class CdmaCall extends Call {
 
     /*package*/ void
     detach(CdmaConnection conn) {
-        connections.remove(conn);
+        mConnections.remove(conn);
 
-        if (connections.size() == 0) {
-            state = State.IDLE;
+        if (mConnections.size() == 0) {
+            mState = State.IDLE;
         }
     }
 
@@ -150,8 +150,8 @@ public final class CdmaCall extends Call {
 
         newState = stateFromDCState(dc.state);
 
-        if (newState != state) {
-            state = newState;
+        if (newState != mState) {
+            mState = newState;
             changed = true;
         }
 
@@ -164,7 +164,7 @@ public final class CdmaCall extends Call {
      */
     /*package*/ boolean
     isFull() {
-        return connections.size() == CdmaCallTracker.MAX_CONNECTIONS_PER_CALL;
+        return mConnections.size() == CdmaCallTracker.MAX_CONNECTIONS_PER_CALL;
     }
 
     //***** Called from CdmaCallTracker
@@ -177,28 +177,28 @@ public final class CdmaCall extends Call {
      */
     void
     onHangupLocal() {
-        for (int i = 0, s = connections.size(); i < s; i++) {
-            CdmaConnection cn = (CdmaConnection)connections.get(i);
+        for (int i = 0, s = mConnections.size(); i < s; i++) {
+            CdmaConnection cn = (CdmaConnection)mConnections.get(i);
 
             cn.onHangupLocal();
         }
-        state = State.DISCONNECTING;
+        mState = State.DISCONNECTING;
     }
 
     /**
      * Called when it's time to clean up disconnected Connection objects
      */
    void clearDisconnected() {
-        for (int i = connections.size() - 1 ; i >= 0 ; i--) {
-        CdmaConnection cn = (CdmaConnection)connections.get(i);
+        for (int i = mConnections.size() - 1 ; i >= 0 ; i--) {
+        CdmaConnection cn = (CdmaConnection)mConnections.get(i);
 
             if (cn.getState() == State.DISCONNECTED) {
-                connections.remove(i);
+                mConnections.remove(i);
             }
         }
 
-        if (connections.size() == 0) {
-            state = State.IDLE;
+        if (mConnections.size() == 0) {
+            mState = State.IDLE;
         }
     }
 }
index 159cf77..600380e 100644 (file)
@@ -58,31 +58,31 @@ public final class CdmaCallTracker extends CallTracker {
 
     //***** Instance Variables
 
-    CdmaConnection connections[] = new CdmaConnection[MAX_CONNECTIONS];
-    RegistrantList voiceCallEndedRegistrants = new RegistrantList();
-    RegistrantList voiceCallStartedRegistrants = new RegistrantList();
-    RegistrantList callWaitingRegistrants =  new RegistrantList();
+    CdmaConnection mConnections[] = new CdmaConnection[MAX_CONNECTIONS];
+    RegistrantList mVoiceCallEndedRegistrants = new RegistrantList();
+    RegistrantList mVoiceCallStartedRegistrants = new RegistrantList();
+    RegistrantList mCallWaitingRegistrants =  new RegistrantList();
 
 
     // connections dropped during last poll
-    ArrayList<CdmaConnection> droppedDuringPoll
+    ArrayList<CdmaConnection> mDroppedDuringPoll
         = new ArrayList<CdmaConnection>(MAX_CONNECTIONS);
 
-    CdmaCall ringingCall = new CdmaCall(this);
+    CdmaCall mRingingCall = new CdmaCall(this);
     // A call that is ringing or (call) waiting
-    CdmaCall foregroundCall = new CdmaCall(this);
-    CdmaCall backgroundCall = new CdmaCall(this);
+    CdmaCall mForegroundCall = new CdmaCall(this);
+    CdmaCall mBackgroundCall = new CdmaCall(this);
 
-    CdmaConnection pendingMO;
-    boolean hangupPendingMO;
-    boolean pendingCallInEcm=false;
+    CdmaConnection mPendingMO;
+    boolean mHangupPendingMO;
+    boolean mPendingCallInEcm=false;
     boolean mIsInEmergencyCall = false;
-    CDMAPhone phone;
+    CDMAPhone mPhone;
 
-    boolean desiredMute = false;    // false = mute off
+    boolean mDesiredMute = false;    // false = mute off
 
-    int pendingCallClirMode;
-    PhoneConstants.State state = PhoneConstants.State.IDLE;
+    int mPendingCallClirMode;
+    PhoneConstants.State mState = PhoneConstants.State.IDLE;
 
     private boolean mIsEcmTimerCanceled = false;
 
@@ -94,21 +94,21 @@ public final class CdmaCallTracker extends CallTracker {
 
     //***** Constructors
     CdmaCallTracker(CDMAPhone phone) {
-        this.phone = phone;
-        cm = phone.mCM;
-        cm.registerForCallStateChanged(this, EVENT_CALL_STATE_CHANGE, null);
-        cm.registerForOn(this, EVENT_RADIO_AVAILABLE, null);
-        cm.registerForNotAvailable(this, EVENT_RADIO_NOT_AVAILABLE, null);
-        cm.registerForCallWaitingInfo(this, EVENT_CALL_WAITING_INFO_CDMA, null);
-        foregroundCall.setGeneric(false);
+        mPhone = phone;
+        mCi = phone.mCi;
+        mCi.registerForCallStateChanged(this, EVENT_CALL_STATE_CHANGE, null);
+        mCi.registerForOn(this, EVENT_RADIO_AVAILABLE, null);
+        mCi.registerForNotAvailable(this, EVENT_RADIO_NOT_AVAILABLE, null);
+        mCi.registerForCallWaitingInfo(this, EVENT_CALL_WAITING_INFO_CDMA, null);
+        mForegroundCall.setGeneric(false);
     }
 
     public void dispose() {
-        cm.unregisterForCallStateChanged(this);
-        cm.unregisterForOn(this);
-        cm.unregisterForNotAvailable(this);
-        cm.unregisterForCallWaitingInfo(this);
-        for(CdmaConnection c : connections) {
+        mCi.unregisterForCallStateChanged(this);
+        mCi.unregisterForOn(this);
+        mCi.unregisterForNotAvailable(this);
+        mCi.unregisterForCallWaitingInfo(this);
+        for(CdmaConnection c : mConnections) {
             try {
                 if(c != null) hangup(c);
             } catch (CallStateException ex) {
@@ -117,7 +117,7 @@ public final class CdmaCallTracker extends CallTracker {
         }
 
         try {
-            if(pendingMO != null) hangup(pendingMO);
+            if(mPendingMO != null) hangup(mPendingMO);
         } catch (CallStateException ex) {
             Rlog.e(LOG_TAG, "unexpected error on hangup during dispose");
         }
@@ -137,35 +137,35 @@ public final class CdmaCallTracker extends CallTracker {
     @Override
     public void registerForVoiceCallStarted(Handler h, int what, Object obj) {
         Registrant r = new Registrant(h, what, obj);
-        voiceCallStartedRegistrants.add(r);
+        mVoiceCallStartedRegistrants.add(r);
         // Notify if in call when registering
-        if (state != PhoneConstants.State.IDLE) {
+        if (mState != PhoneConstants.State.IDLE) {
             r.notifyRegistrant(new AsyncResult(null, null, null));
         }
     }
     @Override
     public void unregisterForVoiceCallStarted(Handler h) {
-        voiceCallStartedRegistrants.remove(h);
+        mVoiceCallStartedRegistrants.remove(h);
     }
 
     @Override
     public void registerForVoiceCallEnded(Handler h, int what, Object obj) {
         Registrant r = new Registrant(h, what, obj);
-        voiceCallEndedRegistrants.add(r);
+        mVoiceCallEndedRegistrants.add(r);
     }
 
     @Override
     public void unregisterForVoiceCallEnded(Handler h) {
-        voiceCallEndedRegistrants.remove(h);
+        mVoiceCallEndedRegistrants.remove(h);
     }
 
     public void registerForCallWaiting(Handler h, int what, Object obj) {
         Registrant r = new Registrant (h, what, obj);
-        callWaitingRegistrants.add(r);
+        mCallWaitingRegistrants.add(r);
     }
 
     public void unregisterForCallWaiting(Handler h) {
-        callWaitingRegistrants.remove(h);
+        mCallWaitingRegistrants.remove(h);
     }
 
     /**
@@ -183,7 +183,7 @@ public final class CdmaCallTracker extends CallTracker {
         String inEcm=SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE, "false");
         boolean isPhoneInEcmMode = inEcm.equals("true");
         boolean isEmergencyCall =
-                PhoneNumberUtils.isLocalEmergencyNumber(dialString, phone.getContext());
+                PhoneNumberUtils.isLocalEmergencyNumber(dialString, mPhone.getContext());
 
         // Cancel Ecm timer if a second emergency call is originating in Ecm mode
         if (isPhoneInEcmMode && isEmergencyCall) {
@@ -193,23 +193,23 @@ public final class CdmaCallTracker extends CallTracker {
         // We are initiating a call therefore even if we previously
         // didn't know the state (i.e. Generic was true) we now know
         // and therefore can set Generic to false.
-        foregroundCall.setGeneric(false);
+        mForegroundCall.setGeneric(false);
 
         // The new call must be assigned to the foreground call.
         // That call must be idle, so place anything that's
         // there on hold
-        if (foregroundCall.getState() == CdmaCall.State.ACTIVE) {
+        if (mForegroundCall.getState() == CdmaCall.State.ACTIVE) {
             return dialThreeWay(dialString);
         }
 
-        pendingMO = new CdmaConnection(phone.getContext(), checkForTestEmergencyNumber(dialString),
-                this, foregroundCall);
-        hangupPendingMO = false;
+        mPendingMO = new CdmaConnection(mPhone.getContext(), checkForTestEmergencyNumber(dialString),
+                this, mForegroundCall);
+        mHangupPendingMO = false;
 
-        if (pendingMO.address == null || pendingMO.address.length() == 0
-            || pendingMO.address.indexOf(PhoneNumberUtils.WILD) >= 0) {
+        if (mPendingMO.mAddress == null || mPendingMO.mAddress.length() == 0
+            || mPendingMO.mAddress.indexOf(PhoneNumberUtils.WILD) >= 0) {
             // Phone number is invalid
-            pendingMO.cause = Connection.DisconnectCause.INVALID_NUMBER;
+            mPendingMO.mCause = Connection.DisconnectCause.INVALID_NUMBER;
 
             // handlePollCalls() will notice this call not present
             // and will mark it as dropped.
@@ -223,19 +223,19 @@ public final class CdmaCallTracker extends CallTracker {
 
             // In Ecm mode, if another emergency call is dialed, Ecm mode will not exit.
             if(!isPhoneInEcmMode || (isPhoneInEcmMode && isEmergencyCall)) {
-                cm.dial(pendingMO.address, clirMode, obtainCompleteMessage());
+                mCi.dial(mPendingMO.mAddress, clirMode, obtainCompleteMessage());
             } else {
-                phone.exitEmergencyCallbackMode();
-                phone.setOnEcbModeExitResponse(this,EVENT_EXIT_ECM_RESPONSE_CDMA, null);
-                pendingCallClirMode=clirMode;
-                pendingCallInEcm=true;
+                mPhone.exitEmergencyCallbackMode();
+                mPhone.setOnEcbModeExitResponse(this,EVENT_EXIT_ECM_RESPONSE_CDMA, null);
+                mPendingCallClirMode=clirMode;
+                mPendingCallInEcm=true;
             }
         }
 
         updatePhoneState();
-        phone.notifyPreciseCallStateChanged();
+        mPhone.notifyPreciseCallStateChanged();
 
-        return pendingMO;
+        return mPendingMO;
     }
 
 
@@ -246,35 +246,35 @@ public final class CdmaCallTracker extends CallTracker {
 
     private Connection
     dialThreeWay (String dialString) {
-        if (!foregroundCall.isIdle()) {
+        if (!mForegroundCall.isIdle()) {
             // Check data call
             disableDataCallInEmergencyCall(dialString);
 
             // Attach the new connection to foregroundCall
-            pendingMO = new CdmaConnection(phone.getContext(),
-                                checkForTestEmergencyNumber(dialString), this, foregroundCall);
-            cm.sendCDMAFeatureCode(pendingMO.address,
+            mPendingMO = new CdmaConnection(mPhone.getContext(),
+                                checkForTestEmergencyNumber(dialString), this, mForegroundCall);
+            mCi.sendCDMAFeatureCode(mPendingMO.mAddress,
                 obtainMessage(EVENT_THREE_WAY_DIAL_L2_RESULT_CDMA));
-            return pendingMO;
+            return mPendingMO;
         }
         return null;
     }
 
     void
     acceptCall() throws CallStateException {
-        if (ringingCall.getState() == CdmaCall.State.INCOMING) {
+        if (mRingingCall.getState() == CdmaCall.State.INCOMING) {
             Rlog.i("phone", "acceptCall: incoming...");
             // Always unmute when answering a new call
             setMute(false);
-            cm.acceptCall(obtainCompleteMessage());
-        } else if (ringingCall.getState() == CdmaCall.State.WAITING) {
-            CdmaConnection cwConn = (CdmaConnection)(ringingCall.getLatestConnection());
+            mCi.acceptCall(obtainCompleteMessage());
+        } else if (mRingingCall.getState() == CdmaCall.State.WAITING) {
+            CdmaConnection cwConn = (CdmaConnection)(mRingingCall.getLatestConnection());
 
             // Since there is no network response for supplimentary
             // service for CDMA, we assume call waiting is answered.
             // ringing&nb