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

Commit ab38192a authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de29532 am: ee25171a am: 130f27d4 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: Ic39e10b36eff5b009886d7a321575f63ef15ba5c
parents 0e35a6fe 130f27d4

src/com/android/settings/development/BluetoothGabeldorschePreferenceController.java

+9 −8
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.settings.development;

package com.android.settings.development;





import android.content.Context;

import android.content.Context;

import android.os.SystemProperties;

import android.provider.DeviceConfig;





import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.Preference;
@@ -35,9 +35,9 @@ public class BluetoothGabeldorschePreferenceController extends 




    private static final String BLUETOOTH_GABELDORSCHE_KEY =

    private static final String BLUETOOTH_GABELDORSCHE_KEY =

            "bluetooth_gabeldorsche_enable";

            "bluetooth_gabeldorsche_enable";



    @VisibleForTesting

    @VisibleForTesting

    static final String BLUETOOTH_GABELDORSCHE_PROPERTY =

    static final String CURRENT_GD_FLAG = "INIT_gd_scanning";

            "bluetooth.gd.enabled";





    public BluetoothGabeldorschePreferenceController(Context context) {

    public BluetoothGabeldorschePreferenceController(Context context) {

        super(context);

        super(context);
@@ -51,22 +51,23 @@ public class BluetoothGabeldorschePreferenceController extends 
    @Override

    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        final boolean isEnabled = (Boolean) newValue;

        final boolean isEnabled = (Boolean) newValue;

        SystemProperties.set(BLUETOOTH_GABELDORSCHE_PROPERTY,

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,

                isEnabled ? "true" : "false");

                CURRENT_GD_FLAG, isEnabled ? "true" : "false", false /* makeDefault */);

        return true;

        return true;

    }

    }





    @Override

    @Override

    public void updateState(Preference preference) {

    public void updateState(Preference preference) {

        final boolean isEnabled = SystemProperties.getBoolean(

        final boolean isEnabled = DeviceConfig.getBoolean(

                BLUETOOTH_GABELDORSCHE_PROPERTY, false /* default */);

                DeviceConfig.NAMESPACE_BLUETOOTH, CURRENT_GD_FLAG, false /* default */);

        ((SwitchPreference) mPreference).setChecked(isEnabled);

        ((SwitchPreference) mPreference).setChecked(isEnabled);

    }

    }





    @Override

    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

    protected void onDeveloperOptionsSwitchDisabled() {

        super.onDeveloperOptionsSwitchDisabled();

        super.onDeveloperOptionsSwitchDisabled();

        SystemProperties.set(BLUETOOTH_GABELDORSCHE_PROPERTY, "false");

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,

                CURRENT_GD_FLAG, null, false /* makeDefault */);

        ((SwitchPreference) mPreference).setChecked(false);

        ((SwitchPreference) mPreference).setChecked(false);

    }

    }

}
 
}

tests/robotests/src/com/android/settings/development/BluetoothGabeldorschePreferenceControllerTest.java

0 → 100644
+112 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2021 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.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.development;



import static com.android.settings.development.BluetoothGabeldorschePreferenceController

        .CURRENT_GD_FLAG;



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



import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.provider.DeviceConfig;



import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class BluetoothGabeldorschePreferenceControllerTest {



    @Mock

    private SwitchPreference mPreference;

    @Mock

    private PreferenceScreen mPreferenceScreen;



    private BluetoothGabeldorschePreferenceController mController;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        Context context = RuntimeEnvironment.application;

        mController = new BluetoothGabeldorschePreferenceController(context);

        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))

                .thenReturn(mPreference);

        mController.displayPreference(mPreferenceScreen);

    }



    @Test

    public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothGabeldorsche() {

        mController.onPreferenceChange(mPreference, true /* new value */);



        boolean enabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                CURRENT_GD_FLAG, false /* defaultValue */);



        assertThat(enabled).isTrue();

    }



    @Test

    public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothGabeldorsche() {

        mController.onPreferenceChange(mPreference, false /* new value */);



        boolean enabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                CURRENT_GD_FLAG, false /* defaultValue */);



        assertThat(enabled).isFalse();

    }



    @Test

    public void updateState_settingEnabled_preferenceShouldBeChecked() {

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,

                CURRENT_GD_FLAG, "true", false /* makeDefault */);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH,

                CURRENT_GD_FLAG, "false", false /* makeDefault */);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);

    }



    @Test

    public void onDeveloperOptionsDisabled_shouldDisablePreference() {

        mController.onDeveloperOptionsDisabled();



        String configStr = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_BLUETOOTH,

                CURRENT_GD_FLAG);



        assertThat(configStr).isNull();

        verify(mPreference).setEnabled(false);

        verify(mPreference).setChecked(false);

    }

}