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

Commit cd6a4854 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Slightly change the "pre-N" so it's CTS-friendly."

parents 18e191c1 939be877

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

+1 −1
Original line number Diff line number Diff line
@@ -3656,7 +3656,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            if (!(isProfileOwner(adminComponent, userHandle)

                    || isDeviceOwner(adminComponent, userHandle))) {

                final boolean preN = getTargetSdk(admin.info.getPackageName(), userHandle)

                        < android.os.Build.VERSION_CODES.N;

                        <= android.os.Build.VERSION_CODES.M;

                // As of N, password resetting to empty/null is not allowed anymore.

                // TODO Should we allow DO/PO to set an empty password?

                if (TextUtils.isEmpty(password)) {