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

Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev

Browse Source
This commit is contained in:
Mark Chien
2020-06-17 02:29:35 +00:00
committed by Android (Google) Code Review
parent b50512b69a 92b09e825f
commit 5bd41e573b
3 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/TetherSettings.java
View File

@@ -29,7 +29,6 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.hardware.usb.UsbManager; import android.hardware.usb.UsbManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.EthernetManager; 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) { private void startTethering(int choice) {
if (choice == TETHERING_BLUETOOTH) { if (choice == TETHERING_BLUETOOTH) {
// Turn on Bluetooth first. // Turn on Bluetooth first.

12
src/com/android/settings/network/AllInOneTetherPreferenceController.java
View File

@@ -37,10 +37,8 @@ import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Lifecycle.Event; import androidx.lifecycle.Lifecycle.Event;
import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.TetherSettings;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.FeatureFlags; import com.android.settings.core.FeatureFlags;
import com.android.settings.widget.MasterSwitchController; import com.android.settings.widget.MasterSwitchController;
@@ -95,16 +93,6 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); 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 @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!TetherUtil.isTetherAvailable(mContext) if (!TetherUtil.isTetherAvailable(mContext)

4
src/com/android/settings/network/TetherPreferenceController.java
View File

@@ -40,7 +40,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.TetherSettings;
import com.android.settings.core.FeatureFlags; import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.TetherUtil; import com.android.settingslib.TetherUtil;
@@ -108,9 +107,6 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
if (mPreference != null && !mAdminDisallowedTetherConfig) { if (mPreference != null && !mAdminDisallowedTetherConfig) {
mPreference.setTitle( mPreference.setTitle(
com.android.settingslib.Utils.getTetheringLabel(mConnectivityManager)); com.android.settingslib.Utils.getTetheringLabel(mConnectivityManager));
// Grey out if provisioning is not available.
mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext));
} }
} }