Merge changes from topics "caps_refactor", "multi-plmn", "nr_band", "v6mtu"

am: d8c60800ae

Change-Id: I7ac6128e347cd9e1ecf74ca9b60e6352d3876ca3
This commit is contained in:
Sarah Chin
2020-01-29 08:14:16 -08:00
committed by android-build-merger
2 changed files with 2 additions and 2 deletions

View File

@@ -646,7 +646,7 @@ c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardwar
603851ca0f5360778049902fc7486d0ff60065b16e83b99f076487667aba1928 android.hardware.radio@1.5::IRadio
e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication
04cce8fdae2b03becda4ee6fe17cb032fd7d30152f8ab36f642d794e4f5f6999 android.hardware.radio@1.5::IRadioResponse
5971a891d7d8843e9fb9f44583a9a0a265ec42fd5e4e1c95c9803454d21fabf7 android.hardware.radio.config@1.3::types
2fd107f3de1b7e36825e241a88dfae8edf3a77c166cb746f00ddf6440ab78db1 android.hardware.radio.config@1.3::types
a2977755bc5f1ef47f04b7f2400632efda6218e1515dba847da487145cfabc4f android.hardware.radio.config@1.3::IRadioConfig
742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication
0006ab8e8b0910cbd3bbb08d5f17d5fac7d65a2bdad5f2334e4851db9d1e6fa8 android.hardware.radio.config@1.3::IRadioConfigResponse

View File

@@ -17,10 +17,10 @@
package android.hardware.radio.config@1.3;
import android.hardware.radio@1.1::GeranBands;
import android.hardware.radio@1.1::UtranBands;
import android.hardware.radio@1.1::EutranBands;
import android.hardware.radio@1.4::RadioAccessFamily;
import android.hardware.radio@1.5::NgranBands;
import android.hardware.radio@1.5::UtranBands;
/** Type for the SIM slot. */
enum SlotType : int32_t {