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

Commit dc68fd42 authored by Haijie Hong's avatar Haijie Hong
Browse files

Clean up settings subsequent pairing aconfig flag 

BUG: 362649019
Test: atest FastPairDeviceGroupControllerTest
Flag: EXEMPT clean up
Change-Id: Ia49b0e4e9e5b9af7fe33b2182344f7a43786f111
parent d0ea9bc2

aconfig/settings_connecteddevice_flag_declarations.aconfig

+1 −8
Original line number Diff line number Diff line 
package: "com.android.settings.flags"

container: "system_ext"



flag {

  name: "enable_subsequent_pair_settings_integration"

  namespace: "pixel_cross_device_control"

  description: "Gates whether to enable subsequent pair Settings integration."

  bug: "299405720"

}



flag {

  name: "rotation_connected_display_setting"

  namespace: "display_manager"

src/com/android/settings/connecteddevice/fastpair/FastPairDeviceGroupController.java

+5 −10
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import androidx.preference.PreferenceScreen; 
import com.android.settings.connecteddevice.DevicePreferenceCallback;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.flags.Flags;

import com.android.settings.overlay.FeatureFactory;



/**
@@ -66,15 +65,11 @@ public class FastPairDeviceGroupController extends BasePreferenceController 


    public FastPairDeviceGroupController(Context context) {

        super(context, KEY);

        if (Flags.enableSubsequentPairSettingsIntegration()) {

        FastPairFeatureProvider fastPairFeatureProvider =

                FeatureFactory.getFeatureFactory().getFastPairFeatureProvider();

        mFastPairDeviceUpdater =

                fastPairFeatureProvider.getFastPairDeviceUpdater(context, this);

        } else {

            Log.d(TAG, "Flag disabled. Ignored.");

            mFastPairDeviceUpdater = null;

        }



        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

        mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);

    }

src/com/android/settings/connecteddevice/fastpair/FastPairDevicePreferenceController.java

+4 −10
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; 


import com.android.settings.connecteddevice.DevicePreferenceCallback;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.flags.Flags;

import com.android.settings.overlay.FeatureFactory;



import java.util.ArrayList;
@@ -75,15 +74,10 @@ public class FastPairDevicePreferenceController extends BasePreferenceController 
    public FastPairDevicePreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);



        if (Flags.enableSubsequentPairSettingsIntegration()) {

        FastPairFeatureProvider fastPairFeatureProvider =

                FeatureFactory.getFeatureFactory().getFastPairFeatureProvider();

        mFastPairDeviceUpdater =

                fastPairFeatureProvider.getFastPairDeviceUpdater(context, this);

        } else {

            Log.d(TAG, "Flag disabled. Ignore.");

            mFastPairDeviceUpdater = null;

        }

        mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);

        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

    }

tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.android.settings.R; 
import com.android.settings.connecteddevice.fastpair.FastPairDeviceUpdater;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.PreferenceControllerListHelper;

import com.android.settings.flags.Flags;

import com.android.settings.slices.SlicePreferenceController;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
@@ -94,7 +93,6 @@ public class ConnectedDeviceDashboardFragmentTest { 


        mContext = spy(RuntimeEnvironment.application);

        mFragment = new ConnectedDeviceDashboardFragment();

        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION);

        mSetFlagsRule.enableFlags(com.android.settingslib.flags.Flags.FLAG_ENABLE_LE_AUDIO_SHARING);

        mFeatureFactory = FakeFeatureFactory.setupForTest();

        when(mFeatureFactory

tests/robotests/src/com/android/settings/connecteddevice/fastpair/FastPairDeviceGroupControllerTest.java

+0 −59
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.PackageManager;

import android.os.Looper;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;
@@ -45,7 +43,6 @@ import androidx.preference.PreferenceManager; 
import androidx.preference.PreferenceScreen;



import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.flags.Flags;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;

import com.android.settings.widget.GearPreference;
@@ -107,7 +104,6 @@ public class FastPairDeviceGroupControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void onStart_flagOn_registerCallback() {

        // register the callback in onStart()

        mFastPairDeviceGroupController.onStart(mLifecycleOwner);
@@ -120,7 +116,6 @@ public class FastPairDeviceGroupControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void onStop_flagOn_unregisterCallback() {

        // register broadcast first

        mContext.registerReceiver(
@@ -133,51 +128,6 @@ public class FastPairDeviceGroupControllerTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void onStart_flagOff_registerCallback() {

        // register the callback in onStart()

        mFastPairDeviceGroupController.onStart(mLifecycleOwner);

        assertThat(mFastPairDeviceUpdater).isNull();

        verify(mContext)

                .registerReceiver(

                        mFastPairDeviceGroupController.mReceiver,

                        mFastPairDeviceGroupController.mIntentFilter,

                        Context.RECEIVER_EXPORTED);

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void onStop_flagOff_unregisterCallback() {

        // register broadcast first

        mContext.registerReceiver(

                mFastPairDeviceGroupController.mReceiver, null, Context.RECEIVER_EXPORTED);



        // unregister the callback in onStop()

        mFastPairDeviceGroupController.onStop(mLifecycleOwner);

        assertThat(mFastPairDeviceUpdater).isNull();

        verify(mContext).unregisterReceiver(mFastPairDeviceGroupController.mReceiver);

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void getAvailabilityStatus_noFastPairFeature_returnUnSupported() {

        doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);



        assertThat(mFastPairDeviceGroupController.getAvailabilityStatus())

                .isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void getAvailabilityStatus_noBluetoothFastPairFeature_returnUnSupported() {

        doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);



        assertThat(mFastPairDeviceGroupController.getAvailabilityStatus())

                .isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void getAvailabilityStatus_noBluetoothFeature_returnUnSupported() {

        doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
@@ -186,7 +136,6 @@ public class FastPairDeviceGroupControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void getAvailabilityStatus_withBluetoothFastPairFeature_returnSupported() {

        doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
@@ -231,14 +180,6 @@ public class FastPairDeviceGroupControllerTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void displayPreference_notAvailable_doNothing() {

        mFastPairDeviceGroupController.displayPreference(mScreen);

        assertThat(mPreferenceGroup.isVisible()).isFalse();

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_SUBSEQUENT_PAIR_SETTINGS_INTEGRATION)

    public void displayPreference_isAvailable_fetchFastPairDevices() {

        doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);