aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKasual <mushroomhead52e@gmail.com>2017-03-01 21:48:55 +0300
committerKasual <mushroomhead52e@gmail.com>2017-03-01 21:48:55 +0300
commite96c22c3854f6c19705ec7f2bb83f716b6ec5237 (patch)
tree63708611e949754419810a9d0d0ce181b9343a86
parent3b5b5bd839c35bbd9d7e8b1ac0c5f8350b9bf92e (diff)
ls990: ril cleanup
remove custom ril since we are on to bigger and better things Change-Id: I93909d8cb7f91378ef2b8520b712e1c78db0cb70
-rw-r--r--BoardConfig.mk3
-rw-r--r--ril/telephony/java/com/android/internal/telephony/LS990RIL.java118
2 files changed, 0 insertions, 121 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index d1c5467..70eb0ce 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -41,9 +41,6 @@ TARGET_USERIMAGES_USE_F2FS := true
TARGET_RECOVERY_FSTAB := device/lge/ls990/rootdir/etc/fstab.g3
# RIL
-#BOARD_RIL_CLASS += ../../../device/lge/ls990/ril/
-
-# RIL
BOARD_GLOBAL_CFLAGS += -DUSE_RIL_VERSION_10
BOARD_GLOBAL_CPPFLAGS += -DUSE_RIL_VERSION_10
TARGET_RIL_VARIANT := caf
diff --git a/ril/telephony/java/com/android/internal/telephony/LS990RIL.java b/ril/telephony/java/com/android/internal/telephony/LS990RIL.java
deleted file mode 100644
index e7cb08e..0000000
--- a/ril/telephony/java/com/android/internal/telephony/LS990RIL.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2014 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;
-import android.os.Parcel;
-import android.os.SystemProperties;
-import android.util.Log;
-
-import com.android.internal.telephony.RILConstants;
-
-import com.android.internal.telephony.uicc.IccCardApplicationStatus;
-import com.android.internal.telephony.uicc.IccCardStatus;
-
-/**
- * Custom Qualcomm RIL for LS990
- *
- * {@hide}
- */
-public class LS990RIL extends LgeLteRIL implements CommandsInterface {
- static final String LOG_TAG = "LS990RIL";
-
- public LS990RIL(Context context, int preferredNetworkType,
- int cdmaSubscription, Integer instanceId) {
- super(context, preferredNetworkType, cdmaSubscription, instanceId);
- }
-
- public LS990RIL(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;
- }
-}