mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
529b47039c
- Functionality tested on mako and klte - In-place upgrade from 17.1 tested working on klte - Compile tested on bacon and klte - Recovery OTA key patch missing, unsure if still needed. - Deblobber needs support for removing vintf manifest paths from vendor Android.bp - Launcher needs more default_workspace grid variants (eg. 4x5)
56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
From a2f309bdb5de824d9c86337101656b47ff4ae0ff Mon Sep 17 00:00:00 2001
|
|
From: Tad <tad@spotco.us>
|
|
Date: Tue, 14 Apr 2020 16:59:46 -0400
|
|
Subject: [PATCH] Fix calling after VoLTE is removed from devices that had it
|
|
previously enabled
|
|
|
|
Change-Id: I34cc1b7786446927751950386ebe729b43fa53f1
|
|
---
|
|
src/java/com/android/ims/ImsManager.java | 23 +----------------------
|
|
1 file changed, 1 insertion(+), 22 deletions(-)
|
|
|
|
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
|
|
index 9a436c3..270c40c 100644
|
|
--- a/src/java/com/android/ims/ImsManager.java
|
|
+++ b/src/java/com/android/ims/ImsManager.java
|
|
@@ -303,13 +303,6 @@ public class ImsManager implements IFeatureConnector {
|
|
*/
|
|
@UnsupportedAppUsage
|
|
public static boolean isEnhanced4gLteModeSettingEnabledByUser(Context context) {
|
|
- ImsManager mgr = ImsManager.getInstance(context,
|
|
- SubscriptionManager.getDefaultVoicePhoneId());
|
|
- if (mgr != null) {
|
|
- return mgr.isEnhanced4gLteModeSettingEnabledByUser();
|
|
- }
|
|
- Rlog.e(TAG, "isEnhanced4gLteModeSettingEnabledByUser: ImsManager null, returning default"
|
|
- + " value.");
|
|
return false;
|
|
}
|
|
|
|
@@ -324,21 +317,7 @@ public class ImsManager implements IFeatureConnector {
|
|
* return the default value.
|
|
*/
|
|
public boolean isEnhanced4gLteModeSettingEnabledByUser() {
|
|
- int setting = SubscriptionManager.getIntegerSubscriptionProperty(
|
|
- getSubId(), SubscriptionManager.ENHANCED_4G_MODE_ENABLED,
|
|
- SUB_PROPERTY_NOT_INITIALIZED, mContext);
|
|
- boolean onByDefault = getBooleanCarrierConfig(
|
|
- CarrierConfigManager.KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL);
|
|
-
|
|
- // If Enhanced 4G LTE Mode is uneditable, hidden or not initialized, we use the default
|
|
- // value
|
|
- if (!getBooleanCarrierConfig(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL)
|
|
- || getBooleanCarrierConfig(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)
|
|
- || setting == SUB_PROPERTY_NOT_INITIALIZED) {
|
|
- return onByDefault;
|
|
- } else {
|
|
- return (setting == ProvisioningManager.PROVISIONING_VALUE_ENABLED);
|
|
- }
|
|
+ return false;
|
|
}
|
|
|
|
/**
|
|
--
|
|
2.30.2
|
|
|