commit 75ae21f7ac2081628f24fb8ee23cc35a49cdf726
author Toufu <hamm157famm7423@gmail.com> Sun Dec 28 02:52:59 2025 +0900
committer Toufu <hamm157famm7423@gmail.com> Sun Dec 28 02:52:59 2025 +0900
tree 0568fe72fadd175250553121c934324f0e75ebf2
parent 6d90b680c9653a139190e37219d9e9e1d63cedf2
parent 0e2582c422629e29fcab3f501720788331a3a815

Merge remote-tracking branch 'github/lineage-23.1' into 16.0

Change-Id: I1f43555dc843529dacc295899ceb7b97920a3aa0

Android.bp

diff --git a/Android.bp b/Android.bp
index 18f8fdd..35e8533 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+// SPDX-FileCopyrightText: 2021-2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
@@ -10,6 +10,7 @@
 
     certificate: "platform",
     privileged: true,
+    privapp_allowlist: "org.lineageos.setupwizard.xml",
     system_ext_specific: true,
     platform_apis: true,
 
@@ -29,14 +30,4 @@
     ],
 
     libs: ["telephony-common"],
-
-    required: ["privapp_whitelist_org.lineageos.setupwizard"],
-}
-
-prebuilt_etc {
-    name: "privapp_whitelist_org.lineageos.setupwizard",
-    system_ext_specific: true,
-    src: "privapp_whitelist_org.lineageos.setupwizard.xml",
-    sub_dir: "permissions",
-    filename_from_src: true,
 }

org.lineageos.setupwizard.xml

diff --git a/privapp_whitelist_org.lineageos.setupwizard.xml b/org.lineageos.setupwizard.xml
similarity index 100%
rename from privapp_whitelist_org.lineageos.setupwizard.xml
rename to org.lineageos.setupwizard.xml

src/org/lineageos/setupwizard/util/SetupWizardUtils.java

diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index bd251ce..d1481d5 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -1,6 +1,6 @@
 /*
  * SPDX-FileCopyrightText: 2013 The CyanogenMod Project
- * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2017-2025 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -13,9 +13,6 @@
 import static android.content.pm.PackageManager.GET_ACTIVITIES;
 import static android.telephony.TelephonyManager.PHONE_TYPE_GSM;
 
-import static com.android.internal.telephony.PhoneConstants.LTE_ON_CDMA_TRUE;
-import static com.android.internal.telephony.PhoneConstants.LTE_ON_CDMA_UNKNOWN;
-
 import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;
 
 import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
@@ -44,7 +41,6 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.sysprop.TelephonyProperties;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -347,7 +343,7 @@
                 if (simState != -1) {
                     final int subId = sub.getSubscriptionId();
                     final TelephonyManager subTm = tm.createForSubscriptionId(subId);
-                    if (isGSM(subTm) || isLteOnCdma(subTm, subId)) {
+                    if (subTm.getCurrentPhoneType() == PHONE_TYPE_GSM) {
                         return false;
                     }
                 }
@@ -355,17 +351,4 @@
         }
         return true;
     }
-
-    private static boolean isGSM(TelephonyManager subTelephonyManager) {
-        return subTelephonyManager.getCurrentPhoneType() == PHONE_TYPE_GSM;
-    }
-
-    private static boolean isLteOnCdma(TelephonyManager subTelephonyManager, int subId) {
-        final int lteOnCdmaMode = subTelephonyManager.getLteOnCdmaMode(subId);
-        if (lteOnCdmaMode == LTE_ON_CDMA_UNKNOWN) {
-            return TelephonyProperties.lte_on_cdma_device().orElse(LTE_ON_CDMA_UNKNOWN)
-                    == LTE_ON_CDMA_TRUE;
-        }
-        return lteOnCdmaMode == LTE_ON_CDMA_TRUE;
-    }
 }