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

Merge "Add satellite service APIs"

Browse Source
This commit is contained in:
Sarah Chin
2023-02-09 19:52:28 +00:00
committed by Android (Google) Code Review
parent 414c1802e6 060268833e
commit d141c95058
4 changed files with 237 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
telephony/java/android/telephony/satellite/ISatelliteCapabilitiesConsumer.aidl Normal file
View File

@@ -0,0 +1,27 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.telephony.satellite;
import android.telephony.satellite.SatelliteCapabilities;
/**
* Consumer for a SatelliteCapabilities result from the satellite service.
* @hide
*/
oneway interface ISatelliteCapabilitiesConsumer {
void accept(in SatelliteCapabilities result);
}

19
telephony/java/android/telephony/satellite/SatelliteCapabilities.aidl Normal file
View File

@@ -0,0 +1,19 @@
/*
* Copyright 2023, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.telephony.satellite;
parcelable SatelliteCapabilities;

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

@@ -33,6 +33,7 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyFrameworkInitializer;
import android.telephony.satellite.stub.SatelliteImplBase;
import com.android.internal.telephony.IBooleanConsumer;
import com.android.internal.telephony.IIntArrayConsumer;
import com.android.internal.telephony.IIntegerConsumer;
import com.android.internal.telephony.ITelephony;
@@ -341,6 +342,161 @@ public class SatelliteManager {
@Retention(RetentionPolicy.SOURCE)
public @interface SatelliteServiceResult {}
/**
* Power on or off the satellite modem.
*
* @param powerOn {@code true} to power on the satellite modem and {@code false} to power off.
*
* @throws SecurityException if the caller doesn't have required permission.
* @throws IllegalStateException if the Telephony process is not currently available.
*
* @return The result of the operation.
*/
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
@SatelliteServiceResult public int setSatellitePower(boolean powerOn) {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.setSatellitePower(mSubId, powerOn);
} else {
throw new IllegalStateException("telephony service is null.");
}
} catch (RemoteException ex) {
Rlog.e(TAG, "setSatellitePower RemoteException", ex);
ex.rethrowFromSystemServer();
}
return SATELLITE_SERVICE_REQUEST_FAILED;
}
/**
* Check whether the satellite modem is powered on.
*
* @param executor The executor on which the result listener will be called.
* @param resultListener Listener with the result if the operation is successful.
* If this method returns {@link #SATELLITE_SERVICE_SUCCESS}, the result
* listener will return {@code true} if the satellite modem is powered on
* and {@code false} otherwise.
*
* @throws SecurityException if the caller doesn't have required permission.
* @throws IllegalStateException if the Telephony process is not currently available.
*
* @return The result of the operation.
*/
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
@SatelliteServiceResult public int isSatellitePowerOn(
@NonNull @CallbackExecutor Executor executor,
@NonNull Consumer<Boolean> resultListener) {
Objects.requireNonNull(executor);
Objects.requireNonNull(resultListener);
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
IBooleanConsumer internalCallback = new IBooleanConsumer.Stub() {
@Override
public void accept(boolean result) {
executor.execute(() -> Binder.withCleanCallingIdentity(
() -> resultListener.accept(result)));
}
};
return telephony.isSatellitePowerOn(mSubId, internalCallback);
} else {
throw new IllegalStateException("telephony service is null.");
}
} catch (RemoteException ex) {
loge("isSatellitePowerOn() RemoteException:" + ex);
ex.rethrowFromSystemServer();
}
return SATELLITE_SERVICE_REQUEST_FAILED;
}
/**
* Check whether the satellite service is supported on the device.
*
* @param executor The executor on which the result listener will be called.
* @param resultListener Listener with the result if the operation is successful.
* If this method returns {@link #SATELLITE_SERVICE_SUCCESS}, the result
* listener will return {@code true} if the satellite service is supported
* and {@code false} otherwise.
*
* @throws SecurityException if the caller doesn't have required permission.
* @throws IllegalStateException if the Telephony process is not currently available.
*
* @return The result of the operation.
*/
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
@SatelliteServiceResult public int isSatelliteSupported(
@NonNull @CallbackExecutor Executor executor,
@NonNull Consumer<Boolean> resultListener) {
Objects.requireNonNull(executor);
Objects.requireNonNull(resultListener);
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
IBooleanConsumer internalCallback = new IBooleanConsumer.Stub() {
@Override
public void accept(boolean result) {
executor.execute(() -> Binder.withCleanCallingIdentity(
() -> resultListener.accept(result)));
}
};
return telephony.isSatelliteSupported(mSubId, internalCallback);
} else {
throw new IllegalStateException("telephony service is null.");
}
} catch (RemoteException ex) {
loge("isSatelliteSupported() RemoteException:" + ex);
ex.rethrowFromSystemServer();
}
return SATELLITE_SERVICE_REQUEST_FAILED;
}
/**
* Get the {@link SatelliteCapabilities} with all capabilities of the satellite service.
*
* @param executor The executor on which the result listener will be called.
* @param resultListener Listener with the result if the operation is successful.
* If this method returns {@link #SATELLITE_SERVICE_SUCCESS}, the result
* listener will return the current {@link SatelliteCapabilities}.
*
* @throws SecurityException if the caller doesn't have required permission.
* @throws IllegalStateException if the Telephony process is not currently available.
*
* @return The result of the operation.
*/
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
@SatelliteServiceResult public int getSatelliteCapabilities(
@NonNull @CallbackExecutor Executor executor,
@NonNull Consumer<SatelliteCapabilities> resultListener) {
Objects.requireNonNull(executor);
Objects.requireNonNull(resultListener);
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
ISatelliteCapabilitiesConsumer internalCallback =
new ISatelliteCapabilitiesConsumer.Stub() {
@Override
public void accept(SatelliteCapabilities result) {
executor.execute(() -> Binder.withCleanCallingIdentity(
() -> resultListener.accept(result)));
}
};
return telephony.getSatelliteCapabilities(mSubId, internalCallback);
} else {
throw new IllegalStateException("telephony service is null.");
}
} catch (RemoteException ex) {
loge("getSatelliteCapabilities() RemoteException:" + ex);
ex.rethrowFromSystemServer();
}
return SATELLITE_SERVICE_REQUEST_FAILED;
}
/**
* Message transfer is waiting to acquire.
*/
@@ -379,10 +535,14 @@ public class SatelliteManager {
* Satellite position updates are started only on {@link #SATELLITE_SERVICE_SUCCESS}.
* All other results indicate that this operation failed.
*
* @param executor - The executor on which the callback will be called.
* @param executor The executor on which the callback will be called.
* @param callback The callback to notify of changes in satellite position. This
* SatelliteCallback should implement the interface
* {@link SatelliteCallback.SatellitePositionUpdateListener}.
*
* @throws SecurityException if the caller doesn't have required permission.
* @throws IllegalStateException if the Telephony process is not currently available.
*
* @return The result of the operation.
*/
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
@@ -414,8 +574,12 @@ public class SatelliteManager {
*
* @param callback The callback that was passed in {@link
* #startSatellitePositionUpdates(Executor, SatelliteCallback)}.
* @return The result of the operation.
*
* @throws SecurityException if the caller doesn't have required permission.
* @throws IllegalArgumentException if the callback is invalid.
* @throws IllegalStateException if the Telephony process is not currently available.
*
* @return The result of the operation.
*/
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
@SatelliteServiceResult public int stopSatellitePositionUpdates(
@@ -445,8 +609,9 @@ public class SatelliteManager {
* will be called with maximum characters limit.
*
* @throws SecurityException if the caller doesn't have required permission.
* @throws IllegalStateException if the Telephony process is not currently available.
*
* @return The result of the operation
* @return The result of the operation.
*/
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
@SatelliteServiceResult

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

@@ -68,6 +68,8 @@ import android.telephony.ims.aidl.IImsRegistration;
import android.telephony.ims.aidl.IImsRegistrationCallback;
import android.telephony.ims.aidl.IRcsConfigCallback;
import android.telephony.satellite.ISatelliteStateListener;
import android.telephony.satellite.ISatelliteCapabilitiesConsumer;
import android.telephony.satellite.SatelliteCapabilities;
import com.android.ims.internal.IImsServiceFeatureCallback;
import com.android.internal.telephony.CellNetworkScanResult;
import com.android.internal.telephony.IBooleanConsumer;
@@ -1536,7 +1538,7 @@ interface ITelephony {
*/
CarrierRestrictionRules getAllowedCarriers();
/**
/**
* Returns carrier id of the given subscription.
* <p>To recognize carrier as a first class identity, assign each carrier with a canonical
* integer a.k.a carrier id.
@@ -2701,6 +2703,26 @@ interface ITelephony {
*/
void getCarrierRestrictionStatus(IIntegerConsumer internalCallback, String packageName);
/**
* Power on or off the satellite modem.
*/
int setSatellitePower(int subId, boolean powerOn);
/**
* Check whether the satellite modem is powered on.
*/
int isSatellitePowerOn(int subId, IBooleanConsumer internalCallback);
/**
* Check whether the satellite service is supported on the device.
*/
int isSatelliteSupported(int subId, IBooleanConsumer internalCallback);
/**
* Get the capabilities of the satellite service.
*/
int getSatelliteCapabilities(int subId, ISatelliteCapabilitiesConsumer internalCallback);
/**
* Start receiving satellite pointing updates.
*/