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

Commit 485dad0f authored by Nishith Khanna's avatar Nishith Khanna
Browse files

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

parents 49be7cfa 3ba6626a

src/org/lineageos/setupwizard/BluetoothSetupActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
package org.lineageos.setupwizard;



import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;

import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;



import android.content.Intent;

import android.util.Log;
@@ -26,6 +27,10 @@ public class BluetoothSetupActivity extends SubBaseActivity { 


    @Override

    protected void onStartSubactivity() {

        if (!SetupWizardUtils.hasLeanback(this) || SetupWizardUtils.isBluetoothDisabled()) {

            finishAction(RESULT_SKIP);

            return;

        }

        try {

            Intent intent = new Intent(ACTION_CONNECT_INPUT);

            intent.putExtra(INTENT_EXTRA_NO_INPUT_MODE, true);

src/org/lineageos/setupwizard/NetworkSetupActivity.java

+7 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 


package org.lineageos.setupwizard;



import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;



import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ENABLE_NEXT_ON_CONNECT;

import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SET_BACK_TEXT;

import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_BUTTON_BAR;
@@ -23,6 +25,11 @@ public class NetworkSetupActivity extends SubBaseActivity { 


    @Override

    protected void onStartSubactivity() {

        if ((!SetupWizardUtils.hasWifi(this) && !SetupWizardUtils.hasTelephony(this)) ||

                SetupWizardUtils.isNetworkConnectedToInternetViaEthernet(this)) {

            finishAction(RESULT_SKIP);

            return;

        }

        if (SetupWizardUtils.isOwner()) {

            tryEnablingWifi();

        }

src/org/lineageos/setupwizard/SetupWizardApp.java

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public class SetupWizardApp extends Application { 
        if (LOGV) {

            Log.v(TAG, "onCreate()");

        }

        SetupWizardUtils.disableComponentsForMissingFeatures(this);

        sStatusBarManager = SetupWizardUtils.disableStatusBar(this);

        mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);

        if (SetupWizardUtils.hasGMS(this)) {

src/org/lineageos/setupwizard/SimMissingActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
package org.lineageos.setupwizard;



import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;

import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;



import android.content.Intent;
@@ -19,8 +20,8 @@ import org.lineageos.setupwizard.util.SetupWizardUtils; 
public class SimMissingActivity extends SubBaseActivity {



    protected void onStartSubactivity() {

        if (!SetupWizardUtils.simMissing(this)) {

            nextAction(RESULT_OK);

        if (!SetupWizardUtils.simMissing(this) || !SetupWizardUtils.hasTelephony(this)) {

            finishAction(RESULT_SKIP);

            return;

        }

        getGlifLayout().setDescriptionText(getString(R.string.sim_missing_summary));

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

+1 −17
Original line number Diff line number Diff line
@@ -51,10 +51,7 @@ import android.telephony.TelephonyManager; 
import android.util.Log;



import org.lineageos.setupwizard.BaseSetupWizardActivity;

import org.lineageos.setupwizard.BluetoothSetupActivity;

import org.lineageos.setupwizard.NetworkSetupActivity;

import org.lineageos.setupwizard.SetupWizardApp;

import org.lineageos.setupwizard.SimMissingActivity;



import java.io.File;

import java.util.List;
@@ -209,7 +206,7 @@ public class SetupWizardUtils { 
        return SystemProperties.getBoolean("config.disable_bluetooth", false);

    }



    private static boolean isNetworkConnectedToInternetViaEthernet(Context context) {

    public static boolean isNetworkConnectedToInternetViaEthernet(Context context) {

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

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

        return networkCapabilities != null &&
@@ -234,19 +231,6 @@ public class SetupWizardUtils { 
        };

    }



    public static void disableComponentsForMissingFeatures(Context context) {

        if (!hasLeanback(context) || isBluetoothDisabled()) {

            disableComponent(context, BluetoothSetupActivity.class);

        }

        if (!hasTelephony(context)) {

            disableComponent(context, SimMissingActivity.class);

        }

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

                isNetworkConnectedToInternetViaEthernet(context)) {

            disableComponent(context, NetworkSetupActivity.class);

        }

    }



    /**

     * Disable the Home component, which is presumably SetupWizardActivity at this time.

     */