diff options
| author | 2024-11-27 19:17:31 +0000 | |
|---|---|---|
| committer | 2024-11-27 19:17:31 +0000 | |
| commit | adbfe51ced230a26548930ff786552404fbb3629 (patch) | |
| tree | 8722214b56dc23440949d83560c4c1e4add9b285 | |
| parent | 58eb98f48816f487966c1746a7069626013657e8 (diff) | |
| parent | 15f2d4f8ab0e9caf5444634e9c0f96ea8e646485 (diff) | |
Merge "Clear calling identity when getting global security state" into main am: 70a1c29c64 am: 15f2d4f8ab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3377189
Change-Id: I18ca10e283493718579b62a3b8e3827d075686ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/SecurityStateManagerService.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/SecurityStateManagerService.java b/services/core/java/com/android/server/SecurityStateManagerService.java index 98039be20897..fe21fbda7130 100644 --- a/services/core/java/com/android/server/SecurityStateManagerService.java +++ b/services/core/java/com/android/server/SecurityStateManagerService.java @@ -22,6 +22,7 @@ import static android.os.SecurityStateManager.KEY_VENDOR_SPL; import android.content.Context; import android.content.pm.PackageManager; +import android.os.Binder; import android.os.Build; import android.os.Bundle; import android.os.ISecurityStateManager; @@ -56,6 +57,15 @@ public class SecurityStateManagerService extends ISecurityStateManager.Stub { @Override public Bundle getGlobalSecurityState() { + final long token = Binder.clearCallingIdentity(); + try { + return getGlobalSecurityStateInternal(); + } finally { + Binder.restoreCallingIdentity(token); + } + } + + private Bundle getGlobalSecurityStateInternal() { Bundle globalSecurityState = new Bundle(); globalSecurityState.putString(KEY_SYSTEM_SPL, Build.VERSION.SECURITY_PATCH); globalSecurityState.putString(KEY_VENDOR_SPL, |