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

Commit 24911e20 authored by Jason Parks's avatar Jason Parks Committed by Android (Google) Code Review
Browse files

Merge "Remove 'BIND_' from the SupervisionAppService intent action." into main

parents c5a3029f f23a09a9

core/java/android/app/supervision/SupervisionAppService.java

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ public class SupervisionAppService extends Service { 
     * @hide

     */

    @SdkConstant(SdkConstantType.SERVICE_ACTION)

    public static final String ACTION_BIND_SUPERVISION_APP_SERVICE =

            "android.app.action.BIND_SUPERVISION_APP_SERVICE";

    public static final String ACTION_SUPERVISION_APP_SERVICE =

            "android.app.action.SUPERVISION_APP_SERVICE";



    private final ISupervisionAppService mBinder =

            new ISupervisionAppService.Stub() {

packages/SettingsLib/src/com/android/settingslib/supervision/SupervisionRestrictionsHelper.kt

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settingslib.supervision



import android.app.admin.DeviceAdminReceiver

import android.app.supervision.SupervisionAppService

import android.app.supervision.SupervisionManager

import android.content.ComponentName

import android.content.Context
@@ -46,7 +47,7 @@ object SupervisionRestrictionsHelper { 
        // Try to find the service whose package matches the active supervision app.

        val resolveSupervisionApps =

            context.packageManager.queryIntentServicesAsUser(

                Intent("android.app.action.BIND_SUPERVISION_APP_SERVICE"),

                Intent(SupervisionAppService.ACTION_SUPERVISION_APP_SERVICE),

                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS,

                user.identifier,

            )

packages/SettingsLib/tests/robotests/src/com/android/settingslib/supervision/SupervisionRestrictionsHelperTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settingslib.supervision



import android.app.admin.DeviceAdminReceiver

import android.app.supervision.SupervisionAppService

import android.app.supervision.SupervisionManager

import android.content.Context

import android.content.ContextWrapper
@@ -97,7 +98,7 @@ class SupervisionRestrictionsHelperTest { 
            .thenReturn(SUPERVISION_APP_PACKAGE)

        `when`(

                mockPackageManager.queryIntentServicesAsUser(

                    argThat(hasAction("android.app.action.BIND_SUPERVISION_APP_SERVICE")),

                    argThat(hasAction(SupervisionAppService.ACTION_SUPERVISION_APP_SERVICE)),

                    anyInt(),

                    eq(USER_ID),

                )

services/core/java/com/android/server/appbinding/finders/SupervisionAppServiceFinder.java

+1 −3
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ import android.content.pm.ServiceInfo; 
import android.os.Handler;

import android.os.IBinder;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Slog;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -85,7 +83,7 @@ public class SupervisionAppServiceFinder 
    @NonNull

    @Override

    protected String getServiceAction() {

        return SupervisionAppService.ACTION_BIND_SUPERVISION_APP_SERVICE;

        return SupervisionAppService.ACTION_SUPERVISION_APP_SERVICE;

    }



    @NonNull