Merge "Update a patch for OpportunisticNetworkService" into qt-dev

2 files changed, 4 insertions, 8 deletions

diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java
index 2ab52a2..14f59a0 100644
--- a/src/com/android/ons/OpportunisticNetworkService.java
+++ b/src/com/android/ons/OpportunisticNetworkService.java
@@ -137,7 +137,7 @@ public class OpportunisticNetworkService extends Service {
         if (!mIsEnabled) {
             return;
         }
-        if (mONSConfigInputHashMap.get(SYSTEM_APP_CONFIG_NAME).getAvailableNetworkInfos() != null) {
+        if (mONSConfigInputHashMap.get(SYSTEM_APP_CONFIG_NAME) != null) {
             mProfileSelector.startProfileSelection(
                     mONSConfigInputHashMap.get(SYSTEM_APP_CONFIG_NAME).getAvailableNetworkInfos(),
                     mONSConfigInputHashMap.get(
@@ -479,13 +479,12 @@ public class OpportunisticNetworkService extends Service {
                     return;
                 }
                 /* reporting unavailability */
-                mONSConfigInputHashMap.put(
-                        SYSTEM_APP_CONFIG_NAME, new ONSConfigInput(null, callbackStub));
+                mONSConfigInputHashMap.put(SYSTEM_APP_CONFIG_NAME, null);
                 if (mONSConfigInputHashMap.get(CARRIER_APP_CONFIG_NAME) == null) {
                     mProfileSelector.stopProfileSelection();
-                    sendUpdateNetworksCallbackHelper(callbackStub,
-                            TelephonyManager.UPDATE_AVAILABLE_NETWORKS_SUCCESS);
                 }
+                sendUpdateNetworksCallbackHelper(callbackStub,
+                        TelephonyManager.UPDATE_AVAILABLE_NETWORKS_SUCCESS);
             }
         } finally {
             Binder.restoreCallingIdentity(identity);
diff --git a/tests/src/com/android/ons/ONSProfileSelectorTest.java b/tests/src/com/android/ons/ONSProfileSelectorTest.java
index 00011aa..44596a6 100644
--- a/tests/src/com/android/ons/ONSProfileSelectorTest.java
+++ b/tests/src/com/android/ons/ONSProfileSelectorTest.java
@@ -222,9 +222,6 @@ public class ONSProfileSelectorTest extends ONSBaseTest {
         Intent callbackIntent = new Intent(MyONSProfileSelector.ACTION_SUB_SWITCH);
         callbackIntent.putExtra("sequenceId", 1);
         callbackIntent.putExtra("subId", 5);
-        //assertFalse(mReady);
-        mONSProfileSelector.mProfileSelectorBroadcastReceiverCpy.onReceive(mContext,
-                callbackIntent);
         waitUntilReady();
         assertEquals(TelephonyManager.UPDATE_AVAILABLE_NETWORKS_SUCCESS, mResult);
         assertTrue(mReady);