From 620886640bd773e6f9d0356b13209345e64d316b Mon Sep 17 00:00:00 2001
From: Neel Chauhan <neel@neelc.org>
Date: Mon, 9 Dec 2024 19:40:00 -0500
Subject: [PATCH] Settings: Add an option to allow tethering while Data Saver
 is on

---
 res-product/values/strings.xml                |  2 ++
 res/values/strings.xml                        |  4 +++
 res/xml/tether_prefs.xml                      |  6 ++++
 .../network/tether/TetherSettings.java        | 31 ++++++++++++-------
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/res-product/values/strings.xml b/res-product/values/strings.xml
index d5ef1c888f6..621f65b2e91 100644
--- a/res-product/values/strings.xml
+++ b/res-product/values/strings.xml
@@ -509,6 +509,8 @@
     <string name="ethernet_tethering_subtext" product="default">Share phone\u2019s internet connection via Ethernet</string>
     <!-- Ethernet Tethering subtext for tablet [CHAR LIMIT=NONE]-->
     <string name="ethernet_tethering_subtext" product="tablet">Share tablet\u2019s internet connection via Ethernet</string>
+    <!-- Data Saver Tethering subtext [CHAR LIMIT=NONE]-->
+    <string name="data_saver_tethering_subtext" product="default">Unconditionally allow tethering while on data saver mode</string>
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
     <string name="about_settings" product="tablet">About tablet</string>
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9001570d125..0d00ec8fe21 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3711,6 +3711,10 @@
     <!-- Label for ethernet tether checkbox [CHAR LIMIT=NONE]-->
     <string name="ethernet_tether_checkbox_text">Ethernet tethering</string>
 
+    <!-- Enable Tethering on Data Saver -->
+    <!-- Label for data saver tether checkbox [CHAR LIMIT=NONE]-->
+    <string name="data_saver_tether_checkbox_text">Enable tethering on data saver</string>
+
     <!-- Tethering footer info [CHAR LIMIT=NONE]-->
     <string name="tethering_footer_info">Use hotspot and tethering to provide internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices.</string>
     <!-- Tethering footer info for the device which supports Wi-Fi and Wi-Fi tethering enabled at the same time [CHAR LIMIT=NONE]-->
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 89bd631bcd2..c3fe5884bcc 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -49,6 +49,12 @@
         android:summary="@string/ethernet_tethering_subtext"
         settings:keywords="@string/keywords_hotspot_tethering" />
 
+    <SwitchPreferenceCompat
+        android:key="enable_data_saver_tethering"
+        android:title="@string/data_saver_tether_checkbox_text"
+        android:summary="@string/data_saver_tethering_subtext"
+        settings:keywords="@string/keywords_hotspot_tethering" />
+
     <com.android.settingslib.widget.FooterPreference
         android:key="disabled_on_data_saver"
         android:title="@string/tether_settings_disabled_on_data_saver"
diff --git a/src/com/android/settings/network/tether/TetherSettings.java b/src/com/android/settings/network/tether/TetherSettings.java
index 77ef4b6ef12..c79bdb49eaa 100644
--- a/src/com/android/settings/network/tether/TetherSettings.java
+++ b/src/com/android/settings/network/tether/TetherSettings.java
@@ -87,6 +87,7 @@ public class TetherSettings extends RestrictedSettingsFragment
     @VisibleForTesting
     static final String KEY_ENABLE_BLUETOOTH_TETHERING = "enable_bluetooth_tethering";
     private static final String KEY_ENABLE_ETHERNET_TETHERING = "enable_ethernet_tethering";
+    private static final String KEY_ENABLE_DATA_SAVER_TETHERING = "enable_data_saver_tethering";
     private static final String KEY_DATA_SAVER_FOOTER = "disabled_on_data_saver";
     @VisibleForTesting
     static final String KEY_TETHER_PREFS_TOP_INTRO = "tether_prefs_top_intro";
@@ -100,6 +101,8 @@ public class TetherSettings extends RestrictedSettingsFragment
     TwoStatePreference mBluetoothTether;
     @VisibleForTesting
     TwoStatePreference mEthernetTether;
+    @VisibleForTesting
+    TwoStatePreference mDataSaverTether;
 
     private BroadcastReceiver mTetherChangeReceiver;
     private BroadcastReceiver mBluetoothStateReceiver;
