Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df42fa53 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents c041a1eb 3ed0a33e

src/org/lineageos/setupwizard/SetupWizardActivity.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,10 @@ public class SetupWizardActivity extends AppCompatActivity { 
        if (LOGV) {

        if (LOGV) {

            Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState);

            Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState);

        }

        }

        if (SetupWizardUtils.hasLeanback(this) && SetupWizardUtils.hasGMS(this)) {

            finish();

            return;

        }

        SetupWizardUtils.enableComponent(this, WizardManager.class);

        SetupWizardUtils.enableComponent(this, WizardManager.class);

        Intent intent = new Intent(ACTION_LOAD);

        Intent intent = new Intent(ACTION_LOAD);

        if (SetupWizardUtils.isOwner()) {

        if (SetupWizardUtils.isOwner()) {

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

+8 −8
Original line number Original line Diff line number Diff line
@@ -230,14 +230,13 @@ public class SetupWizardUtils { 
        return SystemProperties.getBoolean("config.disable_bluetooth", false);

        return SystemProperties.getBoolean("config.disable_bluetooth", false);

    }

    }





    public static boolean isEthernetConnected(Context context) {

    private static boolean isNetworkConnectedToInternetViaEthernet(Context context) {

        ConnectivityManager cm = (ConnectivityManager) context.

        ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);

                getSystemService(Context.CONNECTIVITY_SERVICE);

        NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());

        NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());

        if (networkCapabilities != null) {

        return networkCapabilities != null &&

            return networkCapabilities.hasCapability(NetworkCapabilities.TRANSPORT_ETHERNET);

                networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) &&

        }

                networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&

        return false;

                networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);

    }

    }





    public static boolean hasLeanback(Context context) {

    public static boolean hasLeanback(Context context) {
@@ -268,7 +267,8 @@ public class SetupWizardUtils { 
        if (!hasTelephony(context) || !simMissing(context)) {

        if (!hasTelephony(context) || !simMissing(context)) {

            disableComponent(context, SimMissingActivity.class);

            disableComponent(context, SimMissingActivity.class);

        }

        }

        if ((!hasWifi(context) && !hasTelephony(context)) || isEthernetConnected(context)) {

        if ((!hasWifi(context) && !hasTelephony(context)) ||

                isNetworkConnectedToInternetViaEthernet(context)) {

            disableComponent(context, NetworkSetupActivity.class);

            disableComponent(context, NetworkSetupActivity.class);

        }

        }

    }

    }