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

Commit b9453be3 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

resolve merge conflicts of 4e10b37b to master 

Change-Id: If5091133617285fdb7f3c0312e9e229ae8e53fe0
parents fd82f310 4e10b37b

packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -102,11 +102,11 @@ public class HelpUtilsTest { 


    @Test

    public void addIntentParameters_configFalse_argumentTrue() {

        when(mContext.getResources().getBoolean(R.bool.config_sendPackageName)).thenReturn(true);

        when(mContext.getResources().getBoolean(R.bool.config_sendPackageName)).thenReturn(false);

        Intent intent = new Intent();



        HelpUtils.addIntentParameters(

                mContext, intent, null /* backupContext */, false /* sendPackageName */);

                mContext, intent, null /* backupContext */, true /* sendPackageName */);



        assertThat(intent.hasExtra(HELP_INTENT_EXTRA_KEY)).isFalse();

        assertThat(intent.hasExtra(HELP_INTENT_NAME_KEY)).isFalse();