commit 9f2d271f693b445e513235ebc48ccd0f67926860
author Junda Liu <junda@google.com> Fri May 15 14:22:45 2015 -0700
committer Junda Liu <junda@google.com> Fri May 15 14:22:51 2015 -0700
tree d1d25fca7e603224b3bc1e639ec3ffd8c874dfe3
parent 3f0a4268a919c7ffa178c4a2bff1b012d69cb575

Fix obtainMessage arg1 issue.

We should use the obtainMessage(int what, int arg1, int arg2) form and
ignore arg2 to pass the message correctly. Previously we got lucky
because default is 0.

Bug: b/21177838
Change-Id: I35cf35a4fcdec363f1136a8deca3204c400caa34

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index da3a05e..8c22d7a 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -166,8 +166,7 @@
                                 .asInterface(conn.service);
                         config = configService.getCarrierConfig(carrierId);
                         mConfigFromDefaultApp[phoneId] = config;
-                        mHandler.sendMessage(
-                                mHandler.obtainMessage(EVENT_LOADED_FROM_DEFAULT, phoneId));
+                        sendMessage(obtainMessage(EVENT_LOADED_FROM_DEFAULT, phoneId, -1));
                     } catch (RemoteException ex) {
                         loge("Failed to get carrier config: " + ex.toString());
                     } finally {
@@ -207,8 +206,7 @@
                                 .asInterface(conn.service);
                         config = configService.getCarrierConfig(carrierId);
                         mConfigFromCarrierApp[phoneId] = config;
-                        mHandler.sendMessage(
-                                mHandler.obtainMessage(EVENT_LOADED_FROM_CARRIER, phoneId));
+                        sendMessage(obtainMessage(EVENT_LOADED_FROM_CARRIER, phoneId, -1));
                     } catch (RemoteException ex) {
                         loge("Failed to get carrier config: " + ex.toString());
                     } finally {
@@ -447,7 +445,7 @@
     public void reloadCarrierConfigForSubId(int subId) {
         int phoneId = SubscriptionManager.getPhoneId(subId);
         if (SubscriptionManager.isValidPhoneId(phoneId)) {
-            mHandler.sendMessage(mHandler.obtainMessage(EVENT_RELOAD_CONFIG, phoneId));
+            mHandler.sendMessage(mHandler.obtainMessage(EVENT_RELOAD_CONFIG, phoneId, -1));
         } else {
             log("Ignore invalid phoneId: " + phoneId + " for subId: " + subId);
         }
@@ -464,11 +462,11 @@
             case IccCardConstants.INTENT_VALUE_ICC_ABSENT:
             case IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR:
             case IccCardConstants.INTENT_VALUE_ICC_UNKNOWN:
-                mHandler.sendMessage(mHandler.obtainMessage(EVENT_CLEAR_CONFIG, phoneId));
+                mHandler.sendMessage(mHandler.obtainMessage(EVENT_CLEAR_CONFIG, phoneId, -1));
                 break;
             case IccCardConstants.INTENT_VALUE_ICC_LOADED:
             case IccCardConstants.INTENT_VALUE_ICC_LOCKED:
-                mHandler.sendMessage(mHandler.obtainMessage(EVENT_UPDATE_CONFIG, phoneId));
+                mHandler.sendMessage(mHandler.obtainMessage(EVENT_UPDATE_CONFIG, phoneId, -1));
                 break;
         }
     }