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

Commit e8b22c1d authored by Devin Moore's avatar Devin Moore
Browse files

Add changes to Radio V1 AIDL interfaces 

During the API freeze some of the sub-interfaces of radio were frozen
without the latest change adding "@Javaderive(toString=true)".
Instead of creating V2 with these changes, we are updating V1 to include
these changes instead. The change will not break anyone downstream, and
any devices built with the previous V1 will continue to work. The hashes
of the original V1 interfaces are still included in the .hash files, so
VTS will allow both.

Steps taken:
m android.hardware.radio.config-freeze-api
rm aidl_api/android.hardware.radio.config/2/.hash
cp -r aidl_api/android.hardware.radio.config/2/*
    aidl_api/android.hardware.radio.config/1/
rm -rf aidl_api/android.hardware.radio.config/2/
vim Android.bp # remove the newly created version 2
system/tools/aidl/build/hash_gen.sh aidl_api/android.hardware.radio.config/1/
    latest-version aidl_api/android.hardware.radio.config/1/.hash

Test: atest hal_implementation_test
Bug: 225941299
Change-Id: Id14cfffd326bd664acb678f15f4129d85ce251b2
Merged-In: Id14cfffd326bd664acb678f15f4129d85ce251b2
parent 1dd0d22f

radio/aidl/aidl_api/android.hardware.radio.config/1/.hash

+1 −0
Original line number Diff line number Diff line 
6e0b1fb58d66a76df8f46a1a6dae5c346ea17d7b

dd9c3f8e21930f9b4c46a4125bd5f5cec90318ec

radio/aidl/aidl_api/android.hardware.radio.config/1/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/1/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/1/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/1/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;