summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2019-02-22 11:53:12 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-22 11:53:12 -0800
commit5ba3f1622d4b0a4cf3e47bc28f4fd25bf051cfb8 (patch)
treefbd6ea7715561bca837f20fb050d5b2c83074b45
parente4cd8fe5e026db7cfe28aeec8e211986e3c955a6 (diff)
parentda40e61fe0380fa69bd6885c6d4f3719cea7e8b7 (diff)
downloadTimeZoneUpdater-5ba3f1622d4b0a4cf3e47bc28f4fd25bf051cfb8.tar.gz
Track RulesManagerService frameworks/base changes
am: da40e61fe0 Change-Id: Ifbbf95e5966aa61336e60955e563b8967973f31b
-rw-r--r--src/main/com/android/timezone/updater/RulesCheckReceiver.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/com/android/timezone/updater/RulesCheckReceiver.java b/src/main/com/android/timezone/updater/RulesCheckReceiver.java
index 003b2e4..f40fb00 100644
--- a/src/main/com/android/timezone/updater/RulesCheckReceiver.java
+++ b/src/main/com/android/timezone/updater/RulesCheckReceiver.java
@@ -163,7 +163,7 @@ public class RulesCheckReceiver extends BroadcastReceiver {
// is installed then the system will treat this as a no-op, and if something is installed
// this will stage an uninstall.
// We could install the distro from an app contained in the system image but we assume it's
- // going to contain the same time zone data as in /system and would be a no op.
+ // going to contain the same time zone data as the base version and would be a no op.
ApplicationInfo applicationInfo = providerInfo.applicationInfo;
// isPrivilegedApp() => initial install directory for app /system/priv-app (required)
@@ -216,8 +216,8 @@ public class RulesCheckReceiver extends BroadcastReceiver {
// Decide whether to proceed with the install.
RulesState rulesState = mRulesManager.getRulesState();
if (!rulesState.isDistroFormatVersionSupported(distroFormatVersion)
- || rulesState.isSystemVersionNewerThan(distroRulesVersion)) {
- Log.d(TAG, "Candidate distro is not supported or is not better than system version.");
+ || rulesState.isBaseVersionNewerThan(distroRulesVersion)) {
+ Log.d(TAG, "Candidate distro is not supported or is not better than base version.");
// Nothing to do.
handleCheckComplete(checkToken, true /* success */);
return;