Change name from ProvisionSubscriberId to SatelliteSubscriberInfo.
Bug: 358202712
Test: atest SatelliteManagerTest
Flag: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn
Change-Id: If74ed789d7d4d8d8c37d497f7dbda80ee3255207
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 97d3727..65dcb94 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -164,12 +164,12 @@
import android.telephony.satellite.ISatelliteTransmissionUpdateCallback;
import android.telephony.satellite.NtnSignalStrength;
import android.telephony.satellite.NtnSignalStrengthCallback;
-import android.telephony.satellite.ProvisionSubscriberId;
import android.telephony.satellite.SatelliteCapabilities;
import android.telephony.satellite.SatelliteDatagram;
import android.telephony.satellite.SatelliteDatagramCallback;
import android.telephony.satellite.SatelliteManager;
import android.telephony.satellite.SatelliteProvisionStateCallback;
+import android.telephony.satellite.SatelliteSubscriberInfo;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.EventLog;
@@ -14388,7 +14388,7 @@
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void provisionSatellite(@NonNull List<ProvisionSubscriberId> list,
+ public void provisionSatellite(@NonNull List<SatelliteSubscriberInfo> list,
@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("provisionSatellite");
mSatelliteController.provisionSatellite(list, result);
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java
index 4b09a56..4843c5f 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java
@@ -23,9 +23,9 @@
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.satellite.EnableRequestAttributes;
-import android.telephony.satellite.ProvisionSubscriberId;
import android.telephony.satellite.SatelliteCapabilities;
import android.telephony.satellite.SatelliteManager;
+import android.telephony.satellite.SatelliteSubscriberInfo;
import android.telephony.satellite.stub.SatelliteResult;
import android.view.View;
import android.view.View.OnClickListener;
@@ -47,7 +47,7 @@
private SatelliteManager mSatelliteManager;
private SubscriptionManager mSubscriptionManager;
- private List<ProvisionSubscriberId> mProvisionSubscriberIdList = new ArrayList<>();
+ private List<SatelliteSubscriberInfo> mSatelliteSubscriberInfoList = new ArrayList<>();
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -394,17 +394,18 @@
}
private void requestProvisionSubscriberIdsApp(View view) {
- final AtomicReference<List<ProvisionSubscriberId>> list = new AtomicReference<>();
+ final AtomicReference<List<SatelliteSubscriberInfo>> list = new AtomicReference<>();
final AtomicReference<Integer> errorCode = new AtomicReference<>();
- OutcomeReceiver<List<ProvisionSubscriberId>, SatelliteManager.SatelliteException> receiver =
+ OutcomeReceiver<List<SatelliteSubscriberInfo>, SatelliteManager.SatelliteException>
+ receiver =
new OutcomeReceiver<>() {
@Override
- public void onResult(List<ProvisionSubscriberId> result) {
- mProvisionSubscriberIdList = result;
+ public void onResult(List<SatelliteSubscriberInfo> result) {
+ mSatelliteSubscriberInfoList = result;
list.set(result);
TextView textView = findViewById(R.id.text_id);
String text = "";
- for (ProvisionSubscriberId psi : result) {
+ for (SatelliteSubscriberInfo psi : result) {
text += "" + psi + " , ";
}
textView.setText("requestProvisionSubscriberIds: result=" + text);
@@ -446,13 +447,13 @@
+ SatelliteErrorUtils.mapError(errorCode.get()));
}
};
- if (mProvisionSubscriberIdList == null || mProvisionSubscriberIdList.get(0) == null) {
+ if (mSatelliteSubscriberInfoList == null || mSatelliteSubscriberInfoList.get(0) == null) {
TextView textView = findViewById(R.id.text_id);
textView.setText("No ProvisionSubscriberIdList");
return;
}
- mSatelliteManager.requestIsProvisioned(mProvisionSubscriberIdList.get(0).getSubscriberId(),
- Runnable::run, receiver);
+ mSatelliteManager.requestIsProvisioned(
+ mSatelliteSubscriberInfoList.get(0).getSubscriberId(), Runnable::run, receiver);
}
private void provisionSatelliteApp(View view) {
@@ -480,6 +481,6 @@
+ SatelliteErrorUtils.mapError(errorCode.get()));
}
};
- mSatelliteManager.provisionSatellite(mProvisionSubscriberIdList, Runnable::run, receiver);
+ mSatelliteManager.provisionSatellite(mSatelliteSubscriberInfoList, Runnable::run, receiver);
}
}