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

Commit 213def27 authored by Arun Voddu's avatar Arun Voddu Committed by Android (Google) Code Review
Browse files

Merge "Enhanced AIDLs to fetch the Carrier lock information." into main

parents 94ef1085 aa48e638
Loading
Loading
Loading
Loading
+47 −0
Original line number 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.
 */
///////////////////////////////////////////////////////////////////////////////
// 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.sim;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable CarrierInfo {
  String mcc;
  String mnc;
  @nullable String spn;
  @nullable String gid1;
  @nullable String gid2;
  @nullable String imsiPrefix;
  @nullable List<android.hardware.radio.sim.Plmn> ephlmn;
  @nullable String iccid;
  @nullable String impi;
}
+8 −0
Original line number Diff line number Diff line
@@ -35,10 +35,18 @@ package android.hardware.radio.sim;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable CarrierRestrictions {
  /**
   * @deprecated use @List<CarrierInfo> allowedCarrierInfoList
   */
  android.hardware.radio.sim.Carrier[] allowedCarriers;
  /**
   * @deprecated use @List<CarrierInfo> excludedCarrierInfoList
   */
  android.hardware.radio.sim.Carrier[] excludedCarriers;
  boolean allowedCarriersPrioritized;
  android.hardware.radio.sim.CarrierRestrictions.CarrierRestrictionStatus status;
  android.hardware.radio.sim.CarrierInfo[] allowedCarrierInfoList = {};
  android.hardware.radio.sim.CarrierInfo[] excludedCarrierInfoList = {};
  @Backing(type="int") @VintfStability
  enum CarrierRestrictionStatus {
    UNKNOWN = 0,
+40 −0
Original line number 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.
 */
///////////////////////////////////////////////////////////////////////////////
// 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.sim;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable Plmn {
  String mcc;
  String mnc;
}
+7 −0
Original line number Diff line number Diff line
@@ -37,4 +37,11 @@ package android.hardware.radio.sim;
enum SimLockMultiSimPolicy {
  NO_MULTISIM_POLICY,
  ONE_VALID_SIM_MUST_BE_PRESENT,
  APPLY_TO_ALL_SLOTS,
  APPLY_TO_ONLY_SLOT_1,
  VALID_SIM_MUST_PRESENT_ON_SLOT_1,
  ACTIVE_SERVICE_ON_SLOT_1_TO_UNBLOCK_OTHER_SLOTS,
  ACTIVE_SERVICE_ON_ANY_SLOT_TO_UNBLOCK_OTHER_SLOTS,
  ALL_SIMS_MUST_BE_VALID,
  SLOT_POLICY_OTHER,
}
+70 −0
Original line number 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.hardware.radio.sim;

import android.hardware.radio.sim.Plmn;

/** @hide */
@VintfStability
@JavaDerive(toString=true)
parcelable CarrierInfo {
    /**
     * MCC (Mobile Country Code) of Carrier. Wild char is either '*' or '?'.
     */
    String mcc;

    /**
     * MNC (Mobile Network Code) of the Carrier. Wild char is either '*' or '?'.
     */
    String mnc;
    /**
     * Service Provider Name(SPN) of the SIM card of the Carrier.
     */
    @nullable
    String spn;
    /**
     * GID1 value of the SIM card of the Carrier.
     */
    @nullable
    String gid1;
    /**
     * GID2 value of the SIM card of the Carrier.
     */
    @nullable
    String gid2;

    /**
     * IMSI (International Mobile Subscriber Identity) prefix. Wild char is '*'.
     */
    @nullable
    String imsiPrefix;
    /**
     * Equivalent HPLMN of the SIM card of the Carrier.
     */
    @nullable
    List<Plmn> ephlmn;
    /**
     * ICCID (Integrated Circuit Card Identification) of the SIM card.
     */
    @nullable
    String iccid;
    /**
     * IMPI (IMS Private Identity) of the SIM card of the Carrier.
     */
    @nullable
    String impi;
}
 No newline at end of file
Loading