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

Commit c2bb599e authored by Hugh Chen's avatar Hugh Chen Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3f 

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



Change-Id: Ic3eecbf76413c2ceeff1f3a838cb7f6250e3a423
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d9bdda6 06139d3f

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+13 −4
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 
    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";

    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";



    @VisibleForTesting

    static final String KEY_CONNECTED_DEVICES = "connected_device_list";
@@ -98,8 +99,10 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 
                SettingsUIDeviceConfig.BT_NEAR_BY_SUGGESTION_ENABLED, true);

        String callingAppPackageName = PasswordUtils.getCallingAppPackageName(

                getActivity().getActivityToken());

        String action = getIntent() != null ? getIntent().getAction() : "";

        if (DEBUG) {

            Log.d(TAG, "onAttach() calling package name is : " + callingAppPackageName);

            Log.d(TAG, "onAttach() calling package name is : " + callingAppPackageName

                    + ", action : " + action);

        }

        use(AvailableMediaDeviceGroupController.class).init(this);

        use(ConnectedDeviceGroupController.class).init(this);
@@ -108,9 +111,15 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 
        use(SlicePreferenceController.class).setSliceUri(nearbyEnabled

                ? Uri.parse(getString(R.string.config_nearby_devices_slice_uri))

                : null);

        use(DiscoverableFooterPreferenceController.class).setAlwaysDiscoverable(

                TextUtils.equals(SETTINGS_PACKAGE_NAME, callingAppPackageName)

                        || TextUtils.equals(SYSTEMUI_PACKAGE_NAME, callingAppPackageName));

        use(DiscoverableFooterPreferenceController.class)

                .setAlwaysDiscoverable(isAlwaysDiscoverable(callingAppPackageName, action));

    }



    @VisibleForTesting

    boolean isAlwaysDiscoverable(String callingAppPackageName, String action) {

        return TextUtils.equals(SLICE_ACTION, action) ? false

                : TextUtils.equals(SETTINGS_PACKAGE_NAME, callingAppPackageName)

                || TextUtils.equals(SYSTEMUI_PACKAGE_NAME, callingAppPackageName);

    }



    /**

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

+27 −0
Original line number Diff line number Diff line
@@ -51,16 +51,23 @@ import java.util.List; 
        ShadowConnectivityManager.class, ShadowBluetoothAdapter.class})

public class ConnectedDeviceDashboardFragmentTest {

    private static final String KEY_NEARBY_DEVICES = "bt_nearby_slice";

    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";

    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";

    private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";

    private static final String TEST_APP_NAME = "com.testapp.settings";

    private static final String TEST_ACTION = "com.testapp.settings.ACTION_START";



    @Mock

    private PackageManager mPackageManager;

    private Context mContext;

    private ConnectedDeviceDashboardFragment mFragment;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mContext = spy(RuntimeEnvironment.application);

        mFragment = new ConnectedDeviceDashboardFragment();

        doReturn(mPackageManager).when(mContext).getPackageManager();

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

    }
@@ -84,6 +91,26 @@ public class ConnectedDeviceDashboardFragmentTest { 
                KEY_NEARBY_DEVICES);

    }



    @Test

    public void isAlwaysDiscoverable_callingAppIsNotFromSystemApp_returnsFalse() {

        assertThat(mFragment.isAlwaysDiscoverable(TEST_APP_NAME, TEST_ACTION)).isFalse();

    }



    @Test

    public void isAlwaysDiscoverable_callingAppIsFromSettings_returnsTrue() {

        assertThat(mFragment.isAlwaysDiscoverable(SETTINGS_PACKAGE_NAME, TEST_ACTION)).isTrue();

    }



    @Test

    public void isAlwaysDiscoverable_callingAppIsFromSystemUI_returnsTrue() {

        assertThat(mFragment.isAlwaysDiscoverable(SYSTEMUI_PACKAGE_NAME, TEST_ACTION)).isTrue();

    }



    @Test

    public void isAlwaysDiscoverable_actionIsFromSlice_returnsFalse() {

        assertThat(mFragment.isAlwaysDiscoverable(SYSTEMUI_PACKAGE_NAME, SLICE_ACTION)).isFalse();

    }



    @Test

    public void getPreferenceControllers_containSlicePrefController() {

        final List<BasePreferenceController> controllers =