DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: I60b4f6474c665bc04fea1d37b32b73b1d99ac756
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..4a48145
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// A static library containing all the source needed by the TimeZoneUpdater
+java_library {
+ name: "time_zone_updater",
+ srcs: [
+ "src/main/**/*.java",
+ "src/main/**/*.logtags", // Also include generated EventLogTags from the .logtags file.
+ ],
+ static_libs: ["time_zone_distro"],
+}
+
+android_app {
+ name: "TimeZoneUpdater",
+ optimize: {
+ enabled: false,
+ },
+ static_libs: ["time_zone_updater"],
+ platform_apis: true,
+ certificate: "platform",
+ privileged: true,
+ required: ["com.android.timezone.updater.xml"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index fcbc2bd..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-# A static library containing all the source needed by the TimeZoneUpdater
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := time_zone_updater
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
-# Also include generated EventLogTags from the .logtags file.
-LOCAL_SRC_FILES += $(call all-logtags-files-under, src/main)
-LOCAL_STATIC_JAVA_LIBRARIES := time_zone_distro
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_STATIC_JAVA_LIBRARIES := time_zone_updater
-LOCAL_PACKAGE_NAME := TimeZoneUpdater
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PACKAGE)
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..8090878
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1 @@
+include platform/packages/apps/TimeZoneData:/OWNERS
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index b92b97f..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="4941707838271462527">"সময় মণ্ডল আপডে’ট কৰোঁতা"</string>
-</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index a9cd35c..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="4941707838271462527">"ସମୟ କ୍ଷେତ୍ର ଅପଡେଟର୍"</string>
-</resources>
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 @@
// 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 @@
// 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;
