From 73ffe6dcae697030c2efb4b923f77f773db226d7 Mon Sep 17 00:00:00 2001
From: Pavel Grafov <pgrafov@google.com>
Date: Wed, 8 Feb 2023 17:36:33 +0000
Subject: [PATCH] Clear identity in LockSettingsInternal.getUserPasswordMetrics

It is an implementation of LockSettingsInternal API which
is callable only within system server, so permission check
seems unnecessary.

Bug: 256170784
Bug: 268313443
Test: manual with TestDPC
Change-Id: I123402351ed1e69bea9a2496a07fd57e6d467e14
---
 .../com/android/server/locksettings/LockSettingsService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 1457bffc13f19..d61e45b38258f 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -3439,10 +3439,10 @@ public class LockSettingsService extends ILockSettings.Stub {
                     Slog.w(TAG, "Querying password metrics for unified challenge profile: "
                             + userHandle);
                 }
+                return LockSettingsService.this.getUserPasswordMetrics(userHandle);
             } finally {
                 Binder.restoreCallingIdentity(identity);
             }
-            return LockSettingsService.this.getUserPasswordMetrics(userHandle);
         }
 
         @Override