Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev am: ac7f215124

am: 17d5e9a028

Change-Id: I55e393d1abf4b2302f90945783791208e658c632
This commit is contained in:
Jean-Michel Trivi
2017-04-20 17:41:51 +00:00
committed by android-build-merger
4 changed files with 0 additions and 26 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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