@@ -156,7 +159,6 @@ public void onCreate(Bundle icicle) {
         mContext = getContext();
         mDataSaverBackend = new DataSaverBackend(mContext);
         mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();
-        mDataSaverFooter = findPreference(KEY_DATA_SAVER_FOOTER);
 
         setupTetherPreference();
         setupViewModel();
@@ -209,6 +211,7 @@ public void onCreate(Bundle icicle) {
         if (!ethernetAvailable) getPreferenceScreen().removePreference(mEthernetTether);
         // Set initial state based on Data Saver mode.
         onDataSaverChanged(mDataSaverBackend.isDataSaverEnabled());
+        mDataSaverTether.setChecked(false);
     }
 
     @VisibleForTesting
@@ -247,15 +250,16 @@ void setupTetherPreference() {
         mUsbTether = (RestrictedSwitchPreference) findPreference(KEY_USB_TETHER_SETTINGS);
         mBluetoothTether = (TwoStatePreference) findPreference(KEY_ENABLE_BLUETOOTH_TETHERING);
         mEthernetTether = (TwoStatePreference) findPreference(KEY_ENABLE_ETHERNET_TETHERING);
+        mDataSaverTether = (TwoStatePreference) findPreference(KEY_ENABLE_DATA_SAVER_TETHERING);
     }
 
     @Override
     public void onDataSaverChanged(boolean isDataSaving) {
         mDataSaverEnabled = isDataSaving;
-        mWifiTetherPreferenceController.setDataSaverEnabled(mDataSaverEnabled);
-        mUsbTether.setEnabled(!mDataSaverEnabled);
-        mBluetoothTether.setEnabled(!mDataSaverEnabled);
-        mEthernetTether.setEnabled(!mDataSaverEnabled);
+        mWifiTetherPreferenceController.setDataSaverEnabled(mDataSaverEnabled || !mDataSaverTether.isChecked());
+        mUsbTether.setEnabled(!mDataSaverEnabled || mDataSaverTether.isChecked());
+        mBluetoothTether.setEnabled(!mDataSaverEnabled || mDataSaverTether.isChecked());
+        mEthernetTether.setEnabled(!mDataSaverEnabled || mDataSaverTether.isChecked());
         mDataSaverFooter.setVisible(mDataSaverEnabled);
     }
 
@@ -461,7 +465,7 @@ void updateUsbState(String[] tethered) {
                     + ", usbTethered : " + usbTethered);
         }
         if (usbTethered) {
-            mUsbTether.setEnabled(!mDataSaverEnabled);
+            mUsbTether.setEnabled(!mDataSaverEnabled || mDataSaverTether.isChecked());
             mUsbTether.setChecked(true);
             final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =
                     checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId());
@@ -482,7 +486,7 @@ private void updateUsbPreference() {
         if (enforcedAdmin != null) {
             mUsbTether.setDisabledByAdmin(enforcedAdmin);
         } else if (usbAvailable) {
-            mUsbTether.setEnabled(!mDataSaverEnabled);
+            mUsbTether.setEnabled(!mDataSaverEnabled || mDataSaverTether.isChecked());
         } else {
             mUsbTether.setEnabled(false);
         }
@@ -520,9 +524,9 @@ private void updateBluetoothState() {
         } else {
             if (btState == BluetoothAdapter.STATE_ON && isBluetoothTetheringOn()) {
                 mBluetoothTether.setChecked(true);
-                mBluetoothTether.setEnabled(!mDataSaverEnabled);
+                mBluetoothTether.setEnabled(!mDataSaverEnabled || mDataSaverTether.isChecked());
             } else {
-                mBluetoothTether.setEnabled(!mDataSaverEnabled);
+                mBluetoothTether.setEnabled(!mDataSaverEnabled || mDataSaverTether.isChecked());
                 mBluetoothTether.setChecked(false);
             }
         }
@@ -547,10 +551,10 @@ void updateEthernetState(String[] available, String[] tethered) {
         }
 
         if (isTethered) {
-            mEthernetTether.setEnabled(!mDataSaverEnabled);
+            mEthernetTether.setEnabled(!mDataSaverEnabled || mDataSaverTether.isChecked());
             mEthernetTether.setChecked(true);
         } else if (mAvailableInterfaces.size() > 0) {
-            mEthernetTether.setEnabled(!mDataSaverEnabled);
+            mEthernetTether.setEnabled(!mDataSaverEnabled || mDataSaverTether.isChecked());
             mEthernetTether.setChecked(false);
         } else {
             mEthernetTether.setEnabled(false);
@@ -659,6 +663,11 @@ public List<String> getNonIndexableKeys(Context context) {
                     if (!ethernetAvailable) {
                         keys.add(KEY_ENABLE_ETHERNET_TETHERING);
                     }
+
+                    if (!TetherUtil.isTetherAvailable(context)) {
+                        keys.add(KEY_DATA_SAVER_FOOTER);
+                    }
+
                     return keys;
                 }
     };