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

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

Merge "Move device policy flag definitions client side" into main

parents fb0b1e0f 607c61b0
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ aconfig_srcjars = [
    ":aconfig_midi_flags_java_lib{.generated_srcjars}",
    ":android.service.autofill.flags-aconfig-java{.generated_srcjars}",
    ":com.android.net.flags-aconfig-java{.generated_srcjars}",
    ":device_policy_aconfig_flags_lib{.generated_srcjars}",
]

filegroup {
@@ -523,3 +524,23 @@ java_aconfig_library {
    aconfig_declarations: "com.android.net.flags-aconfig",
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}

// DevicePolicy
aconfig_declarations {
    name: "device_policy_aconfig_flags",
    package: "android.app.admin.flags",
    srcs: [
        "core/java/android/app/admin/flags/flags.aconfig",
    ],
}

java_aconfig_library {
    name: "device_policy_aconfig_flags_lib",
    aconfig_declarations: "device_policy_aconfig_flags",
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}

cc_aconfig_library {
    name: "device_policy_aconfig_flags_c_lib",
    aconfig_declarations: "device_policy_aconfig_flags",
}
+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ package android.app.admin {
    field public static final String PERMITTED_INPUT_METHODS_POLICY = "permittedInputMethods";
    field public static final String PERSONAL_APPS_SUSPENDED_POLICY = "personalAppsSuspended";
    field public static final String SCREEN_CAPTURE_DISABLED_POLICY = "screenCaptureDisabled";
    field public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";
    field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";
  }

  public class DevicePolicyManager {
+4 −0
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@

package android.app.admin;

import android.annotation.FlaggedApi;
import android.annotation.NonNull;
import android.annotation.TestApi;
import android.app.admin.flags.Flags;
import android.os.UserManager;


import java.util.Objects;

/**
@@ -164,6 +167,7 @@ public final class DevicePolicyIdentifiers {
     *
     * @hide
     */
    @FlaggedApi(Flags.FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED)
    @TestApi
    public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";

+15 −4
Original line number Diff line number Diff line
@@ -14,13 +14,18 @@
 * limitations under the License.
 */

package com.android.server.devicepolicy.flags;
package android.app.admin.flags;

import static com.android.server.devicepolicy.flags.Flags.devicePolicySizeTrackingEnabled;
import static com.android.server.devicepolicy.flags.Flags.policyEngineMigrationV2Enabled;
import static android.app.admin.flags.Flags.devicePolicySizeTrackingEnabled;
import static android.app.admin.flags.Flags.policyEngineMigrationV2Enabled;
import static android.app.admin.flags.Flags.onboardingBugreportV2Enabled;

import android.os.Binder;

/**
 *
 * @hide
 */
public final class FlagUtils {
    private FlagUtils() {}

@@ -35,4 +40,10 @@ public final class FlagUtils {
            return devicePolicySizeTrackingEnabled();
        });
    }

    public static boolean isOnboardingBugreportV2Enabled() {
        return Binder.withCleanCallingIdentity(() -> {
            return onboardingBugreportV2Enabled();
        });
    }
}
+9 −1
Original line number Diff line number Diff line
package: "com.android.server.devicepolicy.flags"
package: "android.app.admin.flags"

flag {
  name: "policy_engine_migration_v2_enabled"
@@ -6,9 +6,17 @@ flag {
  description: "V2 of the policy engine migrations for Android V"
  bug: "289520697"
}

flag {
  name: "device_policy_size_tracking_enabled"
  namespace: "enterprise"
  description: "Add feature to track the total policy size and have a max threshold."
  bug: "281543351"
}

flag {
  name: "onboarding_bugreport_v2_enabled"
  namespace: "enterprise"
  description: "Add feature to track required changes for enabled V2 of auto-capturing of onboarding bug reports."
  bug: "302517677"
}
 No newline at end of file
Loading