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

Commit 1ef00c9a authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "API changes for IRadio AIDL conversion"

parents 5cca0b5a 3fd11c9d

radio/aidl/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ aidl_interface { 
cc_library {

    name: "android.hardware.radio-translate-ndk",

    vendor_available: true,

    srcs: ["android/hardware/radio/translate-ndk.cpp"],

    shared_libs: [

        "libbinder_ndk",

        "libhidlbase",
@@ -43,12 +42,10 @@ cc_library { 
        "android.hardware.radio@1.5",

        "android.hardware.radio@1.6",

    ],

    export_include_dirs: ["include"],

}



java_library {

    name: "android.hardware.radio-translate-java",

    srcs: ["android/hardware/radio/Translate.java"],

    libs: [

        "android.hardware.radio-V1-java",

        "android.hardware.radio-V1.0-java",

radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/BarringInfoBarringTypeSpecificInfo.aidl→radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/AccessTechnologySpecificInfo.aidl

+5 −2
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ 


package android.hardware.radio;

@VintfStability

union BarringInfoBarringTypeSpecificInfo {

union AccessTechnologySpecificInfo {

  boolean noinit;

  android.hardware.radio.BarringInfoBarringTypeSpecificInfoConditional conditional;

  android.hardware.radio.Cdma2000RegistrationInfo cdmaInfo;

  android.hardware.radio.EutranRegistrationInfo eutranInfo;

  android.hardware.radio.NrVopsInfo ngranNrVopsInfo;

  boolean geranDtmSupported;

}

radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/AddressProperty.aidl

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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;

@Backing(type="int") @VintfStability

enum AddressProperty {

  NONE = 0,

  DEPRECATED = 32,

}

radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/AppState.aidl

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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;

@Backing(type="int") @VintfStability

enum AppState {

  UNKNOWN = 0,

  DETECTED = 1,

  PIN = 2,

  PUK = 3,

  SUBSCRIPTION_PERSO = 4,

  READY = 5,

}

radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/AppStatus.aidl

+15 −3
Original line number Diff line number Diff line
@@ -34,12 +34,24 @@ 
package android.hardware.radio;

@VintfStability

parcelable AppStatus {

  android.hardware.radio.AppType appType;

  android.hardware.radio.AppState appState;

  int appType;

  int appState;

  android.hardware.radio.PersoSubstate persoSubstate;

  String aidPtr;

  String appLabelPtr;

  int pin1Replaced;

  boolean pin1Replaced;

  android.hardware.radio.PinState pin1;

  android.hardware.radio.PinState pin2;

  const int APP_STATE_UNKNOWN = 0;

  const int APP_STATE_DETECTED = 1;

  const int APP_STATE_PIN = 2;

  const int APP_STATE_PUK = 3;

  const int APP_STATE_SUBSCRIPTION_PERSO = 4;

  const int APP_STATE_READY = 5;

  const int APP_TYPE_UNKNOWN = 0;

  const int APP_TYPE_SIM = 1;

  const int APP_TYPE_USIM = 2;

  const int APP_TYPE_RUIM = 3;

  const int APP_TYPE_CSIM = 4;

  const int APP_TYPE_ISIM = 5;

}