am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular...

* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService

diff --cc services/core/java/com/android/server/AlarmManagerService.java
index 5d86b38,c14ed8b..e534a88
--- 1/services/core/java/com/android/server/AlarmManagerService.java
--- 2/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@@ -1063,10 -1046,10 +1070,11 @@@ class AlarmManagerService extends Syste
      private native void close(long nativeData);
      private native void set(long nativeData, int type, long seconds, long nanoseconds);
      private native int waitForAlarm(long nativeData);
+     private native int setKernelTime(long nativeData, long millis);
      private native int setKernelTimezone(long nativeData, int minuteswest);
  
 -    void triggerAlarmsLocked(ArrayList<Alarm> triggerList, long nowELAPSED, long nowRTC) {
 +    void triggerAlarmsLocked(ArrayList<Alarm> triggerList, final long nowELAPSED,
 +            final long nowRTC) {
          // batches are temporally sorted, so we need only pull from the
          // start of the list until we either empty it or hit a batch
          // that is not yet deliverable