Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from topics "multiband", "ssc3"

Browse Source 
am: 39ddbb92a5

Change-Id: I823e0109eefff2541fe03987eadb293ba08b958c
This commit is contained in:
Sarah Chin
2020-01-29 08:58:15 -08:00
committed by android-build-merger
parent 10a7dfb190 39ddbb92a5
commit a4021bde11
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
current.txt
View File

@@ -642,7 +642,7 @@ c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardwar
##
# BEGIN Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present
##
1061eb4a78cb3e0aacec075fc7811e2ac884a98e0d9e3cb3b775174c6953033c android.hardware.radio@1.5::types
2fc83babe7cd7c6d5f1013f84019d761d2ac0eb38bdade7f9b01f5dc577de8f8 android.hardware.radio@1.5::types
603851ca0f5360778049902fc7486d0ff60065b16e83b99f076487667aba1928 android.hardware.radio@1.5::IRadio
e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication
04cce8fdae2b03becda4ee6fe17cb032fd7d30152f8ab36f642d794e4f5f6999 android.hardware.radio@1.5::IRadioResponse

16
radio/1.5/types.hal
View File

@@ -424,16 +424,20 @@ struct LinkAddress {
bitfield<AddressProperty> properties;
/**
* The UTC time that this link address will be deprecated. 0 indicates this information is not
* available.
* The time, as reported by SystemClock.elapsedRealtime(), when this link address will be or
* was deprecated. -1 indicates this information is not available. At the time existing
* connections can still use this address until it expires, but new connections should use the
* new address. LONG_MAX(0x7FFFFFFFFFFFFFFF) indicates this link address will never be
* deprecated.
*/
uint64_t deprecatedTime;
uint64_t deprecationTime;
/**
* The UTC time that this link address will expire and no longer valid. 0 indicates this
* information is not available.
* The time, as reported by SystemClock.elapsedRealtime(), when this link address will expire
* and be removed from the interface. -1 indicates this information is not available.
* LONG_MAX(0x7FFFFFFFFFFFFFFF) indicates this link address will never expire.
*/
uint64_t expiredTime;
uint64_t expirationTime;
};
/**