DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I9dbf402e02a0e97e3cffbdde99f7f2b3756b4647
diff --git a/src/com/android/ons/ONSProfileSelector.java b/src/com/android/ons/ONSProfileSelector.java
index 9b9a172..368c3ca 100644
--- a/src/com/android/ons/ONSProfileSelector.java
+++ b/src/com/android/ons/ONSProfileSelector.java
@@ -41,9 +41,9 @@
import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.telephony.IUpdateAvailableNetworksCallback;
import com.android.internal.telephony.ISetOpportunisticDataCallback;
import com.android.internal.telephony.ISub;
+import com.android.internal.telephony.IUpdateAvailableNetworksCallback;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java
index 5ad4617..7e74f88 100644
--- a/src/com/android/ons/OpportunisticNetworkService.java
+++ b/src/com/android/ons/OpportunisticNetworkService.java
@@ -37,8 +37,8 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.IOns;
-import com.android.internal.telephony.IUpdateAvailableNetworksCallback;
import com.android.internal.telephony.ISetOpportunisticDataCallback;
+import com.android.internal.telephony.IUpdateAvailableNetworksCallback;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyPermissions;
@@ -445,8 +445,7 @@
}
}
- private void sendUpdateNetworksCallbackHelper(IUpdateAvailableNetworksCallback callback,
- int result) {
+ private void sendUpdateNetworksCallbackHelper(IUpdateAvailableNetworksCallback callback, int result) {
if (callback == null) return;
try {
callback.onComplete(result);
diff --git a/tests/src/com/android/ons/ONSBaseTest.java b/tests/src/com/android/ons/ONSBaseTest.java
index 741298e..d3f62b1 100644
--- a/tests/src/com/android/ons/ONSBaseTest.java
+++ b/tests/src/com/android/ons/ONSBaseTest.java
@@ -70,4 +70,4 @@
MockitoAnnotations.initMocks(this);
setReady(false);
}
-}
+}
\ No newline at end of file
diff --git a/tests/src/com/android/ons/ONSProfileSelectorTest.java b/tests/src/com/android/ons/ONSProfileSelectorTest.java
index a5d3a7c..0046783 100644
--- a/tests/src/com/android/ons/ONSProfileSelectorTest.java
+++ b/tests/src/com/android/ons/ONSProfileSelectorTest.java
@@ -105,6 +105,7 @@
}
}
+
@Test
public void testStartProfileSelectionWithNoOpportunisticSub() {
List<CellInfo> results2 = new ArrayList<CellInfo>();
@@ -158,6 +159,7 @@
assertFalse(mCallbackInvoked);
}
+
@Test
public void testStartProfileSelectionSuccess() {
List<SubscriptionInfo> subscriptionInfoList = new ArrayList<SubscriptionInfo>();
@@ -187,14 +189,12 @@
};
mResult = -1;
-
mReady = false;
new Thread(new Runnable() {
@Override
public void run() {
Looper.prepare();
- doReturn(subscriptionInfoList).when(
- mSubscriptionManager).getOpportunisticSubscriptions();
+ doReturn(subscriptionInfoList).when(mSubscriptionManager).getOpportunisticSubscriptions();
doReturn(true).when(mSubscriptionManager).isActiveSubId(anyInt());
mONSProfileSelector = new MyONSProfileSelector(mContext,
new MyONSProfileSelector.ONSProfileSelectionCallback() {
@@ -217,7 +217,6 @@
// Testing startProfileSelection with oppotunistic sub.
// On success onProfileSelectionDone must get invoked.
-
assertFalse(mReady);
waitForMs(500);
mONSProfileSelector.mNetworkAvailableCallBackCpy.onNetworkAvailability(results2);
