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

Cleanup satellite pointing APIs

Browse Source 
Assert null and use clean calling identity for callbacks

Test: atest SatelliteManagerTest
Bug: 266249740
Change-Id: I255c1b252ca755f263bf1d91f89243c368984300
This commit is contained in:
Sarah Chin
2023-02-01 01:31:25 -08:00
parent e5fccdfbdc
commit b772067087
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,6 @@ public class SatelliteManager {
* Error received from satellite service.
*/
public static final int SATELLITE_SERVICE_ERROR = 17;
/**
* Satellite service is disabled on the requested subscription.
*/
@@ -275,6 +274,9 @@ public class SatelliteManager {
@SatelliteServiceResult public int startSatellitePositionUpdates(
@NonNull @CallbackExecutor Executor executor,
@NonNull SatellitePositionUpdateCallback callback) {
Objects.requireNonNull(executor);
Objects.requireNonNull(callback);
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
@@ -290,16 +292,16 @@ public class SatelliteManager {
public void onSatellitePositionUpdate(
@NonNull PointingInfo pointingInfo) {
logd("onSatellitePositionUpdate: pointingInfo=" + pointingInfo);
executor.execute(() ->
callback.onSatellitePositionUpdate(pointingInfo));
executor.execute(() -> Binder.withCleanCallingIdentity(
() -> callback.onSatellitePositionUpdate(pointingInfo)));
}
@Override
public void onMessageTransferStateUpdate(
@SatelliteMessageTransferState int state) {
logd("onMessageTransferStateUpdate: state=" + state);
executor.execute(() ->
callback.onMessageTransferStateUpdate(state));
executor.execute(() -> Binder.withCleanCallingIdentity(
() -> callback.onMessageTransferStateUpdate(state)));
}
});
if (result == SATELLITE_SERVICE_SUCCESS) {
@@ -330,6 +332,8 @@ public class SatelliteManager {
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
@SatelliteServiceResult public int stopSatellitePositionUpdates(
@NonNull SatellitePositionUpdateCallback callback) {
Objects.requireNonNull(callback);
if (!mSatellitePositionUpdateCallbacks.containsKey(callback)) {
throw new IllegalArgumentException(
"startSatellitePositionUpdates was never called with the callback provided.");