commit caee79f17466dd7510dcb405296342cccc0cc5c8
author Nathan Harold <nharold@google.com> Thu Jan 16 17:00:49 2020 -0800
committer Sarah Chin <sarahchin@google.com> Sat Jan 25 00:39:23 2020 -0800
tree a7a4a430d843941f0ef841ad662c7d7d603c5046
parent e1d1b0b92c4f91ce6bf4259bae93eb7c48e3ae05

Add Support for RPLMN to Voice and Data RegState

-Define RegistrationFailCause as an enum
-Combine voice and data reg state into a single struct
-Define a safe-union for AN-specific registration info

Bug: 73629308
Test: make && make VtsHalRadioV1_5TargetTest
      && make cf_x86_64_phone-userdebug

Change-Id: I43df3cffd4c55f2c5df8eaf0235772e5930dced5
Merged-In: I43df3cffd4c55f2c5df8eaf0235772e5930dced5

current.txt

diff --git a/current.txt b/current.txt
index 4f389f6..f106c1c 100644
--- a/current.txt
+++ b/current.txt
@@ -635,10 +635,10 @@
 ##
 # BEGIN Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present
 ##
-4433da27d889fb293ec95c831a65d284803949870f061f1314fd2f9f935e6319 android.hardware.radio@1.5::types
-7a0a3382cca78d13a55e856b14b7fb025987f52c2adeab5747cd584391cd3cc7 android.hardware.radio@1.5::IRadio
+bbed8ec4b3e9bb419b61d3fe53ec2d7def943378d1de8eaa02d79b17b0838136 android.hardware.radio@1.5::types
+603851ca0f5360778049902fc7486d0ff60065b16e83b99f076487667aba1928 android.hardware.radio@1.5::IRadio
 20d52e66fd548f89bcb98cda42749a591ce8f439a2a7148617adac0c967ad937 android.hardware.radio@1.5::IRadioIndication
-c7b4a0debd3bb8815a463d11194487c7eef81bca584f558d7ba74c34b18d7e3f android.hardware.radio@1.5::IRadioResponse
+afa9ba21fbf130e5cd6463b01ee34175a60220cdc8b657443e683494e6deca8d android.hardware.radio@1.5::IRadioResponse
 5971a891d7d8843e9fb9f44583a9a0a265ec42fd5e4e1c95c9803454d21fabf7 android.hardware.radio.config@1.3::types
 a2977755bc5f1ef47f04b7f2400632efda6218e1515dba847da487145cfabc4f android.hardware.radio.config@1.3::IRadioConfig
 742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication