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

Commit ee3c5500 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refine TetherSettings"

parents 7d920ca2 f077b835

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.TetherSettings" />

                android:value="com.android.settings.network.tether.TetherSettings" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_network"/>

        </activity>
@@ -793,7 +793,7 @@ 
                  android:exported="true"

                  android:targetActivity="Settings$TetherSettingsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.TetherSettings" />

                android:value="com.android.settings.network.tether.TetherSettings" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_network"/>

        </activity-alias>

res/xml/network_provider_internet.xml

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.TetherSettings"

        android:fragment="com.android.settings.network.tether.TetherSettings"

        android:key="tether_settings"

        android:title="@string/tether_settings_title_all"

        android:icon="@drawable/ic_wifi_tethering"

src/com/android/settings/core/gateway/SettingsGateway.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import com.android.settings.MainClear; 
import com.android.settings.MainClearConfirm;

import com.android.settings.Settings;

import com.android.settings.TestingSettings;

import com.android.settings.TetherSettings;

import com.android.settings.TrustedCredentialsSettings;

import com.android.settings.accessibility.AccessibilityDetailsSettingsFragment;

import com.android.settings.accessibility.AccessibilitySettings;
@@ -141,6 +140,7 @@ import com.android.settings.network.apn.ApnEditor; 
import com.android.settings.network.apn.ApnSettings;

import com.android.settings.network.telephony.MobileNetworkSettings;

import com.android.settings.network.telephony.NetworkSelectSettings;

import com.android.settings.network.tether.TetherSettings;

import com.android.settings.nfc.AndroidBeam;

import com.android.settings.nfc.PaymentSettings;

import com.android.settings.notification.ConfigureNotificationSettings;

src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java

+1 −1
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ import android.os.UserHandle; 
import android.os.UserManager;



import com.android.settings.R;

import com.android.settings.TetherSettings;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.homepage.contextualcards.ContextualCard;

import com.android.settings.network.tether.TetherSettings;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtilsInternal;

src/com/android/settings/TetherSettings.java→src/com/android/settings/network/tether/TetherSettings.java

+10 −5
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 * Copyright (C) 2022 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings;

package com.android.settings.network.tether;



import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;

import static android.net.ConnectivityManager.TETHERING_USB;
@@ -53,6 +53,9 @@ import androidx.annotation.VisibleForTesting; 
import androidx.preference.Preference;

import androidx.preference.SwitchPreference;



import com.android.settings.R;

import com.android.settings.RestrictedSettingsFragment;

import com.android.settings.Utils;

import com.android.settings.core.FeatureFlags;

import com.android.settings.datausage.DataSaverBackend;

import com.android.settings.search.BaseSearchIndexProvider;
@@ -69,7 +72,7 @@ import java.util.HashSet; 
import java.util.List;

import java.util.concurrent.atomic.AtomicReference;



/*

/**

 * Displays preferences for Tethering.

 */

@SearchIndexable
@@ -368,8 +371,9 @@ public class TetherSettings extends RestrictedSettingsFragment 
        registerReceiver();



        mEthernetListener = new EthernetListener(this);

        if (mEm != null)

        if (mEm != null) {

            mEm.addInterfaceStateListener(r -> mHandler.post(r), mEthernetListener);

        }



        updateUsbState();

        updateBluetoothAndEthernetState();
@@ -384,8 +388,9 @@ public class TetherSettings extends RestrictedSettingsFragment 
        }

        getActivity().unregisterReceiver(mTetherChangeReceiver);

        mTm.unregisterTetheringEventCallback(mTetheringEventCallback);

        if (mEm != null)

        if (mEm != null) {

            mEm.removeInterfaceStateListener(mEthernetListener);

        }

        mTetherChangeReceiver = null;

        mStartTetheringCallback = null;

        mTetheringEventCallback = null;