PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update deprecated code

Browse Source 
Change-Id: I1b128b0f8b654c5c76464c12145d927ec10da26e
This commit is contained in:
Oliver Scott
2024-01-08 14:52:12 -05:00
committed by Michael Bestas
parent 83338c4ae6
commit f58c0f4b83
32 changed files with 268 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/org/lineageos/setupwizard/util/SetupWizardUtils.java
View File

@@ -31,7 +31,6 @@ import static android.telephony.TelephonyManager.SIM_STATE_ABSENT;
import static com.android.internal.telephony.PhoneConstants.LTE_ON_CDMA_TRUE;
import static com.android.internal.telephony.PhoneConstants.LTE_ON_CDMA_UNKNOWN;
import static org.lineageos.setupwizard.SetupWizardApp.KEY_DETECT_CAPTIVE_PORTAL;
import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import android.app.StatusBarManager;
@@ -47,7 +46,7 @@ import android.content.pm.ServiceInfo;
import android.content.res.Resources;
import android.hardware.biometrics.BiometricManager;
import android.net.ConnectivityManager;
import android.os.Binder;
import android.net.NetworkCapabilities;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
@@ -96,14 +95,11 @@ public class SetupWizardUtils {
TelephonyManager tm = context.getSystemService(TelephonyManager.class);
if (tm.isMultiSimEnabled()) {
int subId = SubscriptionManager.getDefaultDataSubscriptionId();
int phoneId = SubscriptionManager.from(context).getPhoneId(subId);
android.provider.Settings.Global.putInt(context.getContentResolver(),
android.provider.Settings.Global.MOBILE_DATA + phoneId, enabled ? 1 : 0);
tm.createForSubscriptionId(subId).setDataEnabled(enabled);
int phoneId = SubscriptionManager.getPhoneId(subId);
tm.createForSubscriptionId(subId).setDataEnabledForReason(
TelephonyManager.DATA_ENABLED_REASON_USER, enabled);
} else {
android.provider.Settings.Global.putInt(context.getContentResolver(),
android.provider.Settings.Global.MOBILE_DATA, enabled ? 1 : 0);
tm.setDataEnabled(enabled);
tm.setDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER, enabled);
}
}
@@ -155,14 +151,6 @@ public class SetupWizardUtils {
return context.getSystemService(UserManager.class).isManagedProfile();
}
public static void disableCaptivePortalDetection(Context context) {
Settings.Global.putInt(context.getContentResolver(), KEY_DETECT_CAPTIVE_PORTAL, 0);
}
public static void enableCaptivePortalDetection(Context context) {
Settings.Global.putInt(context.getContentResolver(), KEY_DETECT_CAPTIVE_PORTAL, 1);
}
public static StatusBarManager disableStatusBar(Context context) {
StatusBarManager statusBarManager = context.getSystemService(StatusBarManager.class);
if (statusBarManager != null) {
@@ -232,9 +220,6 @@ public class SetupWizardUtils {
disableComponent(context, WizardManager.class);
disableHome(context);
context.sendStickyBroadcastAsUser(
new Intent(SetupWizardApp.ACTION_FINISHED),
Binder.getCallingUserHandle());
disableComponentSets(context, GET_RECEIVERS | GET_SERVICES);
}
@@ -245,9 +230,11 @@ public class SetupWizardUtils {
public static boolean isEthernetConnected(Context context) {
ConnectivityManager cm = (ConnectivityManager) context.
getSystemService(Context.CONNECTIVITY_SERVICE);
return (cm.getActiveNetworkInfo() != null &&
cm.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_ETHERNET);
NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
if (networkCapabilities != null) {
return networkCapabilities.hasCapability(NetworkCapabilities.TRANSPORT_ETHERNET);
}
return false;
}
public static boolean hasLeanback(Context context) {