Made AlarmClockInfo a nested class in AlarmManager (235510e6) · Commits · e / os / android_frameworks_base

api/current.txt

+11 −11

Original line number	Diff line number	Diff line
		@@ -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);

core/java/android/app/AlarmClockInfo.java

deleted100644 → 0

+0 −101

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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
		*/

		package android.app;

		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* An immutable description of an alarm clock.
		*
		* @see AlarmManager#setAlarmClock
		* @see AlarmManager#getNextAlarmClock
		*/
		public class AlarmClockInfo implements Parcelable {

		private final long mTriggerTime;
		private final PendingIntent mShowIntent;

		/**
		* Creates a new alarm clock description.
		*
		* @param triggerTime time at which the underlying alarm is triggered in wall time milliseconds
		* since the epoch
		* @param showIntent an intent that can be used to show or edit details of
		* the alarm clock.
		*/
		public AlarmClockInfo(long triggerTime, PendingIntent showIntent) {
		mTriggerTime = triggerTime;
		mShowIntent = showIntent;
		}

		/**
		* Use the {@link #CREATOR}
		* @hide
		*/
		AlarmClockInfo(Parcel in) {
		mTriggerTime = in.readLong();
		mShowIntent = in.readParcelable(PendingIntent.class.getClassLoader());
		}

		/**
		* Returns the time at which the alarm is going to trigger.
		*
		* This value is UTC wall clock time in milliseconds, as returned by
		* {@link System#currentTimeMillis()} for example.
		*/
		public long getTriggerTime() {
		return mTriggerTime;
		}

		/**
		* Returns an intent intent that can be used to show or edit details of the alarm clock in
		* the application that scheduled it.
		*
		* <p class="note">Beware that any application can retrieve and send this intent, potentially
		* with additional fields filled in. See
		* {@link PendingIntent#send(android.content.Context, int, android.content.Intent)
		* PendingIntent.send()} and {@link android.content.Intent#fillIn Intent.fillIn()}
		* for details.
		*/
		public PendingIntent getShowIntent() {
		return mShowIntent;
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeLong(mTriggerTime);
		dest.writeParcelable(mShowIntent, flags);
		}

		public static final Creator<AlarmClockInfo> CREATOR = new Creator<AlarmClockInfo>() {
		@Override
		public AlarmClockInfo createFromParcel(Parcel in) {
		return new AlarmClockInfo(in);
		}

		@Override
		public AlarmClockInfo[] newArray(int size) {
		return new AlarmClockInfo[size];
		}
		};
		}

core/java/android/app/AlarmClockInfo.aidl→core/java/android/app/AlarmManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,4 +16,4 @@

		package android.app;

		parcelable AlarmClockInfo;
		parcelable AlarmManager.AlarmClockInfo;

core/java/android/app/AlarmManager.java

+84 −0

Original line number	Diff line number	Diff line
		@@ -20,9 +20,12 @@ import android.annotation.SdkConstant;
		import android.content.Context;
		import android.content.Intent;
		import android.os.Build;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.os.WorkSource;
		import android.os.Parcelable.Creator;

		/**
		* This class provides access to the system alarm services. These allow you
		@@ -579,4 +582,85 @@ public class AlarmManager
		return null;
		}
		}

		/**
		* An immutable description of an alarm clock.
		*
		* @see AlarmManager#setAlarmClock
		* @see AlarmManager#getNextAlarmClock
		*/
		public static final class AlarmClockInfo implements Parcelable {

		private final long mTriggerTime;
		private final PendingIntent mShowIntent;

		/**
		* Creates a new alarm clock description.
		*
		* @param triggerTime time at which the underlying alarm is triggered in wall time
		* milliseconds since the epoch
		* @param showIntent an intent that can be used to show or edit details of
		* the alarm clock.
		*/
		public AlarmClockInfo(long triggerTime, PendingIntent showIntent) {
		mTriggerTime = triggerTime;
		mShowIntent = showIntent;
		}

		/**
		* Use the {@link #CREATOR}
		* @hide
		*/
		AlarmClockInfo(Parcel in) {
		mTriggerTime = in.readLong();
		mShowIntent = in.readParcelable(PendingIntent.class.getClassLoader());
		}

		/**
		* Returns the time at which the alarm is going to trigger.
		*
		* This value is UTC wall clock time in milliseconds, as returned by
		* {@link System#currentTimeMillis()} for example.
		*/
		public long getTriggerTime() {
		return mTriggerTime;
		}

		/**
		* Returns an intent intent that can be used to show or edit details of the alarm clock in
		* the application that scheduled it.
		*
		* <p class="note">Beware that any application can retrieve and send this intent,
		* potentially with additional fields filled in. See
		* {@link PendingIntent#send(android.content.Context, int, android.content.Intent)
		* PendingIntent.send()} and {@link android.content.Intent#fillIn Intent.fillIn()}
		* for details.
		*/
		public PendingIntent getShowIntent() {
		return mShowIntent;
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeLong(mTriggerTime);
		dest.writeParcelable(mShowIntent, flags);
		}

		public static final Creator<AlarmClockInfo> CREATOR = new Creator<AlarmClockInfo>() {
		@Override
		public AlarmClockInfo createFromParcel(Parcel in) {
		return new AlarmClockInfo(in);
		}

		@Override
		public AlarmClockInfo[] newArray(int size) {
		return new AlarmClockInfo[size];
		}
		};
		}
		}

core/java/android/app/IAlarmManager.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		*/
		package android.app;

		import android.app.AlarmClockInfo;
		import android.app.AlarmManager;
		import android.app.PendingIntent;
		import android.os.WorkSource;

		@@ -29,11 +29,11 @@ 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,
		in AlarmClockInfo alarmClock);
		in AlarmManager.AlarmClockInfo alarmClock);
		boolean setTime(long millis);
		void setTimeZone(String zone);
		void remove(in PendingIntent operation);
		AlarmClockInfo getNextAlarmClock(int userId);
		AlarmManager.AlarmClockInfo getNextAlarmClock(int userId);
		}