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

Commit 26ed6cfc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6657497 from 3a6f46b9 to mainline-release 

Change-Id: I89cd93d88585f7f727840aab86469f950a8aea04
parents b3324c20 3a6f46b9

src/com/android/settings/display/PeakRefreshRatePreferenceController.java

+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.view.Display; 
import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;
@@ -45,7 +44,6 @@ public class PeakRefreshRatePreferenceController extends TogglePreferenceControl 
    @VisibleForTesting float mPeakRefreshRate;



    private static final String TAG = "RefreshRatePrefCtr";

    private static final String KEY_PEAK_REFRESH_RATE_DEFAULT = "peak_refresh_rate_default";

    private static final float INVALIDATE_REFRESH_RATE = -1f;



    private final Handler mHandler;
@@ -59,7 +57,7 @@ public class PeakRefreshRatePreferenceController extends TogglePreferenceControl 


    public PeakRefreshRatePreferenceController(Context context, String key) {

        super(context, key);

        mHandler = new Handler();

        mHandler = new Handler(context.getMainLooper());

        mDeviceConfigDisplaySettings = new DeviceConfigDisplaySettings();

        mOnDeviceConfigChange =

                new IDeviceConfigChange() {

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

+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import androidx.lifecycle.Lifecycle; 
import androidx.lifecycle.Lifecycle.Event;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;
@@ -93,6 +94,12 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController 
        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = screen.findPreference(mPreferenceKey);

    }



    @Override

    public int getAvailabilityStatus() {

        if (!TetherUtil.isTetherAvailable(mContext)

src/com/android/settings/slices/SliceBackgroundWorker.java

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import java.io.Closeable; 
import java.io.IOException;

import java.lang.reflect.InvocationTargetException;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Map;
@@ -190,7 +191,8 @@ public abstract class SliceBackgroundWorker<E> implements Closeable { 


        private static NotifySliceChangeHandler sHandler;



        private final Map<Uri, Long> mLastUpdateTimeLookup = new ArrayMap<>();

        private final Map<Uri, Long> mLastUpdateTimeLookup = Collections.synchronizedMap(

                new ArrayMap<>());



        private static NotifySliceChangeHandler getInstance() {

            if (sHandler == null) {

tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java

+14 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.settings.network.TetherEnabler.TETHERING_WIFI_ON; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;
@@ -35,6 +36,9 @@ import android.bluetooth.BluetoothPan; 
import android.bluetooth.BluetoothProfile;

import android.content.Context;



import androidx.preference.PreferenceScreen;

import androidx.test.core.app.ApplicationProvider;



import com.android.settings.R;

import com.android.settings.widget.MasterSwitchPreference;
@@ -109,13 +113,13 @@ public class AllInOneTetherPreferenceControllerTest { 
        });

    }



    @Mock

    private Context mContext;

    @Mock

    private BluetoothAdapter mBluetoothAdapter;

    @Mock

    private MasterSwitchPreference mPreference;



    private static final String PREF_KEY = "tether";

    private AllInOneTetherPreferenceController mController;

    private final int mTetherState;

    private final int mSummaryResId;
@@ -127,11 +131,16 @@ public class AllInOneTetherPreferenceControllerTest { 


    @Before

    public void setUp() {

        mContext = ApplicationProvider.getApplicationContext();

        MockitoAnnotations.initMocks(this);

        mController = spy(AllInOneTetherPreferenceController.class);

        ReflectionHelpers.setField(mController, "mContext", mContext);

        ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter);

        ReflectionHelpers.setField(mController, "mPreference", mPreference);

        ReflectionHelpers.setField(mController, "mPreferenceKey", PREF_KEY);

        PreferenceScreen screen = mock(PreferenceScreen.class);

        when(screen.findPreference(PREF_KEY)).thenReturn(mPreference);

        doReturn(mController.AVAILABLE).when(mController).getAvailabilityStatus();

        mController.displayPreference(screen);

    }



    @Test
@@ -169,5 +178,8 @@ public class AllInOneTetherPreferenceControllerTest { 
    public void getSummary_afterTetherStateChanged() {

        mController.onTetherStateUpdated(mTetherState);

        assertThat(mController.getSummary()).isEqualTo(mContext.getString(mSummaryResId));



        verify(mController).updateState(mPreference);

        verify(mPreference).setSummary(mContext.getString(mSummaryResId));

    }

}