Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed provisionData type from string to byte[]."

Browse Source
This commit is contained in:
Aishwarya Mallampati
2023-04-03 16:26:39 +00:00
committed by Android (Google) Code Review
parent c069d5d702 7f2435252b
commit 802ba466d0
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/android/telephony/satellite/SatelliteManager.java
View File

@@ -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.");

4
telephony/java/android/telephony/satellite/stub/ISatellite.aidl
View File

@@ -203,7 +203,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:
@@ -219,7 +219,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);
/**

9
telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java
View File

@@ -141,11 +141,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");
}
@@ -421,7 +421,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:
@@ -437,7 +438,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
}

6
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -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.