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

Commit 4e2fd163 authored by Bernard Chau's avatar Bernard Chau
Browse files

Logging getPasswordComplexity events with the calling app package name 

Every call to the method is logged regardless of permission check result

Bug: 120840632
Test: atest com.android.cts.devicepolicy.PasswordComplexityTest
Change-Id: Ie690b465a2ee1088e2e0df3fdf7733a41538fbb3
parent ffcf6e54

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

+8 −9
Original line number Diff line number Diff line
@@ -74,20 +74,14 @@ import static android.app.admin.DevicePolicyManager.WIPE_SILENTLY; 
import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;

import static android.provider.Settings.Global.PRIVATE_DNS_MODE;

import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER;















import static android.provider.Telephony.Carriers.DPC_URI;















import static android.provider.Telephony.Carriers.ENFORCE_KEY;















import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;



























import static com.android.internal.logging.nano.MetricsProto.MetricsEvent













        .PROVISIONING_ENTRY_POINT_ADB;













import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker













        .STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;

























import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.PROVISIONING_ENTRY_POINT_ADB;













import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;















import static com.android.server.devicepolicy.TransferOwnershipMetadataManager.ADMIN_TYPE_DEVICE_OWNER;















import static com.android.server.devicepolicy.TransferOwnershipMetadataManager.ADMIN_TYPE_PROFILE_OWNER;







































import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;





























import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;










@@ -240,11 +234,11 @@ import com.android.internal.util.FastXmlSerializer;













import com.android.internal.util.FunctionalUtils.ThrowingRunnable;















import com.android.internal.util.JournaledFile;















import com.android.internal.util.Preconditions;













import com.android.internal.util.StatLogger;















import com.android.internal.util.XmlUtils;















import com.android.internal.widget.LockPatternUtils;















import com.android.server.LocalServices;















import com.android.server.LockGuard;













import com.android.internal.util.StatLogger;















import com.android.server.SystemServerInitThreadPool;















import com.android.server.SystemService;















import com.android.server.devicepolicy.DevicePolicyManagerService.ActiveAdmin.TrustAgentInfo;










@@ -4771,6 +4765,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













    @Override















    @PasswordComplexity















    public int getPasswordComplexity() {













        DevicePolicyEventLogger













                .createEvent(DevicePolicyEnums.GET_USER_PASSWORD_COMPLEXITY_LEVEL)













                .setStrings(mInjector.getPackageManager()













                        .getPackagesForUid(mInjector.binderGetCallingUid()))













                .write();















        final int callingUserId = mInjector.userHandleGetCallingUserId();















        enforceUserUnlocked(callingUserId);















        mContext.enforceCallingOrSelfPermission(