diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-08-13 15:53:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:35 +0000 |
| commit | ceb4d418464d1b72c450c5e390b1cc7b1f92a49f (patch) | |
| tree | c70773567e517f06e2640358d3b90a705ac1bb1f /core/java/android | |
| parent | e07465fafd66a6e882890febcd688e04e6cf2c61 (diff) | |
| parent | 81f871e2b96125d57b76c07169e868e516443794 (diff) | |
| download | frameworks_base-ceb4d418464d1b72c450c5e390b1cc7b1f92a49f.zip frameworks_base-ceb4d418464d1b72c450c5e390b1cc7b1f92a49f.tar.gz frameworks_base-ceb4d418464d1b72c450c5e390b1cc7b1f92a49f.tar.bz2 | |
Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Notification.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index d8a219f..5f58839 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -279,6 +279,7 @@ public class Notification implements Parcelable * * @deprecated Use {@link #audioAttributes} instead. */ + @Deprecated public static final int STREAM_DEFAULT = -1; /** @@ -288,6 +289,7 @@ public class Notification implements Parcelable * * @deprecated Use {@link #audioAttributes} instead. */ + @Deprecated public int audioStreamType = STREAM_DEFAULT; /** @@ -2193,6 +2195,7 @@ public class Notification implements Parcelable * @deprecated use {@link #setSound(Uri, AudioAttributes)} instead. * @see Notification#sound */ + @Deprecated public Builder setSound(Uri sound, int streamType) { mSound = sound; mAudioStreamType = streamType; |