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

Commit 225debfd authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

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

parents 50941ef5 0d0dc1e2
Loading
Loading
Loading
Loading
+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;
+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;
+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;
+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;
+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,
Loading