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

Commit e4f14a4d authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Cleanup is_mte_policy_enforced" into main

parents de9761a2 719d1cbd

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8121,7 +8121,7 @@ package android.app.admin { 
    method public boolean isLogoutEnabled();

    method public boolean isManagedProfile(@NonNull android.content.ComponentName);

    method public boolean isMasterVolumeMuted(@NonNull android.content.ComponentName);

    method @FlaggedApi("android.app.admin.flags.is_mte_policy_enforced") public static boolean isMtePolicyEnforced();

    method public static boolean isMtePolicyEnforced();

    method public boolean isNetworkLoggingEnabled(@Nullable android.content.ComponentName);

    method public boolean isOrganizationOwnedDeviceWithManagedProfile();

    method public boolean isOverrideApnEnabled(@NonNull android.content.ComponentName);

core/java/android/app/admin/DevicePolicyManager.java

+0 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import static android.app.admin.flags.Flags.FLAG_DEVICE_THEFT_API_ENABLED; 
import static android.app.admin.flags.Flags.FLAG_DEVICE_POLICY_SIZE_TRACKING_ENABLED;

import static android.app.admin.flags.Flags.onboardingBugreportV2Enabled;

import static android.app.admin.flags.Flags.onboardingConsentlessBugreports;

import static android.app.admin.flags.Flags.FLAG_IS_MTE_POLICY_ENFORCED;

import static android.content.Intent.LOCAL_FLAG_FROM_SYSTEM;

import static android.net.NetworkCapabilities.NET_ENTERPRISE_ID_1;

import static android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE;
@@ -4232,7 +4231,6 @@ public class DevicePolicyManager { 
     *

     * @return whether MTE is currently enabled on the device.

     */

    @FlaggedApi(FLAG_IS_MTE_POLICY_ENFORCED)

    public static boolean isMtePolicyEnforced() {

        return Zygote.nativeSupportsMemoryTagging();

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ flag { 
  bug: "304999634"

}



# Fully rolled out and must not be used.

flag {

  name: "esim_management_enabled"

  is_exported: true
@@ -213,6 +214,7 @@ flag { 
  bug: "289515470"

}



# Fully rolled out and must not be used.

flag {

  name: "is_mte_policy_enforced"

  is_exported: true