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

Commit 89e5fc4f authored by Thomas Nguyen's avatar Thomas Nguyen
Browse files

DO NOT MERGE Revert "Add Satellite HAL APIs"

Revert submission 20583557-Satellite APIs

Reason for revert: We need to revert these changes for U

Reverted changes: /q/submissionid:20583557-Satellite+APIs

Bug: 271297374
Test: Call and SMS/MMS with live network.
atest TelephonyManagerTestOnMockModem
atest VtsHalRadioTargetTest
atest com.android.cellbroadcastreceiver.compliancetests.CellBroadcastConfigTest
atest android.telephony.cts.TelephonyManagerTest
atest android.telephony.cts.SatelliteManagerTest

Change-Id: I7ada8e72d77543f1ac03b267d61e8fd037ec3708
parent 4da12781
Loading
Loading
Loading
Loading
+0 −10
Original line number Original line Diff line number Diff line
@@ -499,16 +499,6 @@
            <instance>slot3</instance>
            <instance>slot3</instance>
        </interface>
        </interface>
    </hal>
    </hal>
    <hal format="aidl" optional="true">
        <name>android.hardware.radio.satellite</name>
        <version>1</version>
        <interface>
            <name>IRadioSatellite</name>
            <instance>slot1</instance>
            <instance>slot2</instance>
            <instance>slot3</instance>
        </interface>
    </hal>
    <hal format="aidl" optional="true">
    <hal format="aidl" optional="true">
        <name>android.hardware.radio.ims.media</name>
        <name>android.hardware.radio.ims.media</name>
        <version>1</version>
        <version>1</version>
+0 −16
Original line number Original line Diff line number Diff line
@@ -262,19 +262,3 @@ aidl_interface {
        },
        },
    },
    },
}
}

aidl_interface {
    name: "android.hardware.radio.satellite",
    vendor_available: true,
    srcs: ["android/hardware/radio/satellite/*.aidl"],
    stability: "vintf",
    imports: ["android.hardware.radio-V2"],
    backend: {
        cpp: {
            enabled: false,
        },
        java: {
            sdk_version: "module_current",
        },
    },
}
+0 −53
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2022 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.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.radio.satellite;
@VintfStability
interface IRadioSatellite {
  oneway void addAllowedSatelliteContacts(in int serial, in String[] contacts);
  oneway void getCapabilities(in int serial);
  oneway void getMaxCharactersPerTextMessage(in int serial);
  oneway void getPendingMessages(in int serial);
  oneway void getPowerState(in int serial);
  oneway void getSatelliteMode(in int serial);
  oneway void getTimeForNextSatelliteVisibility(in int serial);
  oneway void provisionService(in int serial, in String imei, in String msisdn, in String imsi, in android.hardware.radio.satellite.SatelliteFeature[] features);
  oneway void removeAllowedSatelliteContacts(in int serial, in String[] contacts);
  oneway void responseAcknowledgement();
  oneway void sendMessages(in int serial, in String[] messages, in String destination, in double latitude, in double longitude);
  oneway void setIndicationFilter(in int serial, in int filterBitmask);
  oneway void setPower(in int serial, in boolean on);
  oneway void setResponseFunctions(in android.hardware.radio.satellite.IRadioSatelliteResponse satelliteResponse, in android.hardware.radio.satellite.IRadioSatelliteIndication satelliteIndication);
  oneway void startSendingSatellitePointingInfo(in int serial);
  oneway void stopSendingSatellitePointingInfo(in int serial);
}
+0 −44
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2022 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.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.radio.satellite;
@VintfStability
interface IRadioSatelliteIndication {
  oneway void onMessagesTransferComplete(in android.hardware.radio.RadioIndicationType type, in boolean complete);
  oneway void onNewMessages(in android.hardware.radio.RadioIndicationType type, in String[] messages);
  oneway void onPendingMessageCount(in android.hardware.radio.RadioIndicationType type, in int count);
  oneway void onProvisionStateChanged(in android.hardware.radio.RadioIndicationType type, boolean provisioned, in android.hardware.radio.satellite.SatelliteFeature[] features);
  oneway void onSatelliteModeChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.satellite.SatelliteMode mode);
  oneway void onSatellitePointingInfoChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.satellite.PointingInfo pointingInfo);
  oneway void onSatelliteRadioTechnologyChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.satellite.NTRadioTechnology technology);
}
+0 −52
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2022 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.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.radio.satellite;
@VintfStability
interface IRadioSatelliteResponse {
  oneway void acknowledgeRequest(in int serial);
  oneway void addAllowedSatelliteContactsResponse(in android.hardware.radio.RadioResponseInfo info);
  oneway void getCapabilitiesResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.satellite.SatelliteCapabilities capabilities);
  oneway void getMaxCharactersPerTextMessageResponse(in android.hardware.radio.RadioResponseInfo info, in int charLimit);
  oneway void getPendingMessagesResponse(in android.hardware.radio.RadioResponseInfo info, in String[] messages);
  oneway void getPowerStateResponse(in android.hardware.radio.RadioResponseInfo info, in boolean on);
  oneway void getSatelliteModeResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.satellite.SatelliteMode mode, in android.hardware.radio.satellite.NTRadioTechnology technology);
  oneway void getTimeForNextSatelliteVisibilityResponse(in android.hardware.radio.RadioResponseInfo info, in int timeInSeconds);
  oneway void provisionServiceResponse(in android.hardware.radio.RadioResponseInfo info, in boolean provisioned);
  oneway void removeAllowedSatelliteContactsResponse(in android.hardware.radio.RadioResponseInfo info);
  oneway void sendMessagesResponse(in android.hardware.radio.RadioResponseInfo info);
  oneway void setIndicationFilterResponse(in android.hardware.radio.RadioResponseInfo info);
  oneway void setPowerResponse(in android.hardware.radio.RadioResponseInfo info);
  oneway void startSendingSatellitePointingInfoResponse(in android.hardware.radio.RadioResponseInfo info);
  oneway void stopSendingSatellitePointingInfoResponse(in android.hardware.radio.RadioResponseInfo info);
}
Loading