diff options
| author | 2019-03-04 21:39:06 +0000 | |
|---|---|---|
| committer | 2019-03-04 21:39:06 +0000 | |
| commit | 0932f508f3b4a1d2e225486ef1fa11af8ee6f06e (patch) | |
| tree | ffab7a6a29ec914999825c78d44bef72e4ec6b8b | |
| parent | 0add7733f3ab8e6e271415171c52ef06925deabd (diff) | |
| parent | 0f95b328d073951082e15e5c213cc9a325b746bb (diff) | |
Merge "Addresses API review feedback on AudioProductStrategies"
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/audiopolicy/AudioProductStrategies.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 0758b4d1b9b7..99a17808dd61 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3678,7 +3678,7 @@ package android.media.audiopolicy { method @Nullable public android.media.audiopolicy.AudioProductStrategy getProductStrategyForAudioAttributes(@NonNull android.media.AudioAttributes); method public int getVolumeGroupIdForAttributes(@NonNull android.media.AudioAttributes); method public int getVolumeGroupIdForLegacyStreamType(int); - method public java.util.Iterator<android.media.audiopolicy.AudioProductStrategy> iterator(); + method @NonNull public java.util.Iterator<android.media.audiopolicy.AudioProductStrategy> iterator(); method public int size(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioProductStrategies> CREATOR; diff --git a/media/java/android/media/audiopolicy/AudioProductStrategies.java b/media/java/android/media/audiopolicy/AudioProductStrategies.java index 98b6d97ec992..c305b683f136 100644 --- a/media/java/android/media/audiopolicy/AudioProductStrategies.java +++ b/media/java/android/media/audiopolicy/AudioProductStrategies.java @@ -85,7 +85,7 @@ public final class AudioProductStrategies implements Iterable<AudioProductStrate * Returns an {@link Iterator} */ @Override - public Iterator<AudioProductStrategy> iterator() { + public @NonNull Iterator<AudioProductStrategy> iterator() { return mAudioProductStrategyList.iterator(); } |