commit af09f9de949d58f2d6eb6b0d8707a59ff64f6cfc
author Sarah Chin <sarahchin@google.com> Tue Feb 18 20:46:04 2020 +0000
committer Sarah Chin <sarahchin@google.com> Wed Feb 19 12:08:30 2020 -0800
tree e92160e0065d5122387ac28e1b46c3877a9d20da
parent 44f9c690fa3639f05a1026c5145ef83e685ed382

Revert "Update PhoneCapability to use 1.5 UTRAN bands"

Revert "PhoneCapability cleanup"

Revert "Test PhoneCapability API"

Revert "PhoneCapability cleanup"

Revert submission 10153355-dev_cap

Reason for revert: Change not supported by modem
Reverted Changes:
Id86ad81d8: Update PhoneCapability to use 1.5 UTRAN bands
Ia44398852: Test PhoneCapability API
I2510de0ab: PhoneCapability cleanup
I29dfb51bf: PhoneCapability cleanup

Change-Id: Ief5c5325f51a9bb3921bd2eb6e0ea8c9e7111581

current.txt

diff --git a/current.txt b/current.txt
index 8d14fa3..bc97519 100644
--- a/current.txt
+++ b/current.txt
@@ -691,7 +691,7 @@
 7fefa2cc5b3b3be10b5cff5c5dc195385f491d4bf23ca65f9c6b3c30c8753a33 android.hardware.radio@1.5::IRadio
 e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication
 829d3827eeb5a8f563e80fe627419b3231012fc02bc2e79782ec5e9ad9f799a4 android.hardware.radio@1.5::IRadioResponse
-dcc8872337f0135e81970e1d8d5fd7139160dc80e9be76f0ae05290fa7e472b8 android.hardware.radio.config@1.3::types
+4c4ce691df02faa28c0729e2a033ec464e1d72699be8bcde4dfb141313dbeba8 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

radio/config/1.3/types.hal

diff --git a/radio/config/1.3/types.hal b/radio/config/1.3/types.hal
index aef0ff8..7acc6c1 100644
--- a/radio/config/1.3/types.hal
+++ b/radio/config/1.3/types.hal
@@ -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 {