commit 9af336425e2172a9639480a5399ad0e55e3f43c1
author Pankaj Kanwar <pkanwar@google.com> Thu Apr 27 17:41:56 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 27 17:41:58 2017 +0000
tree 8a3b03d13cb2e2981d4ba35c86a180f9a0b9b31c
parent 092daf7fea76954110fe41468e87faf20a103d97
parent de1ac79c1482b36c1f3e731de77ce0d193759df1

Merge "RIL changes to allow the modem to query the framework for the key."

boot/1.0/default/android.hardware.boot@1.0-service.rc

diff --git a/boot/1.0/default/android.hardware.boot@1.0-service.rc b/boot/1.0/default/android.hardware.boot@1.0-service.rc
index ef5dd91b..68e7c22 100644
--- a/boot/1.0/default/android.hardware.boot@1.0-service.rc
+++ b/boot/1.0/default/android.hardware.boot@1.0-service.rc
@@ -1,4 +1,4 @@
 service boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service
-    class hal
+    class early_hal
     user root
     group root

radio/1.0/IRadioResponse.hal

diff --git a/radio/1.0/IRadioResponse.hal b/radio/1.0/IRadioResponse.hal
index 2ba210b..fdb5c4e 100644
--- a/radio/1.0/IRadioResponse.hal
+++ b/radio/1.0/IRadioResponse.hal
@@ -1811,7 +1811,6 @@
      *   RadioError:NONE
      *   RadioError:RADIO_NOT_AVAILABLE
      *   RadioError:REQUEST_NOT_SUPPORTED
-     *   RadioError:SIM_ABSENT
      *   RadioError:INVALID_ARGUMENTS
      */
     oneway setSimCardPowerResponse(RadioResponseInfo info);

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
index 2e0a10f..5515b8d 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
@@ -787,6 +787,7 @@
   EXPECT_EQ(serial, radioRsp->rspInfo.serial);
 
   if (cardStatus.cardState == CardState::ABSENT) {
-    ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
+      ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
+                  radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
   }
 }
\ No newline at end of file