Merge "Add additional log statements for BackgroundInstallControlService" into main (e6cbf6ee) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/BackgroundInstallControlService.java

+30 −5

Original line number	Diff line number	Diff line
		@@ -176,16 +176,13 @@ public class BackgroundInstallControlService extends SystemService {
		if (Flags.bicClient()) {
		mService.enforceCallerPermissions();
		}
		if (!Build.IS_DEBUGGABLE) {
		return mService.getBackgroundInstalledPackages(flags, userId);
		}
		// The debug.transparency.bg-install-apps (only works for debuggable builds)
		// is used to set mock list of background installed apps for testing.
		// The list of apps' names is delimited by ",".
		// TODO: Remove after migrating test to new background install method using
		// {@link BackgroundInstallControlCallbackHelperTest}.installPackage b/310983905
		String propertyString = SystemProperties.get("debug.transparency.bg-install-apps");
		if (TextUtils.isEmpty(propertyString)) {
		if (TextUtils.isEmpty(propertyString) \|\| !Build.IS_DEBUGGABLE) {
		return mService.getBackgroundInstalledPackages(flags, userId);
		} else {
		return mService.getMockBackgroundInstalledPackages(propertyString);
		@@ -219,10 +216,27 @@ public class BackgroundInstallControlService extends SystemService {
		PackageManager.PackageInfoFlags.of(flags), userId);

		initBackgroundInstalledPackages();
		if(Build.IS_DEBUGGABLE) {
		StringBuilder sb = new StringBuilder();
		sb.append("Tracked background installed package size: ")
		.append(mBackgroundInstalledPackages.size())
		.append("\n");
		for (int i = 0; i < mBackgroundInstalledPackages.size(); ++i) {
		int installingUserId = mBackgroundInstalledPackages.keyAt(i);
		mBackgroundInstalledPackages.get(installingUserId).forEach(pkgName ->
		sb.append("userId: ").append(installingUserId)
		.append(", name: ").append(pkgName).append("\n"));
		}
		Slog.d(TAG, "Tracked background installed package: " + sb.toString());
		}

		ListIterator<PackageInfo> iter = packages.listIterator();
		while (iter.hasNext()) {
		String packageName = iter.next().packageName;
		if (!mBackgroundInstalledPackages.contains(userId, packageName)) {
		if(Build.IS_DEBUGGABLE) {
		Slog.d(TAG, packageName + " is not tracked, removing");
		}
		iter.remove();
		}
		}
		@@ -284,6 +298,9 @@ public class BackgroundInstallControlService extends SystemService {
		}

		void handlePackageAdd(String packageName, int userId) {
		if(Build.IS_DEBUGGABLE) {
		Slog.d(TAG, "handlePackageAdd: checking " + packageName);
		}
		ApplicationInfo appInfo = null;
		try {
		appInfo =
		@@ -302,7 +319,7 @@ public class BackgroundInstallControlService extends SystemService {
		installerPackageName = installInfo.getInstallingPackageName();
		initiatingPackageName = installInfo.getInitiatingPackageName();
		} catch (PackageManager.NameNotFoundException e) {
		Slog.w(TAG, "Package's installer not found " + packageName);
		Slog.w(TAG, "Package's installer not found: " + packageName);
		return;
		}

		@@ -314,6 +331,10 @@ public class BackgroundInstallControlService extends SystemService {
		VirtualDeviceManager.PERSISTENT_DEVICE_ID_DEFAULT,
		userId)
		!= PERMISSION_GRANTED) {
		if(Build.IS_DEBUGGABLE) {
		Slog.d(TAG, "handlePackageAdd " + packageName + ": installer doesn't "
		+ "have INSTALL_PACKAGES permission, skipping");
		}
		return;
		}

		@@ -324,6 +345,10 @@ public class BackgroundInstallControlService extends SystemService {

		if (installedByAdb(initiatingPackageName)
		\|\| wasForegroundInstallation(installerPackageName, userId, installTimestamp)) {
		if(Build.IS_DEBUGGABLE) {
		Slog.d(TAG, "handlePackageAdd " + packageName + ": is installed by ADB or was "
		+ "foreground installation, skipping");
		}
		return;
		}