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

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

Merge "Convert hidl_bitfield and bitfield to int"

parents 4acb0065 6d8e49a0

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ parcelable DataProfileInfo { 
  int maxConns;

  int waitTime;

  boolean enabled;

  android.hardware.radio.data.ApnTypes supportedApnTypesBitmap;

  android.hardware.radio.RadioAccessFamily bearerBitmap;

  int supportedApnTypesBitmap;

  int bearerBitmap;

  int mtuV4;

  int mtuV6;

  boolean preferred;

radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/RadioCapability.aidl

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ package android.hardware.radio.modem; 
parcelable RadioCapability {

  int session;

  int phase;

  android.hardware.radio.RadioAccessFamily raf;

  int raf;

  String logicalModemUuid;

  int status;

  const int PHASE_CONFIGURED = 0;

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl

+2 −2
Original line number Diff line number Diff line
@@ -50,12 +50,12 @@ interface IRadioNetwork { 
  oneway void getVoiceRegistrationState(in int serial);

  oneway void isNrDualConnectivityEnabled(in int serial);

  oneway void responseAcknowledgement();

  oneway void setAllowedNetworkTypesBitmap(in int serial, in android.hardware.radio.RadioAccessFamily networkTypeBitmap);

  oneway void setAllowedNetworkTypesBitmap(in int serial, in int networkTypeBitmap);

  oneway void setBandMode(in int serial, in android.hardware.radio.network.RadioBandMode mode);

  oneway void setBarringPassword(in int serial, in String facility, in String oldPassword, in String newPassword);

  oneway void setCdmaRoamingPreference(in int serial, in android.hardware.radio.network.CdmaRoamingType type);

  oneway void setCellInfoListRate(in int serial, in int rate);

  oneway void setIndicationFilter(in int serial, in android.hardware.radio.network.IndicationFilter indicationFilter);

  oneway void setIndicationFilter(in int serial, in int indicationFilter);

  oneway void setLinkCapacityReportingCriteria(in int serial, in int hysteresisMs, in int hysteresisDlKbps, in int hysteresisUlKbps, in int[] thresholdsDownlinkKbps, in int[] thresholdsUplinkKbps, in android.hardware.radio.AccessNetwork accessNetwork);

  oneway void setLocationUpdates(in int serial, in boolean enable);

  oneway void setNetworkSelectionModeAutomatic(in int serial);

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkIndication.aidl

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ interface IRadioNetworkIndication { 
  oneway void networkScanResult(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.NetworkScanResult result);

  oneway void networkStateChanged(in android.hardware.radio.RadioIndicationType type);

  oneway void nitzTimeReceived(in android.hardware.radio.RadioIndicationType type, in String nitzTime, in long receivedTimeMs, in long ageMs);

  oneway void registrationFailed(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.CellIdentity cellIdentity, in String chosenPlmn, in android.hardware.radio.network.Domain domain, in int causeCode, in int additionalCauseCode);

  oneway void registrationFailed(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.CellIdentity cellIdentity, in String chosenPlmn, in int domain, in int causeCode, in int additionalCauseCode);

  oneway void restrictedStateChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.PhoneRestrictedState state);

  oneway void suppSvcNotify(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.network.SuppSvcNotification suppSvc);

  oneway void voiceRadioTechChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.RadioTechnology rat);

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ package android.hardware.radio.network; 
@VintfStability

interface IRadioNetworkResponse {

  oneway void acknowledgeRequest(in int serial);

  oneway void getAllowedNetworkTypesBitmapResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.RadioAccessFamily networkTypeBitmap);

  oneway void getAllowedNetworkTypesBitmapResponse(in android.hardware.radio.RadioResponseInfo info, in int networkTypeBitmap);

  oneway void getAvailableBandModesResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RadioBandMode[] bandModes);

  oneway void getAvailableNetworksResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.OperatorInfo[] networkInfos);

  oneway void getBarringInfoResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.CellIdentity cellIdentity, in android.hardware.radio.network.BarringInfo[] barringInfos);