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

Commit 08c92021 authored by Felipe Leme's avatar Felipe Leme
Browse files

Added DISALLOW_CONTENT_CAPTURE to UserRestrictionsUtils. 

Also fixed FrameworkResourcesServiceNameResolver.isDefaultServiceEnabled()

Test: atest MixedManagedProfileOwnerTest#testDisallowContentCapture_allowed \
            MixedManagedProfileOwnerTest#testSetUserRestrictionLogged \
            MixedDeviceOwnerTest#testDisallowContentCapture_allowed \
            MixedDeviceOwnerTest#testSetUserRestrictionLogged \
            MixedProfileOwnerTest#testDisallowContentCapture_allowed \
            MixedProfileOwnerTest#testSetUserRestrictionLogged \
Bug: 123406031

Change-Id: If80257a1023229adcb19f41c90deb2de07ab6c7c
parent a4cceec0

services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerServiceShellCommand.java

+0 −3
Original line number Diff line number Diff line
@@ -77,15 +77,12 @@ public final class ContentCaptureManagerServiceShellCommand extends ShellCommand 
            pw.println("    Temporarily (for DURATION ms) changes the service implemtation.");

            pw.println("    To reset, call with just the USER_ID argument.");

            pw.println("");

            pw.println("");

            pw.println("  set default-service-enabled USER_ID [true|false]");

            pw.println("    Enable / disable the default service for the user.");

            pw.println("");

            pw.println("");

            pw.println("  get default-service-enabled USER_ID");

            pw.println("    Checks whether the default service is enabled for the user.");

            pw.println("");

            pw.println("");

            pw.println("  list sessions [--user USER_ID]");

            pw.println("    Lists all pending sessions.");

            pw.println("");

services/core/java/com/android/server/infra/FrameworkResourcesServiceNameResolver.java

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ public final class FrameworkResourcesServiceNameResolver implements ServiceNameR 
    @Override

    public boolean isDefaultServiceEnabled(int userId) {

        synchronized (mLock) {

            return mDefaultServicesDisabled.get(userId);

            return !mDefaultServicesDisabled.get(userId);

        }

    }

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_OEM_UNLOCK,

            UserManager.DISALLOW_UNMUTE_DEVICE,

            UserManager.DISALLOW_AUTOFILL,

            UserManager.DISALLOW_CONTENT_CAPTURE,

            UserManager.DISALLOW_USER_SWITCH,

            UserManager.DISALLOW_UNIFIED_PASSWORD,

            UserManager.DISALLOW_CONFIG_LOCATION,