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

Commit 5bd41e57 authored by Mark Chien's avatar Mark Chien Committed by Android (Google) Code Review
Browse files

Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev

parents b50512b6 92b09e82

src/com/android/settings/TetherSettings.java

+0 −20
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.hardware.usb.UsbManager;

import android.net.ConnectivityManager;

import android.net.EthernetManager;
@@ -449,25 +448,6 @@ public class TetherSettings extends RestrictedSettingsFragment 
        }

    }



    public static boolean isProvisioningNeededButUnavailable(Context context) {

        return (TetherUtil.isProvisioningNeeded(context)

                && !isIntentAvailable(context));

    }



    private static boolean isIntentAvailable(Context context) {

        String[] provisionApp = context.getResources().getStringArray(

                com.android.internal.R.array.config_mobile_hotspot_provision_app);

        if (provisionApp.length < 2) {

            return false;

        }

        final PackageManager packageManager = context.getPackageManager();

        Intent intent = new Intent(Intent.ACTION_MAIN);

        intent.setClassName(provisionApp[0], provisionApp[1]);



        return (packageManager.queryIntentActivities(intent,

                PackageManager.MATCH_DEFAULT_ONLY).size() > 0);

    }



    private void startTethering(int choice) {

        if (choice == TETHERING_BLUETOOTH) {

            // Turn on Bluetooth first.

src/com/android/settings/network/AllInOneTetherPreferenceController.java

+0 −12
Original line number Diff line number Diff line
@@ -37,10 +37,8 @@ import androidx.lifecycle.Lifecycle; 
import androidx.lifecycle.Lifecycle.Event;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.TetherSettings;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.FeatureFlags;

import com.android.settings.widget.MasterSwitchController;
@@ -95,16 +93,6 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController 
        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = screen.findPreference(mPreferenceKey);

        if (mPreference != null && !mAdminDisallowedTetherConfig) {

            // Grey out if provisioning is not available.

            mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext));

        }

    }



    @Override

    public int getAvailabilityStatus() {

        if (!TetherUtil.isTetherAvailable(mContext)

src/com/android/settings/network/TetherPreferenceController.java

+0 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.TetherSettings;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.TetherUtil;
@@ -108,9 +107,6 @@ public class TetherPreferenceController extends AbstractPreferenceController imp 
        if (mPreference != null && !mAdminDisallowedTetherConfig) {

            mPreference.setTitle(

                    com.android.settingslib.Utils.getTetheringLabel(mConnectivityManager));



            // Grey out if provisioning is not available.

            mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext));

        }

    }