commit cea643260186fd22e9b803bba9079fe473ac6861
author Jayachandran Chinnakkannu <jayachandranc@google.com> Mon May 01 16:33:28 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 01 16:33:29 2017 +0000
tree 8cc7b01828ed73e3f608d26409619b56cb5ddf64
parent e1bdb3ff16b9dce7045ce8e7566b2a975a094286
parent 32763f0409cb5fc798fb81f7081570250c69d617

Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG"

libril/ril_service.cpp

diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index b71f83a..0bdb10d 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -2184,10 +2184,28 @@
 }
 
 Return<void> RadioImpl::nvResetConfig(int32_t serial, ResetNvType resetType) {
+    int rilResetType = -1;
 #if VDBG
     RLOGD("nvResetConfig: serial %d", serial);
 #endif
-    dispatchInts(serial, mSlotId, RIL_REQUEST_NV_RESET_CONFIG, 1, (int) resetType);
+    /* Convert ResetNvType to RIL.h values
+     * RIL_REQUEST_NV_RESET_CONFIG
+     * 1 - reload all NV items
+     * 2 - erase NV reset (SCRTN)
+     * 3 - factory reset (RTN)
+     */
+    switch(resetType) {
+      case ResetNvType::RELOAD:
+        rilResetType = 1;
+        break;
+      case ResetNvType::ERASE:
+        rilResetType = 2;
+        break;
+      case ResetNvType::FACTORY_RESET:
+        rilResetType = 3;
+        break;
+    }
+    dispatchInts(serial, mSlotId, RIL_REQUEST_NV_RESET_CONFIG, 1, rilResetType);
     return Void();
 }