resolved conflicts for merge of 6125afc3 to master
Robert Greenwalt [Fri, 11 Jan 2013 18:21:46 +0000 (10:21 -0800)]
Change-Id: I40f57858d775b91c409532d19ea5c98ec51afb22

1  2 
src/java/com/android/internal/telephony/RIL.java

@@@ -403,14 -403,14 +403,14 @@@ public final class RIL extends BaseComm
                                  mRequestMessagesWaiting = 0;
  
                                  if (RILJ_LOGD) {
-                                     synchronized (mRequestsList) {
-                                         int count = mRequestsList.size();
+                                     synchronized (mRequestList) {
+                                         int count = mRequestList.size();
 -                                        Rlog.d(LOG_TAG, "WAKE_LOCK_TIMEOUT " +
 +                                        Rlog.d(RILJ_LOG_TAG, "WAKE_LOCK_TIMEOUT " +
                                                  " mRequestList=" + count);
  
                                          for (int i = 0; i < count; i++) {
-                                             rr = mRequestsList.get(i);
+                                             rr = mRequestList.get(i);
 -                                            Rlog.d(LOG_TAG, i + ": [" + rr.mSerial + "] "
 +                                            Rlog.d(RILJ_LOG_TAG, i + ": [" + rr.mSerial + "] "
                                                      + requestToString(rr.mRequest));
                                          }
                                      }
                  RILRequest.resetSerial();
  
                  // Clear request list on close
-                 clearRequestsList(RADIO_NOT_AVAILABLE, false);
+                 clearRequestList(RADIO_NOT_AVAILABLE, false);
              }} catch (Throwable tr) {
 -                Rlog.e(LOG_TAG,"Uncaught exception", tr);
 +                Rlog.e(RILJ_LOG_TAG,"Uncaught exception", tr);
              }
  
              /* We're disconnected so we don't know the ril version */
      }
  
      /**
-      * Release each request in mReqeustsList then clear the list
+      * Release each request in mRequestList then clear the list
       * @param error is the RIL_Errno sent back
-      * @param loggable true means to print all requests in mRequestslist
+      * @param loggable true means to print all requests in mRequestList
       */
-     private void clearRequestsList(int error, boolean loggable) {
+     private void clearRequestList(int error, boolean loggable) {
          RILRequest rr;
-         synchronized (mRequestsList) {
-             int count = mRequestsList.size();
+         synchronized (mRequestList) {
+             int count = mRequestList.size();
              if (RILJ_LOGD && loggable) {
 -                Rlog.d(LOG_TAG, "WAKE_LOCK_TIMEOUT " +
 +                Rlog.d(RILJ_LOG_TAG, "WAKE_LOCK_TIMEOUT " +
                          " mReqPending=" + mRequestMessagesPending +
                          " mRequestList=" + count);
              }
  
              for (int i = 0; i < count ; i++) {
-                 rr = mRequestsList.get(i);
+                 rr = mRequestList.get(i);
                  if (RILJ_LOGD && loggable) {
 -                    Rlog.d(LOG_TAG, i + ": [" + rr.mSerial + "] " +
 +                    Rlog.d(RILJ_LOG_TAG, i + ": [" + rr.mSerial + "] " +
                              requestToString(rr.mRequest));
                  }
                  rr.onError(error, null);