Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I4e10ed48abd35ba5686b4a9ea920b045164617c9
This commit is contained in:
Fabian Kozynski
2020-03-27 17:06:40 +00:00
committed by Automerger Merge Worker
parent 9a95976e1c bce4b444e3
commit ff99d96cdc
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/service/controls/ControlsProviderService.java
View File

@@ -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 {

4
core/res/res/values/config.xml
View File

@@ -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>

1
core/res/res/values/symbols.xml
View File

@@ -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" />

9
core/tests/coretests/src/android/service/controls/ControlProviderServiceTest.java
View File

@@ -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)));