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

Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-21 08:19:13 +00:00
committed by Android (Google) Code Review
parent 2f4ae2a0e4 aeb6200bfe
commit d4a4fead67
9 changed files with 454 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/com/android/settings/network/CarrierWifiTogglePreferenceController.java Normal file
View File

@@ -0,0 +1,134 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network;
import android.content.Context;
import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.wifi.WifiPickerTrackerHelper;
import com.android.wifitrackerlib.WifiPickerTracker;
/**
* Preference controller for "Carrier Wi-Fi network"
*/
public class CarrierWifiTogglePreferenceController extends TogglePreferenceController implements
WifiPickerTracker.WifiPickerTrackerCallback {
private static final String TAG = "CarrierWifiTogglePreferenceController";
protected static final String CARRIER_WIFI_TOGGLE_PREF_KEY = "carrier_wifi_toggle";
protected static final String CARRIER_WIFI_NETWORK_PREF_KEY = "carrier_wifi_network";
protected final Context mContext;
protected boolean mIsProviderModelEnabled;
protected int mSubId;
protected WifiPickerTrackerHelper mWifiPickerTrackerHelper;
protected boolean mIsCarrierProvisionWifiEnabled;
protected Preference mCarrierNetworkPreference;
public CarrierWifiTogglePreferenceController(Context context,
String preferenceKey) {
super(context, preferenceKey);
mContext = context;
mIsProviderModelEnabled = Utils.isProviderModelEnabled(context);
}
/** Initialize related properties */
public void init(Lifecycle lifecycle, int subId) {
mSubId = subId;
mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(lifecycle, mContext, this);
mIsCarrierProvisionWifiEnabled =
mWifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(mSubId);
}
@Override
public int getAvailabilityStatus() {
if (!mIsProviderModelEnabled) {
return CONDITIONALLY_UNAVAILABLE;
}
return mIsCarrierProvisionWifiEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public boolean isChecked() {
return mWifiPickerTrackerHelper.isCarrierNetworkEnabled(mSubId);
}
@Override
public boolean setChecked(boolean isChecked) {
if (mWifiPickerTrackerHelper == null) {
return false;
}
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(isChecked);
updateCarrierNetworkPreference(isChecked);
return true;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mCarrierNetworkPreference = screen.findPreference(CARRIER_WIFI_NETWORK_PREF_KEY);
updateCarrierNetworkPreference(isChecked());
}
@Override
public void onWifiStateChanged() {
if (mCarrierNetworkPreference != null && mCarrierNetworkPreference.isVisible()) {
mCarrierNetworkPreference.setSummary(getCarrierNetworkSsid());
}
}
@Override
public void onWifiEntriesChanged() {
if (mCarrierNetworkPreference != null && mCarrierNetworkPreference.isVisible()) {
mCarrierNetworkPreference.setSummary(getCarrierNetworkSsid());
}
}
@Override
public void onNumSavedNetworksChanged() {
// Do nothing
}
@Override
public void onNumSavedSubscriptionsChanged() {
// Do nothing
}
protected void updateCarrierNetworkPreference(boolean isCarrierNetworkEnabled) {
if (mCarrierNetworkPreference == null) {
return;
}
if (!isCarrierNetworkEnabled || getAvailabilityStatus() != AVAILABLE) {
mCarrierNetworkPreference.setVisible(false);
return;
}
mCarrierNetworkPreference.setVisible(true);
mCarrierNetworkPreference.setSummary(getCarrierNetworkSsid());
}
protected String getCarrierNetworkSsid() {
if (mWifiPickerTrackerHelper == null) {
return null;
}
return mWifiPickerTrackerHelper.getCarrierNetworkSsid();
}
}

6
src/com/android/settings/network/telephony/MobileDataDialogFragment.java
View File

@@ -131,7 +131,8 @@ public class MobileDataDialogFragment extends InstrumentedDialogFragment impleme
case TYPE_DISABLE_DIALOG:
MobileNetworkUtils.setMobileDataEnabled(getContext(), mSubId, false /* enabled */,
false /* disableOtherSubscriptions */);
if (mWifiPickerTrackerHelper != null) {
if (mWifiPickerTrackerHelper != null
&& !mWifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(mSubId)) {
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false);
}
break;
@@ -139,7 +140,8 @@ public class MobileDataDialogFragment extends InstrumentedDialogFragment impleme
mSubscriptionManager.setDefaultDataSubId(mSubId);
MobileNetworkUtils.setMobileDataEnabled(getContext(), mSubId, true /* enabled */,
true /* disableOtherSubscriptions */);
if (mWifiPickerTrackerHelper != null) {
if (mWifiPickerTrackerHelper != null
&& !mWifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(mSubId)) {
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true);
}
break;

3
src/com/android/settings/network/telephony/MobileDataPreferenceController.java
View File

@@ -110,7 +110,8 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon
if (!mNeedDialog) {
// Update data directly if we don't need dialog
MobileNetworkUtils.setMobileDataEnabled(mContext, mSubId, isChecked, false);
if (mWifiPickerTrackerHelper != null) {
if (mWifiPickerTrackerHelper != null
&& !mWifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(mSubId)) {
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(isChecked);
}
return true;

2
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -38,6 +38,7 @@ import com.android.settings.R;
import com.android.settings.datausage.BillingCyclePreferenceController;
import com.android.settings.datausage.DataUsageSummaryPreferenceController;
import com.android.settings.network.ActiveSubsciptionsListener;
import com.android.settings.network.CarrierWifiTogglePreferenceController;
import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController;
import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController;
import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;
@@ -159,6 +160,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings {
use(EnabledNetworkModePreferenceController.class).init(getLifecycle(), mSubId);
use(DataServiceSetupPreferenceController.class).init(mSubId);
use(Enable2gPreferenceController.class).init(mSubId);
use(CarrierWifiTogglePreferenceController.class).init(getLifecycle(), mSubId);
final WifiCallingPreferenceController wifiCallingPreferenceController =
use(WifiCallingPreferenceController.class).init(mSubId);

53
src/com/android/settings/wifi/WifiPickerTrackerHelper.java
View File

@@ -17,12 +17,16 @@
package com.android.settings.wifi;
import android.content.Context;
import android.net.wifi.WifiManager;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.PersistableBundle;
import android.os.Process;
import android.os.SimpleClock;
import android.os.SystemClock;
import android.telephony.CarrierConfigManager;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -55,9 +59,12 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
}
};
private WifiPickerTracker mWifiPickerTracker;
protected WifiPickerTracker mWifiPickerTracker;
// Worker thread used for WifiPickerTracker work
private HandlerThread mWorkerThread;
protected HandlerThread mWorkerThread;
protected final WifiManager mWifiManager;
protected final CarrierConfigManager mCarrierConfigManager;
public WifiPickerTrackerHelper(@NonNull Lifecycle lifecycle, @NonNull Context context,
@Nullable WifiPickerTracker.WifiPickerTrackerCallback listener) {
@@ -80,26 +87,49 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
SCAN_INTERVAL_MILLIS,
listener);
mWifiManager = context.getSystemService(WifiManager.class);
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
}
/** @OnLifecycleEvent(ON_DESTROY) */
@OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
public void onDestroy() {
mWorkerThread.quit();
}
/** Return the WifiPickerTracker class */
public @NonNull WifiPickerTracker getWifiPickerTracker() {
return mWifiPickerTracker;
}
public boolean setCarrierNetworkEnabled(boolean enable) {
final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
if (mergedCarrierEntry == null) {
/** Return the enabled/disabled state of the carrier network provision */
public boolean isCarrierNetworkProvisionEnabled(int subId) {
final PersistableBundle config = mCarrierConfigManager.getConfigForSubId(subId);
if (config == null) {
Log.e(TAG, "Could not get carrier config, subId:" + subId);
return false;
}
mergedCarrierEntry.setEnabled(enable);
return true;
final boolean enabled = config.getBoolean(
CarrierConfigManager.KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL);
Log.i(TAG, "isCarrierNetworkProvisionEnabled:" + enabled);
return enabled;
}
/** Return the enabled/disabled state of the carrier network */
public boolean isCarrierNetworkEnabled(int subId) {
return mWifiManager.isCarrierNetworkOffloadEnabled(subId, true /* merged */);
}
/** Enables/disables the carrier network */
public void setCarrierNetworkEnabled(boolean enabled) {
final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
if (mergedCarrierEntry == null) {
return;
}
mergedCarrierEntry.setEnabled(enabled);
}
/** Connect to the carrier network */
public boolean connectCarrierNetwork(@Nullable WifiEntry.ConnectCallback callback) {
final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
if (mergedCarrierEntry == null || !mergedCarrierEntry.canConnect()) {
@@ -109,6 +139,15 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
return true;
}
/** Return the carrier network ssid */
public String getCarrierNetworkSsid() {
final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
if (mergedCarrierEntry == null) {
return null;
}
return mergedCarrierEntry.getSsid();
}
@VisibleForTesting
void setWifiPickerTracker(@NonNull WifiPickerTracker wifiPickerTracker) {
mWifiPickerTracker = wifiPickerTracker;