Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e4503a0 authored by Thomas Nguyen's avatar Thomas Nguyen Committed by Automerger Merge Worker
Browse files

Merge "Add satellite gateway service definition" into udc-dev am: bd803332 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22325886



Change-Id: Id13dc6021cc16d765e86c120c0cce3fb26116832
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53575a31 bd803332

core/res/AndroidManifest.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -2917,6 +2917,14 @@ 
    <permission android:name="android.permission.BIND_SATELLITE_SERVICE"

    <permission android:name="android.permission.BIND_SATELLITE_SERVICE"

        android:protectionLevel="signature|privileged|vendorPrivileged" />

        android:protectionLevel="signature|privileged|vendorPrivileged" />





    <!-- Must be required by a SatelliteGatewayService to ensure that only the

         system can bind to it.

         <p>Protection level: signature

         @hide

    -->

    <permission android:name="android.permission.BIND_SATELLITE_GATEWAY_SERVICE"

        android:protectionLevel="signature" />



    <!-- Must be required by a telephony data service to ensure that only the

    <!-- Must be required by a telephony data service to ensure that only the

         system can bind to it.

         system can bind to it.

         <p>Protection level: signature

         <p>Protection level: signature

core/res/res/values/config_telephony.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -125,6 +125,10 @@ 
    <string name="config_satellite_service_package" translatable="false"></string>

    <string name="config_satellite_service_package" translatable="false"></string>

    <java-symbol type="string" name="config_satellite_service_package" />

    <java-symbol type="string" name="config_satellite_service_package" />





    <!-- Telephony satellite gateway service package name to bind to by default. -->

    <string name="config_satellite_gateway_service_package" translatable="false"></string>

    <java-symbol type="string" name="config_satellite_gateway_service_package" />



    <!-- Telephony pointing UI package name to be launched. -->

    <!-- Telephony pointing UI package name to be launched. -->

    <string name="config_pointing_ui_package" translatable="false"></string>

    <string name="config_pointing_ui_package" translatable="false"></string>

    <java-symbol type="string" name="config_pointing_ui_package" />

    <java-symbol type="string" name="config_pointing_ui_package" />

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,7 @@ applications that come with the platform 
        <permission name="android.permission.BIND_CARRIER_SERVICES"/>

        <permission name="android.permission.BIND_CARRIER_SERVICES"/>

        <permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/>

        <permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/>

        <permission name="android.permission.BIND_IMS_SERVICE"/>

        <permission name="android.permission.BIND_IMS_SERVICE"/>

        <permission name="android.permission.BIND_SATELLITE_GATEWAY_SERVICE"/>

        <permission name="android.permission.BIND_SATELLITE_SERVICE"/>

        <permission name="android.permission.BIND_SATELLITE_SERVICE"/>

        <permission name="android.permission.BIND_TELEPHONY_DATA_SERVICE"/>

        <permission name="android.permission.BIND_TELEPHONY_DATA_SERVICE"/>

        <permission name="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"/>

        <permission name="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"/>

telephony/java/android/telephony/satellite/stub/ISatelliteGateway.aidl

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
/*

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

}

telephony/java/android/telephony/satellite/stub/SatelliteGatewayService.java

0 → 100644
+77 −0
Original line number Original line Diff line number Diff line 
/*

 * 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:

 *

 * ...

 * <service android:name=".EgSatelliteGatewayService"

 *     android:permission="android.permission.BIND_SATELLITE_GATEWAY_SERVICE" >

 *     ...

 *     <intent-filter>

 *         <action android:name="android.telephony.satellite.SatelliteGatewayService" />

 *     </intent-filter>

 * </service>

 * ...

 *

 * 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;

    }

}