Merge "Revert "[PM] Add more logs to debug the flaky test"" into main
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
index d688a1a..824dd4a 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -44,7 +44,6 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Process;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
@@ -101,8 +100,7 @@
private int mActivityResultCode = Activity.RESULT_CANCELED;
private int mPendingUserActionReason = -1;
- private final boolean mLocalLOGV =
- TextUtils.equals("userdebug", SystemProperties.get("ro.build.type", ""));
+ private final boolean mLocalLOGV = false;
PackageManager mPm;
AppOpsManager mAppOpsManager;
UserManager mUserManager;
@@ -145,11 +143,6 @@
private AlertDialog mDialog;
private void startInstallConfirm() {
- if (mLocalLOGV) {
- Log.d(TAG, "startInstallConfirm mAppInfo = " + mAppInfo
- + ", existingUpdateOwner = " + getExistingUpdateOwner()
- + ", mOriginatingPackage = " + mOriginatingPackage);
- }
TextView viewToEnable;
if (mAppInfo != null) {
@@ -190,10 +183,6 @@
try {
final String packageName = mPkgInfo.packageName;
final InstallSourceInfo sourceInfo = mPm.getInstallSourceInfo(packageName);
- if (mLocalLOGV) {
- Log.d(TAG, "getExistingUpdateOwner mAppInfo = " + mAppInfo
- + ", packageName = " + packageName + ", sourceInfo = " + sourceInfo);
- }
return sourceInfo.getUpdateOwnerPackageName();
} catch (NameNotFoundException e) {
return null;
@@ -314,12 +303,6 @@
private void initiateInstall() {
final String existingUpdateOwner = getExistingUpdateOwner();
- if (mLocalLOGV) {
- Log.d(TAG, "initiateInstall mAppInfo = " + mAppInfo
- + ", existingUpdateOwner = " + existingUpdateOwner
- + ", mOriginatingPackage = " + mOriginatingPackage
- + ", mSessionId = " + mSessionId);
- }
if (mSessionId == SessionInfo.INVALID_ID &&
!TextUtils.isEmpty(existingUpdateOwner) &&
!TextUtils.equals(existingUpdateOwner, mOriginatingPackage)) {
@@ -831,28 +814,15 @@
@Override
public void onOpChanged(String op, String packageName) {
- if (mLocalLOGV) {
- Log.d(TAG, "UnknownSourcesListener onOpChanged op = " + op
- + ", packageName = " + packageName
- + ", mOriginatingPackage = " + mOriginatingPackage);
- }
if (!mOriginatingPackage.equals(packageName)) {
return;
}
unregister(this);
mActiveUnknownSourcesListeners.remove(this);
- if (mLocalLOGV) {
- Log.d(TAG, "UnknownSourcesListener onOpChanged isDestroyed() = "
- + isDestroyed());
- }
if (isDestroyed()) {
return;
}
new Handler(Looper.getMainLooper()).postDelayed(() -> {
- if (mLocalLOGV) {
- Log.d(TAG, "UnknownSourcesListener onOpChanged post isDestroyed()"
- + "= " + isDestroyed() + ", getIntent() = " + getIntent());
- }
if (!isDestroyed()) {
startActivity(getIntent());
// The start flag (FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP) doesn't
@@ -870,9 +840,6 @@
}
private void register(UnknownSourcesListener listener) {
- if (mLocalLOGV) {
- Log.d(TAG, "UnknownSourcesListener register");
- }
mAppOpsManager.startWatchingMode(
AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES, mOriginatingPackage,
listener);
@@ -880,9 +847,6 @@
}
private void unregister(UnknownSourcesListener listener) {
- if (mLocalLOGV) {
- Log.d(TAG, "UnknownSourcesListener unregister");
- }
mAppOpsManager.stopWatchingMode(listener);
mActiveUnknownSourcesListeners.remove(listener);
}
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index eb7c243..9e0ba84 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -1103,17 +1103,6 @@
final boolean isUpdateOwnershipEnforcementEnabled =
mPm.isUpdateOwnershipEnforcementAvailable()
&& existingUpdateOwnerPackageName != null;
-
- if (Build.IS_USERDEBUG) {
- Log.d("updateowner", "PackageInstallerSession computeUserActionRequirement"
- + " isUpdateOwnershipEnforcementEnabled= " + isUpdateOwnershipEnforcementEnabled
- + ", mPm.isUpdateOwnershipEnforcementAvailable= "
- + mPm.isUpdateOwnershipEnforcementAvailable()
- + ", existingUpdateOwnerPackageName=" + existingUpdateOwnerPackageName
- + ", isUpdateOwner= " + isUpdateOwner + ", getInstallerPackageName()= "
- + getInstallerPackageName() + ", isInstallerShell= " + isInstallerShell
- + ", mInstallerUid=" + mInstallerUid + ", packageName = " + packageName);
- }
// For an installation that un-archives an app, if the installer doesn't have the
// INSTALL_PACKAGES permission, the user should have already been prompted to confirm the
// un-archive request. There's no need for another confirmation during the installation.
@@ -1127,10 +1116,6 @@
|| isInstallUnarchive;
if (noUserActionNecessary) {
- if (Build.IS_USERDEBUG) {
- Log.d("updateowner", "PackageInstallerSession computeUserActionRequirement"
- + " noUserActionNecessary userActionNotTypicallyNeededResponse");
- }
return userActionNotTypicallyNeededResponse;
}
@@ -1140,27 +1125,15 @@
&& !isInstallerShell
// We don't enforce the update ownership for the managed user and profile.
&& !isFromManagedUserOrProfile) {
- if (Build.IS_USERDEBUG) {
- Log.d("updateowner", "PackageInstallerSession computeUserActionRequirement"
- + "USER_ACTION_REQUIRED_UPDATE_OWNER_REMINDER");
- }
return USER_ACTION_REQUIRED_UPDATE_OWNER_REMINDER;
}
if (isPermissionGranted) {
- if (Build.IS_USERDEBUG) {
- Log.d("updateowner", "PackageInstallerSession computeUserActionRequirement"
- + " permission userActionNotTypicallyNeededResponse");
- }
return userActionNotTypicallyNeededResponse;
}
if (snapshot.isInstallDisabledForPackage(getInstallerPackageName(), mInstallerUid,
userId)) {
- if (Build.IS_USERDEBUG) {
- Log.d("updateowner", "PackageInstallerSession computeUserActionRequirement"
- + " disable USER_ACTION_REQUIRED");
- }
// show the installer to account for device policy or unknown sources use cases
return USER_ACTION_REQUIRED;
}
@@ -1169,17 +1142,9 @@
&& isUpdateWithoutUserActionPermissionGranted
&& ((isUpdateOwnershipEnforcementEnabled ? isUpdateOwner
: isInstallerOfRecord) || isSelfUpdate)) {
- if (Build.IS_USERDEBUG) {
- Log.d("updateowner", "PackageInstallerSession computeUserActionRequirement"
- + " USER_ACTION_PENDING_APK_PARSING");
- }
return USER_ACTION_PENDING_APK_PARSING;
}
- if (Build.IS_USERDEBUG) {
- Log.d("updateowner", "PackageInstallerSession computeUserActionRequirement"
- + " USER_ACTION_REQUIRED");
- }
return USER_ACTION_REQUIRED;
}
@@ -2750,11 +2715,6 @@
@UserActionRequirement int userActionRequirement = USER_ACTION_NOT_NEEDED;
// TODO(b/159331446): Move this to makeSessionActiveForInstall and update javadoc
userActionRequirement = session.computeUserActionRequirement();
- if (Build.IS_USERDEBUG) {
- Log.d("updateowner", "PackageInstallerSession checkUserActionRequirement"
- + " userActionRequirement= " + userActionRequirement
- + ", session.packageName= " + session.getPackageName());
- }
session.updateUserActionRequirement(userActionRequirement);
if (userActionRequirement == USER_ACTION_REQUIRED
|| userActionRequirement == USER_ACTION_REQUIRED_UPDATE_OWNER_REMINDER) {
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 39f0380..4557769 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -340,7 +340,7 @@
static final boolean DEBUG_UPGRADE = false;
static final boolean DEBUG_DOMAIN_VERIFICATION = false;
static final boolean DEBUG_BACKUP = false;
- public static final boolean DEBUG_INSTALL = Build.IS_USERDEBUG;
+ public static final boolean DEBUG_INSTALL = false;
public static final boolean DEBUG_REMOVE = false;
static final boolean DEBUG_PACKAGE_INFO = false;
static final boolean DEBUG_INTENT_MATCHING = false;