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

Commit 26c97275 authored by Irem Uguz's avatar Irem Uguz Committed by Android (Google) Code Review
Browse files

Revert "Add flag checks for DPM API calls" 

This reverts commit 63d15f25.

Reason for revert: b/439508098

Change-Id: I532479c3d784ccee853ad7dd74a15c1aecf92df5
parent 63d15f25

packages/SettingsLib/RestrictedLockUtils/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ android_library { 
    srcs: ["src/**/*.java"],

    resource_dirs: ["res"],



    static_libs: [

        "device_policy_aconfig_flags_java_export",

    ],



    libs: [

        "androidx.annotation_annotation",

    ],

packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java

+2 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settingslib; 


import android.app.admin.DevicePolicyManager;

import android.app.admin.EnforcingAdmin;

import android.app.admin.flags.Flags;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -129,10 +128,8 @@ public class RestrictedLockUtils { 
        if (admin != null) {

            // Although EXTRA_ENFORCING_ADMIN contains all info from other extras, we keep them

            // to provide backward compatibility.

            if (Flags.enforcingAdminExtraEnabled()) {

            intent.putExtra(DevicePolicyManager.EXTRA_ENFORCING_ADMIN, admin);

            }

            if (Flags.enforcingAdminGetComponentNameEnabled() && admin.getComponentName() != null) {

            if (admin.getComponentName() != null) {

                intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin.getComponentName());

            }

            intent.putExtra(Intent.EXTRA_USER, admin.getUserHandle());