diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-02-21 13:04:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 13:04:00 -0800 |
| commit | 9e413bf4e562d98b6efeb157369f152edd5f0261 (patch) | |
| tree | f926e8e3778fe5a711df1b8a585e23b936624c99 /core/java/android | |
| parent | b2f07b27725bed9716114c46df2cf636eb366f6f (diff) | |
| parent | bbfc08b3abc0934f67659f3238eb79dcac838c17 (diff) | |
am bbfc08b3: Merge changes I6d4fdada,Ia34899a4
* commit 'bbfc08b3abc0934f67659f3238eb79dcac838c17':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/IAlarmManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/os/SystemClock.java | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/core/java/android/app/IAlarmManager.aidl b/core/java/android/app/IAlarmManager.aidl index 8476609c83b9..ef9f26eeb6d4 100644 --- a/core/java/android/app/IAlarmManager.aidl +++ b/core/java/android/app/IAlarmManager.aidl @@ -28,7 +28,7 @@ interface IAlarmManager { /** windowLength == 0 means exact; windowLength < 0 means the let the OS decide */ void set(int type, long triggerAtTime, long windowLength, long interval, in PendingIntent operation, in WorkSource workSource); - void setTime(long millis); + boolean setTime(long millis); void setTimeZone(String zone); void remove(in PendingIntent operation); } diff --git a/core/java/android/os/SystemClock.java b/core/java/android/os/SystemClock.java index 729c64bfad0c..672df6d4da81 100644 --- a/core/java/android/os/SystemClock.java +++ b/core/java/android/os/SystemClock.java @@ -16,6 +16,9 @@ package android.os; +import android.app.IAlarmManager; +import android.content.Context; +import android.util.Slog; /** * Core timekeeping facilities. @@ -89,6 +92,8 @@ package android.os; * </ul> */ public final class SystemClock { + private static final String TAG = "SystemClock"; + /** * This class is uninstantiable. */ @@ -134,7 +139,23 @@ public final class SystemClock { * * @return if the clock was successfully set to the specified time. */ - native public static boolean setCurrentTimeMillis(long millis); + public static boolean setCurrentTimeMillis(long millis) { + IBinder b = ServiceManager.getService(Context.ALARM_SERVICE); + IAlarmManager mgr = IAlarmManager.Stub.asInterface(b); + if (mgr == null) { + return false; + } + + try { + return mgr.setTime(millis); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to set RTC", e); + } catch (SecurityException e) { + Slog.e(TAG, "Unable to set RTC", e); + } + + return false; + } /** * Returns milliseconds since boot, not counting time spent in deep sleep. |