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

Commit 153582b9 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Change flags namespace back to enterprise" into main

parents 8d682ead f4463f36

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

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ final class DevicePolicyEngine { 
    }



    /**

     * Retrieves the global policy set by the admin for the provided {@code policyDefinition} and

     * Retrieves the global policy set by the admin for the provided {@code policyDefinition}

     * if one was set, otherwise returns {@code null}.

     */

    @Nullable

services/devicepolicy/java/com/android/server/devicepolicy/flags/flags.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package: "com.android.server.devicepolicy.flags" 


flag {

  name: "policy_engine_migration_v2_enabled"

  namespace: "device_policy"

  namespace: "enterprise"

  description: "V2 of the policy engine migrations for Android V"

  bug: "289520697"

}
 
 No newline at end of file