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

Commit e9cfa530 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Clean up fully rolled out DumpsysPolicyEngineMigrationEnabled 

Flag was rolled out in Android V.

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I0c374ca4ee621d9745a72e827958020e42794d87
parent a5724a98

core/java/android/app/admin/flags/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -124,13 +124,6 @@ flag { 
  }

}



flag {

  name: "dumpsys_policy_engine_migration_enabled"

  namespace: "enterprise"

  description: "Update DumpSys to include information about migrated APIs in DPE"

  bug: "304999634"

}



flag {

    name: "allow_querying_profile_type"

    is_exported: true

services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java

+1 −21
Original line number Diff line number Diff line
@@ -1325,27 +1325,7 @@ class ActiveAdmin { 
        pw.print("encryptionRequested=");

        pw.println(encryptionRequested);



        if (!Flags.dumpsysPolicyEngineMigrationEnabled()) {

            pw.print("disableCamera=");

            pw.println(disableCamera);



            pw.print("disableScreenCapture=");

            pw.println(disableScreenCapture);



            pw.print("requireAutoTime=");

            pw.println(requireAutoTime);



            if (permittedInputMethods != null) {

                pw.print("permittedInputMethods=");

                pw.println(permittedInputMethods);

            }



            pw.println("userRestrictions:");

            UserRestrictionsUtils.dumpRestrictions(pw, "  ", userRestrictions);

        }



        if (!Flags.policyEngineMigrationV2Enabled()

                || !Flags.dumpsysPolicyEngineMigrationEnabled()) {

        if (!Flags.policyEngineMigrationV2Enabled()) {

            pw.print("mUsbDataSignaling=");

            pw.println(mUsbDataSignalingEnabled);

        }

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −4
Original line number Diff line number Diff line
@@ -11479,10 +11479,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                pw.println();

                mStatLogger.dump(pw);

                pw.println();

                if (Flags.dumpsysPolicyEngineMigrationEnabled()) {

                mDevicePolicyEngine.dump(pw);

                pw.println();

                }

                pw.println("Encryption Status: " + getEncryptionStatusName(getEncryptionStatus()));

                pw.println("Logout user: " + getLogoutUserIdUnchecked());

                pw.println();