Changed provisionData type from string to byte[].
Bug: 275270448 Test: atest SatelliteManagerTest Change-Id: I56e7bed6f55d09d0f097ec9063ae2fb2fab1eb0e
This commit is contained in:
@@ -862,7 +862,7 @@ public class SatelliteManager {
|
||||
*
|
||||
* @param token The token to be used as a unique identifier for provisioning with satellite
|
||||
* gateway.
|
||||
* @param regionId The region ID for the device's current location.
|
||||
* @param provisionData Data from the provisioning app that can be used by provisioning server
|
||||
* @param cancellationSignal The optional signal used by the caller to cancel the provision
|
||||
* request. Even when the cancellation is signaled, Telephony will
|
||||
* still trigger the callback to return the result of this request.
|
||||
@@ -874,13 +874,14 @@ public class SatelliteManager {
|
||||
*/
|
||||
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
|
||||
@UnsupportedAppUsage
|
||||
public void provisionSatelliteService(@NonNull String token, @NonNull String regionId,
|
||||
public void provisionSatelliteService(@NonNull String token, @NonNull byte[] provisionData,
|
||||
@Nullable CancellationSignal cancellationSignal,
|
||||
@NonNull @CallbackExecutor Executor executor,
|
||||
@SatelliteError @NonNull Consumer<Integer> resultListener) {
|
||||
Objects.requireNonNull(token);
|
||||
Objects.requireNonNull(executor);
|
||||
Objects.requireNonNull(resultListener);
|
||||
Objects.requireNonNull(provisionData);
|
||||
|
||||
ICancellationSignal cancelRemote = null;
|
||||
try {
|
||||
@@ -893,7 +894,7 @@ public class SatelliteManager {
|
||||
() -> resultListener.accept(result)));
|
||||
}
|
||||
};
|
||||
cancelRemote = telephony.provisionSatelliteService(mSubId, token, regionId,
|
||||
cancelRemote = telephony.provisionSatelliteService(mSubId, token, provisionData,
|
||||
errorCallback);
|
||||
} else {
|
||||
throw new IllegalStateException("telephony service is null.");
|
||||
|
||||
@@ -194,7 +194,7 @@ oneway interface ISatellite {
|
||||
*
|
||||
* @param token The token to be used as a unique identifier for provisioning with satellite
|
||||
* gateway.
|
||||
* @param regionId The region ID for the device's current location.
|
||||
* @param provisionData Data from the provisioning app that can be used by provisioning server
|
||||
* @param resultCallback The callback to receive the error code result of the operation.
|
||||
*
|
||||
* Valid error codes returned:
|
||||
@@ -210,7 +210,7 @@ oneway interface ISatellite {
|
||||
* SatelliteError:REQUEST_ABORTED
|
||||
* SatelliteError:NETWORK_TIMEOUT
|
||||
*/
|
||||
void provisionSatelliteService(in String token, in String regionId,
|
||||
void provisionSatelliteService(in String token, in byte[] provisionData,
|
||||
in IIntegerConsumer resultCallback);
|
||||
|
||||
/**
|
||||
|
||||
@@ -132,11 +132,11 @@ public class SatelliteImplBase extends SatelliteService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void provisionSatelliteService(String token, String regionId,
|
||||
public void provisionSatelliteService(String token, byte[] provisionData,
|
||||
IIntegerConsumer errorCallback) throws RemoteException {
|
||||
executeMethodAsync(
|
||||
() -> SatelliteImplBase.this
|
||||
.provisionSatelliteService(token, regionId, errorCallback),
|
||||
.provisionSatelliteService(token, provisionData, errorCallback),
|
||||
"provisionSatelliteService");
|
||||
}
|
||||
|
||||
@@ -401,7 +401,8 @@ public class SatelliteImplBase extends SatelliteService {
|
||||
*
|
||||
* @param token The token to be used as a unique identifier for provisioning with satellite
|
||||
* gateway.
|
||||
* @param regionId The region ID for the device's current location.
|
||||
* @param provisionData Data from the provisioning app that can be used by provisioning
|
||||
* server
|
||||
* @param errorCallback The callback to receive the error code result of the operation.
|
||||
*
|
||||
* Valid error codes returned:
|
||||
@@ -417,7 +418,7 @@ public class SatelliteImplBase extends SatelliteService {
|
||||
* SatelliteError:REQUEST_ABORTED
|
||||
* SatelliteError:NETWORK_TIMEOUT
|
||||
*/
|
||||
public void provisionSatelliteService(@NonNull String token, @NonNull String regionId,
|
||||
public void provisionSatelliteService(@NonNull String token, @NonNull byte[] provisionData,
|
||||
@NonNull IIntegerConsumer errorCallback) {
|
||||
// stub implementation
|
||||
}
|
||||
|
||||
@@ -2823,15 +2823,15 @@ interface ITelephony {
|
||||
* @param subId The subId of the subscription to be provisioned.
|
||||
* @param token The token to be used as a unique identifier for provisioning with satellite
|
||||
* gateway.
|
||||
* @param regionId The region ID for the device's current location.
|
||||
* @provisionData Data from the provisioning app that can be used by provisioning server
|
||||
* @param callback The callback to get the result of the request.
|
||||
*
|
||||
* @return The signal transport used by callers to cancel the provision request.
|
||||
*/
|
||||
@JavaPassthrough(annotation="@android.annotation.RequiresPermission("
|
||||
+ "android.Manifest.permission.SATELLITE_COMMUNICATION)")
|
||||
ICancellationSignal provisionSatelliteService(int subId, in String token, in String regionId,
|
||||
in IIntegerConsumer callback);
|
||||
ICancellationSignal provisionSatelliteService(int subId, in String token,
|
||||
in byte[] provisionData, in IIntegerConsumer callback);
|
||||
|
||||
/**
|
||||
* Unregister the subscription with the satellite provider.
|
||||
|
||||
Reference in New Issue
Block a user