OMS: rename methods to include package downgrades
The overlay manager service handles package upgrades and downgrades the
same way: all it cares about is a difference in versions, not if the new
version has a higher or lower value. In both cases, the same family of
methods are called: onPackageUpgrading and onPackageUpgraded.
Rename onPackageUpgrading and onPackageUpgraded to onPackageReplacing
and onPackageReplaced to better highlight that both upgrades and
downgrades are supported.
Test: atest OverlayDeviceTests OverlayHostTests
Change-Id: I04c5c550f504114c22bb30d35c9f2809194d2543
diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
index 13ff873..6e98d6e 100644
--- a/services/core/java/com/android/server/om/OverlayManagerService.java
+++ b/services/core/java/com/android/server/om/OverlayManagerService.java
@@ -345,7 +345,7 @@
switch (action) {
case ACTION_PACKAGE_ADDED:
if (replacing) {
- onPackageUpgraded(packageName, userIds);
+ onPackageReplaced(packageName, userIds);
} else {
onPackageAdded(packageName, userIds);
}
@@ -355,7 +355,7 @@
break;
case ACTION_PACKAGE_REMOVED:
if (replacing) {
- onPackageUpgrading(packageName, userIds);
+ onPackageReplacing(packageName, userIds);
} else {
onPackageRemoved(packageName, userIds);
}
@@ -412,16 +412,16 @@
}
}
- private void onPackageUpgrading(@NonNull final String packageName,
+ private void onPackageReplacing(@NonNull final String packageName,
@NonNull final int[] userIds) {
try {
- traceBegin(TRACE_TAG_RRO, "OMS#onPackageUpgrading " + packageName);
+ traceBegin(TRACE_TAG_RRO, "OMS#onPackageReplacing " + packageName);
for (int userId : userIds) {
synchronized (mLock) {
mPackageManager.forgetPackageInfo(packageName, userId);
final OverlayInfo oi = mImpl.getOverlayInfo(packageName, userId);
if (oi != null) {
- mImpl.onOverlayPackageUpgrading(packageName, userId);
+ mImpl.onOverlayPackageReplacing(packageName, userId);
}
}
}
@@ -430,10 +430,10 @@
}
}
- private void onPackageUpgraded(@NonNull final String packageName,
+ private void onPackageReplaced(@NonNull final String packageName,
@NonNull final int[] userIds) {
try {
- traceBegin(TRACE_TAG_RRO, "OMS#onPackageUpgraded " + packageName);
+ traceBegin(TRACE_TAG_RRO, "OMS#onPackageReplaced " + packageName);
for (int userId : userIds) {
synchronized (mLock) {
final PackageInfo pi = mPackageManager.getPackageInfo(packageName, userId,
@@ -441,9 +441,9 @@
if (pi != null) {
mPackageManager.cachePackageInfo(packageName, userId, pi);
if (pi.isOverlayPackage()) {
- mImpl.onOverlayPackageUpgraded(packageName, userId);
+ mImpl.onOverlayPackageReplaced(packageName, userId);
} else {
- mImpl.onTargetPackageUpgraded(packageName, userId);
+ mImpl.onTargetPackageReplaced(packageName, userId);
}
}
}