ls980: remove custom ril classn7.0

Change-Id: I6de5aff3056536a7bca02ca505423c5a383ef108

3 files changed, 0 insertions, 114 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 40170c3..685b0bb 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,6 +21,3 @@ TARGET_KERNEL_CONFIG := cyanogenmod_ls980_defconfig
 TARGET_OTA_ASSERT_DEVICE := ls980,g2,galbi
 
 G2_DTS_TARGET := msm8974-g2-spr
-
-# RIL
-BOARD_RIL_CLASS += ../../../device/lge/ls980/ril/
diff --git a/ril/telephony/java/com/android/internal/telephony/LS980RIL.java b/ril/telephony/java/com/android/internal/telephony/LS980RIL.java
deleted file mode 100644
index 4c50534..0000000
--- a/ril/telephony/java/com/android/internal/telephony/LS980RIL.java
+++ /dev/null
@@ -1,110 +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 LS980
- *
- * {@hide}
- */
-public class LS980RIL extends LgeLteRIL implements CommandsInterface {
-    static final String LOG_TAG = "LS980RIL";
-
-    public LS980RIL(Context context, int preferredNetworkType,
-            int cdmaSubscription, Integer instanceId) {
-        super(context, preferredNetworkType, cdmaSubscription, instanceId);
-    }
-
-    public LS980RIL(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;
-        }
-
-        if (numApplications == 1 && appStatus != null
-                && appStatus.app_type == appStatus.AppTypeFromRILInt(2)) {
-            cardStatus.mApplications = new IccCardApplicationStatus[numApplications + 2];
-            cardStatus.mGsmUmtsSubscriptionAppIndex = 0;
-            cardStatus.mApplications[cardStatus.mGsmUmtsSubscriptionAppIndex] = appStatus;
-            cardStatus.mCdmaSubscriptionAppIndex = 1;
-            cardStatus.mImsSubscriptionAppIndex = 2;
-            IccCardApplicationStatus appStatus2 = new IccCardApplicationStatus();
-            appStatus2.app_type       = appStatus2.AppTypeFromRILInt(4); // CSIM State
-            appStatus2.app_state      = appStatus.app_state;
-            appStatus2.perso_substate = appStatus.perso_substate;
-            appStatus2.aid            = appStatus.aid;
-            appStatus2.app_label      = appStatus.app_label;
-            appStatus2.pin1_replaced  = appStatus.pin1_replaced;
-            appStatus2.pin1           = appStatus.pin1;
-            appStatus2.pin2           = appStatus.pin2;
-            cardStatus.mApplications[cardStatus.mCdmaSubscriptionAppIndex] = appStatus2;
-            IccCardApplicationStatus appStatus3 = new IccCardApplicationStatus();
-            appStatus3.app_type       = appStatus3.AppTypeFromRILInt(5); // IMS State
-            appStatus3.app_state      = appStatus.app_state;
-            appStatus3.perso_substate = appStatus.perso_substate;
-            appStatus3.aid            = appStatus.aid;
-            appStatus3.app_label      = appStatus.app_label;
-            appStatus3.pin1_replaced  = appStatus.pin1_replaced;
-            appStatus3.pin1           = appStatus.pin1;
-            appStatus3.pin2           = appStatus.pin2;
-            cardStatus.mApplications[cardStatus.mImsSubscriptionAppIndex] = appStatus3;
-        }
-
-        return cardStatus;
-    }
-}
diff --git a/system.prop b/system.prop
index 9348e33..f5950e8 100644
--- a/system.prop
+++ b/system.prop
@@ -15,4 +15,3 @@ persist.radio.no_wait_for_card=1
 keyguard.no_require_sim=true
 telephony.sms.pseudo_multipart=1
 DEVICE_PROVISIONED=1
-ro.telephony.ril_class=LS980RIL