summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-13 07:13:03 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-13 07:13:03 +0000
commitec8b32dc1724d5a1e1dcbc711fbb2208075fb765 (patch)
tree3c7e1f775c89762e036c11cd4d3c22a1bd3d0a3e
parentc565b95b6f0f60a8f4f566af76310563feb48fc0 (diff)
parent3501ceeda1a4329812d1b8e4cd69598c62d28536 (diff)
Merge "Revert "[PM] Add more logs to debug the flaky test"" into main
-rw-r--r--services/core/java/com/android/server/pm/ComputerEngine.java23
1 files changed, 0 insertions, 23 deletions
diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index be7631d2a868..19ac1ecc9314 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -5145,28 +5145,10 @@ public class ComputerEngine implements Computer {
}
updateOwnerPackageName = installSource.mUpdateOwnerPackageName;
-
- if (DEBUG_INSTALL) {
- Log.d(TAG, "ComputerEngine getInstallSourceInfo updateOwnerPackageName = "
- + updateOwnerPackageName + ", callingUid = " + callingUid + ", packageName = "
- + packageName + ", userId = " + userId);
- }
-
if (updateOwnerPackageName != null) {
final PackageStateInternal ps = mSettings.getPackage(updateOwnerPackageName);
final boolean isCallerSystemOrUpdateOwner = callingUid == Process.SYSTEM_UID
|| isCallerSameApp(updateOwnerPackageName, callingUid);
-
- if (DEBUG_INSTALL) {
- Log.d(TAG, "ComputerEngine getInstallSourceInfo ps = "
- + ps + ", isCallerSystemOrUpdateOwner =" + isCallerSystemOrUpdateOwner
- + ", isCallerSameApp = "
- + isCallerSameApp(updateOwnerPackageName, callingUid) + ", filter = "
- + shouldFilterApplicationIncludingUninstalled(ps, callingUid, userId)
- + ", FromManagedUserOrProfile = "
- + isCallerFromManagedUserOrProfile(userId));
- }
-
// Except for package visibility filtering, we also hide update owner if the installer
// is in the managed user or profile. As we don't enforce the update ownership for the
// managed user and profile, knowing there's an update owner is meaningless in that
@@ -5178,11 +5160,6 @@ public class ComputerEngine implements Computer {
}
}
- if (DEBUG_INSTALL) {
- Log.d(TAG, "ComputerEngine getInstallSourceInfo updateOwnerPackageName = "
- + updateOwnerPackageName);
- }
-
if (installSource.mIsInitiatingPackageUninstalled) {
// We can't check visibility in the usual way, since the initiating package is no
// longer present. So we apply simpler rules to whether to expose the info: