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

Commit 0d0dc1e2 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add JavaDerive toString to AIDL classes" am: 3e8c0d8b 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2048124



Change-Id: I625e9e30d5c7726e0efd92d2fc6368f1bcd50f2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85662b8f 3e8c0d8b

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

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

// later when a module using the interface is updated, e.g., Mainline modules.





package android.hardware.radio.config;

package android.hardware.radio.config;

@VintfStability

@JavaDerive(toString=true) @VintfStability

parcelable PhoneCapability {

parcelable PhoneCapability {

  byte maxActiveData;

  byte maxActiveData;

  byte maxActiveInternetData;

  byte maxActiveInternetData;

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

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

// later when a module using the interface is updated, e.g., Mainline modules.





package android.hardware.radio.config;

package android.hardware.radio.config;

@VintfStability

@JavaDerive(toString=true) @VintfStability

parcelable SimPortInfo {

parcelable SimPortInfo {

  String iccId;

  String iccId;

  int logicalSlotId;

  int logicalSlotId;

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

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

// later when a module using the interface is updated, e.g., Mainline modules.





package android.hardware.radio.config;

package android.hardware.radio.config;

@VintfStability

@JavaDerive(toString=true) @VintfStability

parcelable SimSlotStatus {

parcelable SimSlotStatus {

  int cardState;

  int cardState;

  String atr;

  String atr;

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

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

// later when a module using the interface is updated, e.g., Mainline modules.





package android.hardware.radio.config;

package android.hardware.radio.config;

@VintfStability

@JavaDerive(toString=true) @VintfStability

parcelable SlotPortMapping {

parcelable SlotPortMapping {

  int physicalSlotId;

  int physicalSlotId;

  int portId;

  int portId;

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

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

// later when a module using the interface is updated, e.g., Mainline modules.





package android.hardware.radio.data;

package android.hardware.radio.data;

@Backing(type="int") @VintfStability

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

enum ApnAuthType {

enum ApnAuthType {

  NO_PAP_NO_CHAP = 0,

  NO_PAP_NO_CHAP = 0,

  PAP_NO_CHAP = 1,

  PAP_NO_CHAP = 1,