From 9762eabc2c6fab39f76a6a8da841772e907ba475 Mon Sep 17 00:00:00 2001 From: Thomas Nguyen Date: Wed, 5 Apr 2023 20:06:35 -0700 Subject: [PATCH] Add satellite gateway service definition Bug: 275633844 Test: Call/SMS/MMS with live network. Wil add a mock satellite gate service for testing in CTS. atest android.telephony.cts.SatelliteManagerTest atest com.android.internal.telephony.satellite.SatelliteSessionControllerTest Change-Id: Ic8906f1b880a210f995b13b3e86064cb84ef82c3 --- core/res/AndroidManifest.xml | 8 ++ core/res/res/values/config_telephony.xml | 4 + data/etc/privapp-permissions-platform.xml | 1 + .../satellite/stub/ISatelliteGateway.aidl | 26 +++++++ .../stub/SatelliteGatewayService.java | 77 +++++++++++++++++++ .../internal/telephony/ITelephony.aidl | 9 +++ 6 files changed, 125 insertions(+) create mode 100644 telephony/java/android/telephony/satellite/stub/ISatelliteGateway.aidl create mode 100644 telephony/java/android/telephony/satellite/stub/SatelliteGatewayService.java diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 05b38a562e293..9a5450068fb3e 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2917,6 +2917,14 @@ + + + + + + diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 0faf62e03b145..3ba2d75732d66 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -122,6 +122,7 @@ applications that come with the platform + diff --git a/telephony/java/android/telephony/satellite/stub/ISatelliteGateway.aidl b/telephony/java/android/telephony/satellite/stub/ISatelliteGateway.aidl new file mode 100644 index 0000000000000..4f1a13623c3ba --- /dev/null +++ b/telephony/java/android/telephony/satellite/stub/ISatelliteGateway.aidl @@ -0,0 +1,26 @@ +/* + * 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.stub; + +/** + * {@hide} + */ +oneway interface ISatelliteGateway { + // An empty service because Telephony does not need to use any APIs from this service. + // Once satellite modem is enabled, Telephony will bind to the ISatelliteGateway service; and + // when satellite modem is disabled, Telephony will unbind to the service. +} diff --git a/telephony/java/android/telephony/satellite/stub/SatelliteGatewayService.java b/telephony/java/android/telephony/satellite/stub/SatelliteGatewayService.java new file mode 100644 index 0000000000000..f4514a6de4138 --- /dev/null +++ b/telephony/java/android/telephony/satellite/stub/SatelliteGatewayService.java @@ -0,0 +1,77 @@ +/* + * 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.stub; + +import android.annotation.SdkConstant; +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; + +import com.android.telephony.Rlog; + +/** + * Main SatelliteGatewayService implementation, which binds via the Telephony SatelliteController. + * Services that extend SatelliteGatewayService must register the service in their AndroidManifest + * to be detected by the framework. The application must declare that they require the + * "android.permission.BIND_SATELLITE_GATEWAY_SERVICE" permission to ensure that nothing else can + * bind to their service except the Telephony framework. The SatelliteGatewayService definition in + * the manifest must follow the following format: + * + * ... + * + * ... + * + * + * + * + * ... + * + * The telephony framework will then bind to the SatelliteGatewayService defined in the manifest if + * it is the default SatelliteGatewayService defined in the device overlay + * "config_satellite_gateway_service_package". + * @hide + */ +public abstract class SatelliteGatewayService extends Service { + private static final String TAG = "SatelliteGatewayService"; + + @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION) + public static final String SERVICE_INTERFACE = + "android.telephony.satellite.SatelliteGatewayService"; + + private final IBinder mBinder = new ISatelliteGateway.Stub() {}; + + /** + * @hide + */ + @Override + public final IBinder onBind(Intent intent) { + if (SERVICE_INTERFACE.equals(intent.getAction())) { + Rlog.d(TAG, "SatelliteGatewayService bound"); + return mBinder; + } + return null; + } + + /** + * @return The binder for the ISatelliteGateway. + * @hide + */ + public final IBinder getBinder() { + return mBinder; + } +} diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index ee9d6c1a24484..282b64d3f43ec 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -2990,6 +2990,15 @@ interface ITelephony { */ boolean setSatelliteServicePackageName(in String servicePackageName); + /** + * This API can be used by only CTS to update satellite gateway service package name. + * + * @param servicePackageName The package name of the satellite gateway service. + * @return {@code true} if the satellite gateway service is set successfully, + * {@code false} otherwise. + */ + boolean setSatelliteGatewayServicePackageName(in String servicePackageName); + /** * This API can be used by only CTS to update the timeout duration in milliseconds that * satellite should stay at listening mode to wait for the next incoming page before disabling