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

Commit 78f0b46e authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Add a config resource for controls package" into rvc-dev am: bce4b444 am: 59390248 

Change-Id: If5a5b75bbea74103ebd94be99771a245bfd665c7
parents 522861c3 59390248

core/java/android/service/controls/ControlsProviderService.java

+3 −4
Original line number Diff line number Diff line
@@ -304,12 +304,11 @@ public abstract class ControlsProviderService extends Service { 
        Preconditions.checkNotNull(context);

        Preconditions.checkNotNull(componentName);

        Preconditions.checkNotNull(control);

        final ComponentName sysuiComponent = ComponentName.unflattenFromString(

                context.getResources().getString(

                        com.android.internal.R.string.config_systemUIServiceComponent));

        final String controlsPackage = context.getString(

                com.android.internal.R.string.config_controlsPackage);

        Intent intent = new Intent(ACTION_ADD_CONTROL);

        intent.putExtra(Intent.EXTRA_COMPONENT_NAME, componentName);

        intent.setPackage(sysuiComponent.getPackageName());

        intent.setPackage(controlsPackage);

        if (isStatelessControl(control)) {

            intent.putExtra(EXTRA_CONTROL, control);

        } else {

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -2779,6 +2779,10 @@ 
    <string name="config_systemUIServiceComponent" translatable="false"

            >com.android.systemui/com.android.systemui.SystemUIService</string>



    <!-- Package handling Quick controls -->

    <string name="config_controlsPackage" translatable="false"

            >com.android.systemui</string>



    <!-- Keyguard component -->

    <string name="config_keyguardComponent" translatable="false"

            >com.android.systemui/com.android.systemui.keyguard.KeyguardService</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ 
  <java-symbol type="bool" name="config_hasRecents" />

  <java-symbol type="string" name="config_recentsComponentName" />

  <java-symbol type="string" name="config_systemUIServiceComponent" />

  <java-symbol type="string" name="config_controlsPackage" />

  <java-symbol type="string" name="config_screenRecorderComponent" />

  <java-symbol type="string" name="config_somnambulatorComponent" />

  <java-symbol type="string" name="config_screenshotServiceComponent" />

core/tests/coretests/src/android/service/controls/ControlProviderServiceTest.java

+4 −5
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ import java.util.function.Consumer; 
@RunWith(AndroidJUnit4.class)

public class ControlProviderServiceTest {



    private static final ComponentName TEST_SYSUI_COMPONENT =

            ComponentName.unflattenFromString("sysui/.test.cls");

    private static final String TEST_CONTROLS_PACKAGE = "sysui";

    private static final ComponentName TEST_COMPONENT =

            ComponentName.unflattenFromString("test.pkg/.test.cls");
@@ -97,8 +96,8 @@ public class ControlProviderServiceTest { 
        when(mSubscriber.asBinder()).thenCallRealMethod();

        when(mSubscriber.queryLocalInterface(any())).thenReturn(mSubscriber);



        when(mResources.getString(com.android.internal.R.string.config_systemUIServiceComponent))

                .thenReturn(TEST_SYSUI_COMPONENT.flattenToString());

        when(mResources.getString(com.android.internal.R.string.config_controlsPackage))

                .thenReturn(TEST_CONTROLS_PACKAGE);

        when(mContext.getResources()).thenReturn(mResources);



        Bundle b = new Bundle();
@@ -252,7 +251,7 @@ public class ControlProviderServiceTest { 
                eq(Manifest.permission.BIND_CONTROLS));

        Intent intent = mIntentArgumentCaptor.getValue();

        assertEquals(ControlsProviderService.ACTION_ADD_CONTROL, intent.getAction());

        assertEquals(TEST_SYSUI_COMPONENT.getPackageName(), intent.getPackage());

        assertEquals(TEST_CONTROLS_PACKAGE, intent.getPackage());

        assertEquals(TEST_COMPONENT, intent.getParcelableExtra(Intent.EXTRA_COMPONENT_NAME));

        assertTrue(equals(control,

                intent.getParcelableExtra(ControlsProviderService.EXTRA_CONTROL)));