From 0d14e02d42b2f552dc989ed46c4bb81cd70199d9 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Tue, 1 Dec 2020 19:19:59 +0000 Subject: [PATCH] PackageManager: don't call Debug.getCallers() for an error message Debug.getCallers is expensive, so don't call it as part of a potential exception message. Test: no Debug.getCallers runtime Bug: 161323622 Change-Id: Iffe875edc3d8a7d55941642680d604a0862a7eb4 --- .../java/com/android/server/pm/PackageManagerService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index d14baf561f01a..1f371674e938c 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -260,7 +260,6 @@ import android.net.Uri; import android.os.Binder; import android.os.Build; import android.os.Bundle; -import android.os.Debug; import android.os.Environment; import android.os.FileUtils; import android.os.Handler; @@ -5529,8 +5528,7 @@ public class PackageManagerService extends IPackageManager.Stub // to the same user is not sufficient enforceCrossUserPermission(Binder.getCallingUid(), userId, false, false, !isRecentsAccessingChildProfiles(Binder.getCallingUid(), userId), - "MATCH_ANY_USER flag requires INTERACT_ACROSS_USERS permission at " - + Debug.getCallers(5)); + "MATCH_ANY_USER flag requires INTERACT_ACROSS_USERS permission"); } else if ((flags & PackageManager.MATCH_UNINSTALLED_PACKAGES) != 0 && isCallerSystemUser && mUserManager.hasManagedProfile(UserHandle.USER_SYSTEM)) { // If the caller wants all packages and has a restricted profile associated with it,