From 018d6a93033b27f39da0ad4da433a75e10145807 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Sun, 25 Dec 2016 04:19:00 +0100
Subject: Revert "msm8916-common: ril: Return static radio capability from
 getRadioCapability"

This reverts commit 554d583d9e027149fc1d9dac3e41859c4082b0b8.

Change-Id: Ifb6d29af5f8cd94335114b51e4b908102e91772e

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml
---
 BoardConfigCommon.mk                               |  1 -
 .../frameworks/base/core/res/res/values/config.xml |  6 ---
 .../android/internal/telephony/Asus8916RIL.java    | 44 ----------------------
 system.prop                                        |  1 -
 4 files changed, 52 deletions(-)
 delete mode 100644 ril/com/android/internal/telephony/Asus8916RIL.java

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index de46275..d35423f 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -160,7 +160,6 @@ TARGET_RELEASETOOLS_EXTENSIONS := $(VENDOR_PATH)/releasetools
 
 # RIL
 TARGET_RIL_VARIANT := caf
-BOARD_RIL_CLASS := ../../../$(VENDOR_PATH)/ril/
 
 # Wifi
 BOARD_HAS_QCOM_WLAN := true
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2b72072..79350f9 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -384,12 +384,6 @@
     -->
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">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">GSM | WCDMA | LTE</string>
-
     <!-- Default list of files pinned by the Pinner Service -->
     <string-array translatable="false" name="config_defaultPinnerServiceFiles">
         <item>"/system/framework/arm64/boot-framework.oat"</item>
diff --git a/ril/com/android/internal/telephony/Asus8916RIL.java b/ril/com/android/internal/telephony/Asus8916RIL.java
deleted file mode 100644
index 7b628f0..0000000
--- a/ril/com/android/internal/telephony/Asus8916RIL.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 Asus8916RIL extends RIL implements CommandsInterface {
-    public Asus8916RIL(Context context, int preferredNetworkType, int cdmaSubscription) {
-        super(context, preferredNetworkType, cdmaSubscription, null);
-    }
-
-    public Asus8916RIL(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();
-        }
-    }
-}
diff --git a/system.prop b/system.prop
index 43430af..e1c63ec 100644
--- a/system.prop
+++ b/system.prop
@@ -87,7 +87,6 @@ rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
 ril.subscription.types=NV,RUIM
 ro.telephony.call_ring.multiple=false
 ro.telephony.default_network=9,9
-ro.telephony.ril_class=Asus8916RIL
 
 # Storage
 ro.sys.sdcardfs=true
-- 
cgit v1.2.3