vs980: remove custom ril classn7.0

Change-Id: I343b8417aa20c07175780d71b5674c58ffecd4e8

4 files changed, 1 insertions, 114 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index fac5178..c4c734d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,6 +21,3 @@ TARGET_KERNEL_CONFIG := cyanogenmod_vs980_defconfig
 TARGET_OTA_ASSERT_DEVICE := vs980,g2,galbi
 
 G2_DTS_TARGET := msm8974-g2-vzw
-
-# RIL
-BOARD_RIL_CLASS += ../../../device/lge/vs980/ril/
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index acc9f27..1550613 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -34,10 +34,4 @@
     <!-- Flag specifying whether VoLTE is available on device -->
     <bool name="config_device_volte_available">true</bool>
 
-    <!-- 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">LTE|CDMA|EVDO</string>
-
 </resources>
diff --git a/ril/telephony/java/com/android/internal/telephony/VS980RIL.java b/ril/telephony/java/com/android/internal/telephony/VS980RIL.java
deleted file mode 100644
index ca04823..0000000
--- a/ril/telephony/java/com/android/internal/telephony/VS980RIL.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2015 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 android.content.Context;
-import android.os.Parcel;
-
-import com.android.internal.telephony.uicc.IccCardApplicationStatus;
-import com.android.internal.telephony.uicc.IccCardStatus;
-
-/**
- * Custom Qualcomm RIL for VS980
- *
- * {@hide}
- */
-public class VS980RIL extends LgeLteRIL implements CommandsInterface {
-    static final String LOG_TAG = "VS980RIL";
-
-    public VS980RIL(Context context, int preferredNetworkType,
-            int cdmaSubscription, Integer instanceId) {
-        super(context, preferredNetworkType, cdmaSubscription, instanceId);
-    }
-
-    public VS980RIL(Context context, int networkMode, int cdmaSubscription) {
-        this(context, networkMode, cdmaSubscription, null);
-    }
-
-    @Override
-    protected Object
-    responseIccCardStatus(Parcel p) {
-        IccCardApplicationStatus appStatus = null;
-
-        IccCardStatus cardStatus = new IccCardStatus();
-        cardStatus.setCardState(p.readInt());
-        cardStatus.setUniversalPinState(p.readInt());
-        cardStatus.mGsmUmtsSubscriptionAppIndex = p.readInt();
-        cardStatus.mCdmaSubscriptionAppIndex = p.readInt();
-        cardStatus.mImsSubscriptionAppIndex = p.readInt();
-
-        int numApplications = p.readInt();
-
-        // limit to maximum allowed applications
-        if (numApplications > IccCardStatus.CARD_MAX_APPS) {
-            numApplications = IccCardStatus.CARD_MAX_APPS;
-        }
-        cardStatus.mApplications = new IccCardApplicationStatus[numApplications];
-
-        for (int i = 0 ; i < numApplications ; i++) {
-            appStatus = new IccCardApplicationStatus();
-            appStatus.app_type       = appStatus.AppTypeFromRILInt(p.readInt());
-            appStatus.app_state      = appStatus.AppStateFromRILInt(p.readInt());
-            appStatus.perso_substate = appStatus.PersoSubstateFromRILInt(p.readInt());
-            appStatus.aid            = p.readString();
-            appStatus.app_label      = p.readString();
-            appStatus.pin1_replaced  = p.readInt();
-            appStatus.pin1           = appStatus.PinStateFromRILInt(p.readInt());
-            appStatus.pin2           = appStatus.PinStateFromRILInt(p.readInt());
-            int remaining_count_pin1 = p.readInt();
-            int remaining_count_puk1 = p.readInt();
-            int remaining_count_pin2 = p.readInt();
-            int remaining_count_puk2 = p.readInt();
-            cardStatus.mApplications[i] = appStatus;
-        }
-
-        return cardStatus;
-    }
-}
diff --git a/system.prop b/system.prop
index 9153a63..6242f40 100644
--- a/system.prop
+++ b/system.prop
@@ -3,33 +3,10 @@
 #
 
 # RIL
-rild.libargs=-d /dev/smd0
 ro.telephony.get_imsi_from_sim=true
-persist.rild.nitz_plmn=
-persist.rild.nitz_long_ons_0=
-persist.rild.nitz_long_ons_1=
-persist.rild.nitz_long_ons_2=
-persist.rild.nitz_long_ons_3=
-persist.rild.nitz_short_ons_0=
-persist.rild.nitz_short_ons_1=
-persist.rild.nitz_short_ons_2=
-persist.rild.nitz_short_ons_3=
 telephony.lteOnCdmaDevice=1
 ril.subscription.types=NV,RUIM
 ro.telephony.default_cdma_sub=0
 ro.telephony.default_network=10
-ro.cdma.homesystem=66,67,69,71,72,74
-ro.cdma.subscribe_on_ruim_ready=true
-ro.ril.svdo=true
-persist.data_netmgrd_mtu=1428 
-persist.qcril.disable_retry=true 
-android.telephony.apn-restore=1800000 
-vzw.telephony.appsapn-restore=60000
-persist.radio.snapshot_enabled=1
-persist.radio.snapshot_timer=22
-persist.radio.add_power_save=1
-DEVICE_PROVISIONED=1
-ro.cdma.homesystem=64,65,76,77,78,79,80,81,82,83
 ro.ril.force_eri_from_xml=true
-ro.telephony.get_imsi_from_sim=true
-ro.telephony.ril_class=VS980RIL
+ro.telephony.get_imsi_from_sim=true
\ No newline at end of file