Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev am: ac7f215124
am: 17d5e9a028
Change-Id: I55e393d1abf4b2302f90945783791208e658c632
This commit is contained in:
@@ -20930,7 +20930,6 @@ package android.media {
|
||||
method public int getContentType();
|
||||
method public int getFlags();
|
||||
method public int getUsage();
|
||||
method public static deprecated int getVolumeControlStream(android.media.AudioAttributes);
|
||||
method public int getVolumeControlStream();
|
||||
method public void writeToParcel(android.os.Parcel, int);
|
||||
field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3
|
||||
|
||||
@@ -22712,7 +22712,6 @@ package android.media {
|
||||
method public int getContentType();
|
||||
method public int getFlags();
|
||||
method public int getUsage();
|
||||
method public static deprecated int getVolumeControlStream(android.media.AudioAttributes);
|
||||
method public int getVolumeControlStream();
|
||||
method public void writeToParcel(android.os.Parcel, int);
|
||||
field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3
|
||||
|
||||
@@ -21037,7 +21037,6 @@ package android.media {
|
||||
method public int getContentType();
|
||||
method public int getFlags();
|
||||
method public int getUsage();
|
||||
method public static deprecated int getVolumeControlStream(android.media.AudioAttributes);
|
||||
method public int getVolumeControlStream();
|
||||
method public void writeToParcel(android.os.Parcel, int);
|
||||
field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3
|
||||
|
||||
Reference in New Issue
Block a user