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

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

Merge changes from topic "aidl_tostring" into tm-mainline-prod 

* changes:
  [automerge] Add JavaDerive toString to AIDL classes 2p: da10904e
  Add JavaDerive toString to AIDL classes
parents f7bd1f97 83e5c2cd

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/PhoneCapability.aidl

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.radio.config;

@VintfStability

@JavaDerive(toString=true) @VintfStability

parcelable PhoneCapability {

  byte maxActiveData;

  byte maxActiveInternetData;

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimPortInfo.aidl

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.radio.config;

@VintfStability

@JavaDerive(toString=true) @VintfStability

parcelable SimPortInfo {

  String iccId;

  int logicalSlotId;

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimSlotStatus.aidl

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.radio.config;

@VintfStability

@JavaDerive(toString=true) @VintfStability

parcelable SimSlotStatus {

  int cardState;

  String atr;

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SlotPortMapping.aidl

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.radio.config;

@VintfStability

@JavaDerive(toString=true) @VintfStability

parcelable SlotPortMapping {

  int physicalSlotId;

  int portId;

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.radio.data;

@Backing(type="int") @VintfStability

@Backing(type="int") @JavaDerive(toString=true) @VintfStability

enum ApnAuthType {

  NO_PAP_NO_CHAP = 0,

  PAP_NO_CHAP = 1,