diff options
| author | Jose Lima <joselima@google.com> | 2014-08-13 12:50:01 -0700 |
|---|---|---|
| committer | Jose Ricardo Lima <joselima@google.com> | 2014-08-14 02:10:41 +0000 |
| commit | 235510e67210f90de30c2d5582a2077ccc589619 (patch) | |
| tree | f03ee027a96a47c9b321521e50a29448da069c47 /api | |
| parent | 4b6c6697da5a20c08b2f9f2ca40c94008477e914 (diff) | |
| download | frameworks_base-235510e67210f90de30c2d5582a2077ccc589619.zip frameworks_base-235510e67210f90de30c2d5582a2077ccc589619.tar.gz frameworks_base-235510e67210f90de30c2d5582a2077ccc589619.tar.bz2 | |
Made AlarmClockInfo a nested class in AlarmManager
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/api/current.txt b/api/current.txt index e0df0e4..9cc3464 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3771,20 +3771,11 @@ package android.app { method public void update(android.app.ActivityOptions); } - public class AlarmClockInfo implements android.os.Parcelable { - ctor public AlarmClockInfo(long, android.app.PendingIntent); - method public int describeContents(); - method public android.app.PendingIntent getShowIntent(); - method public long getTriggerTime(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - public class AlarmManager { method public void cancel(android.app.PendingIntent); - method public android.app.AlarmClockInfo getNextAlarmClock(); + method public android.app.AlarmManager.AlarmClockInfo getNextAlarmClock(); method public void set(int, long, android.app.PendingIntent); - method public void setAlarmClock(android.app.AlarmClockInfo, android.app.PendingIntent); + method public void setAlarmClock(android.app.AlarmManager.AlarmClockInfo, android.app.PendingIntent); method public void setExact(int, long, android.app.PendingIntent); method public void setInexactRepeating(int, long, long, android.app.PendingIntent); method public void setRepeating(int, long, long, android.app.PendingIntent); @@ -3803,6 +3794,15 @@ package android.app { field public static final int RTC_WAKEUP = 0; // 0x0 } + public static final class AlarmManager.AlarmClockInfo implements android.os.Parcelable { + ctor public AlarmManager.AlarmClockInfo(long, android.app.PendingIntent); + method public int describeContents(); + method public android.app.PendingIntent getShowIntent(); + method public long getTriggerTime(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + } + public class AlertDialog extends android.app.Dialog implements android.content.DialogInterface { ctor protected AlertDialog(android.content.Context); ctor protected AlertDialog(android.content.Context, int); |