Merge "RRO: Don't update overlays when target changes" into pi-dev (714184f4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/om/OverlayManagerService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -389,11 +389,16 @@ public final class OverlayManagerService extends SystemService {
		final PackageInfo pi = mPackageManager.getPackageInfo(packageName, userId,
		false);
		if (pi != null) {
		/*
		* Only update overlay settings when an overlay becomes enabled or disabled.
		* Enabling or disabling components of a target should not change the
		* target's overlays. Since, overlays do not have components, this will only
		* update overlay settings if an overlay package becomes enabled or
		* disabled.
		*/
		mPackageManager.cachePackageInfo(packageName, userId, pi);
		if (pi.isOverlayPackage()) {
		mImpl.onOverlayPackageChanged(packageName, userId);
		} else {
		mImpl.onTargetPackageChanged(packageName, userId);
		}
		}
		}

+0 −10

Original line number	Diff line number	Diff line
		@@ -212,16 +212,6 @@ final class OverlayManagerServiceImpl {
		}
		}

		void onTargetPackageChanged(@NonNull final String packageName, final int userId) {
		if (DEBUG) {
		Slog.d(TAG, "onTargetPackageChanged packageName=" + packageName + " userId=" + userId);
		}

		if (updateAllOverlaysForTarget(packageName, userId, 0)) {
		mListener.onOverlaysChanged(packageName, userId);
		}
		}

		void onTargetPackageUpgrading(@NonNull final String packageName, final int userId) {
		if (DEBUG) {
		Slog.d(TAG, "onTargetPackageUpgrading packageName=" + packageName + " userId="