Revert "ferrari: ril: Return static radio capability from getRadioCapability"

This reverts commit 18fd45e310794236bc2c1159598e5d1f60123590.

Change-Id: I9f00a132af8c1886303d496ce7037b0f50b1cb63

4 files changed, 1 insertions, 55 deletions

diff --git a/board/qcom-radio.mk b/board/qcom-radio.mk
deleted file mode 100644
index 291dca4..0000000
--- a/board/qcom-radio.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# RIL
-BOARD_RIL_CLASS := ../../../device/xiaomi/ferrari/ril/
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 38d9975..bce1c1c 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -225,11 +225,4 @@
         <item>"/system/framework/arm64/boot.oat"</item>
         <item>"/system/framework/arm64/boot-core-libart.oat"</item>
    </string-array>
-
-   <!-- The RadioAccessFamilies supported by the device.
-        Empty is viewed as "all".  Only used on devices which
-        don't support RIL_REQUEST_GET_RADIO_CAPABILITY
-        format is UMTS|LTE|... -->
-   <string translatable="false" name="config_radio_access_family">GSM | WCDMA | LTE</string>
-
 </resources>
diff --git a/product/qcom-radio.mk b/product/qcom-radio.mk
index 44d5f0a..1ba73a5 100644
--- a/product/qcom-radio.mk
+++ b/product/qcom-radio.mk
@@ -2,8 +2,7 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.radio.multisim.config=dsds \
     rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so \
-    ro.telephony.ril_class=XiaomiRIL \
-    ro.telephony.default_network=9,9
+    ro.telephony.default_network=9,1
 
 # RIL
 ifeq ($(QCPATH),)
diff --git a/ril/com/android/internal/telephony/XiaomiRIL.java b/ril/com/android/internal/telephony/XiaomiRIL.java
deleted file mode 100644
index 3d3056e..0000000
--- a/ril/com/android/internal/telephony/XiaomiRIL.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.internal.telephony;
-
-import static com.android.internal.telephony.RILConstants.*;
-
-import android.content.Context;
-import android.os.AsyncResult;
-import android.os.Message;
-
-public class XiaomiRIL extends RIL implements CommandsInterface {
-    public XiaomiRIL(Context context, int preferredNetworkType, int cdmaSubscription) {
-        super(context, preferredNetworkType, cdmaSubscription, null);
-    }
-
-    public XiaomiRIL(Context context, int preferredNetworkType,
-            int cdmaSubscription, Integer instanceId) {
-        super(context, preferredNetworkType, cdmaSubscription, instanceId);
-    }
-
-    @Override
-    public void getRadioCapability(Message response) {
-        riljLog("getRadioCapability: returning static radio capability");
-        if (response != null) {
-            Object ret = makeStaticRadioCapability();
-            AsyncResult.forMessage(response, ret, null);
-            response.sendToTarget();
-        }
-    }
-}