git push origin masterMerge branch 'luk1337-master'

3 files changed, 7 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index 27d07d6..1ac1334 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,6 +5,7 @@ LOCAL_SRC_FILES := timekeep.c
 LOCAL_MODULE := timekeep
 LOCAL_SHARED_LIBRARIES := libcutils liblog
 LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS := -DANDROID_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 25),)
 LOCAL_MODULE_OWNER := sony
 LOCAL_INIT_RC_64   := vendor/etc/init/timekeep.rc
diff --git a/src/com/sony/timekeep/TimeKeep.java b/src/com/sony/timekeep/TimeKeep.java
index 1bfe5e1..6c7e3bf 100644
--- a/src/com/sony/timekeep/TimeKeep.java
+++ b/src/com/sony/timekeep/TimeKeep.java
@@ -52,7 +52,8 @@ public class TimeKeep extends BroadcastReceiver {
 	private static final String TAG = "TimeKeep-Receiver";
 	private static final String TIMEADJ_PROP = "persist.sys.timeadjust";
 	private static final String RTC_SINCE_EPOCH = "/sys/class/rtc/rtc0/since_epoch";
-	private static final String RTC_ATS_FILE = "/data/time/ats_2";
+	private static final String RTC_ATS_FILE = android.os.Build.VERSION.SDK_INT >= 26 ?
+		"/data/vendor/time/ats_2" : "/data/time/ats_2";
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
diff --git a/timekeep.c b/timekeep.c
index 7f73332..5154573 100644
--- a/timekeep.c
+++ b/timekeep.c
@@ -44,7 +44,11 @@
 #include <errno.h>
 
 #define RTC_SYS_FILE "/sys/class/rtc/rtc0/since_epoch"
+#if ANDROID_SDK_VERSION >= 26
+#define RTC_ATS_FILE "/data/vendor/time/ats_2"
+#else
 #define RTC_ATS_FILE "/data/time/ats_2"
+#endif
 #define TIME_ADJUST_PROP "persist.sys.timeadjust"
 
 int read_epoch(unsigned long* epoch) {