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

Commit fa785d2c authored by Xiao Ma's avatar Xiao Ma Committed by Gerrit Code Review
Browse files

Merge "Fix EthernetManager.addListener dependency in Tethering settings."

parents 49a93610 f621c4ba

src/com/android/settings/TetherSettings.java

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.net.wifi.WifiManager; 
import android.os.Bundle;

import android.os.Environment;

import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.SearchIndexableResource;
@@ -324,14 +323,14 @@ public class TetherSettings extends RestrictedSettingsFragment 


        mStartTetheringCallback = new OnStartTetheringCallback(this);

        mTetheringEventCallback = new TetheringEventCallback();

        mTm.registerTetheringEventCallback(new HandlerExecutor(mHandler), mTetheringEventCallback);

        mTm.registerTetheringEventCallback(r -> mHandler.post(r), mTetheringEventCallback);



        mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());

        registerReceiver();



        mEthernetListener = new EthernetListener();

        if (mEm != null)

            mEm.addListener(mEthernetListener);

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



        updateUsbState();

        updateBluetoothAndEthernetState();

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

+6 −7
Original line number Diff line number Diff line
@@ -48,13 +48,12 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen 


    @OnLifecycleEvent(Lifecycle.Event.ON_START)

    public void onStart() {

        mEthernetListener = new EthernetManager.Listener() {

            @Override

            public void onAvailabilityChanged(String iface, boolean isAvailable) {

                new Handler(Looper.getMainLooper()).post(() -> updateState(mPreference));

            }

        };

        mEthernetManager.addListener(mEthernetListener);

        mEthernetListener = (iface, isAvailable) -> updateState(mPreference);

        final Handler handler = new Handler(Looper.getMainLooper());

        // Executor will execute to post the updateState event to a new handler which is created

        // from the main looper when the {@link EthernetManager.Listener.onAvailabilityChanged}

        // is triggerd.

        mEthernetManager.addListener(mEthernetListener, r -> handler.post(r));

    }



    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)