Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle remaining hidden API usages"

Browse Source
This commit is contained in:
Sungsoo Lim
2019-01-23 19:22:20 +00:00
committed by Android (Google) Code Review
parent 38ab96e07a d1e6f65652
commit 070aba8e54
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/system-current.txt
View File

@@ -3394,6 +3394,15 @@ package android.media {
method @NonNull public android.media.TimedMetaData.Builder setTimedMetaData(long, @NonNull byte[]);
}
public abstract class VolumeProvider {
method public void setCallback(android.media.VolumeProvider.Callback);
}
public abstract static class VolumeProvider.Callback {
ctor public VolumeProvider.Callback();
method public abstract void onVolumeChanged(android.media.VolumeProvider);
}
}
package android.media.audiopolicy {
@@ -3569,6 +3578,10 @@ package android.media.session {
method public void onSetMediaButtonEventDelegate(@NonNull android.media.session.MediaSessionEngine.MediaButtonEventDelegate);
}
public static final class MediaSession.Token implements android.os.Parcelable {
method public android.media.session.ControllerLink getControllerLink();
}
public final class MediaSessionEngine implements java.lang.AutoCloseable {
ctor public MediaSessionEngine(@NonNull android.content.Context, @NonNull android.media.session.SessionLink, @NonNull android.media.session.SessionCallbackLink, @NonNull android.media.session.MediaSessionEngine.CallbackStub, int);
method public void close();

3
media/java/android/media/VolumeProvider.java
View File

@@ -16,6 +16,7 @@
package android.media;
import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.media.session.MediaSession;
import java.lang.annotation.Retention;
@@ -147,6 +148,7 @@ public abstract class VolumeProvider {
* Sets a callback to receive volume changes.
* @hide
*/
@SystemApi
public void setCallback(Callback callback) {
mCallback = callback;
}
@@ -155,6 +157,7 @@ public abstract class VolumeProvider {
* Listens for changes to the volume.
* @hide
*/
@SystemApi
public static abstract class Callback {
public abstract void onVolumeChanged(VolumeProvider volumeProvider);
}

6
media/java/android/media/session/ControllerCallbackLink.java
View File

@@ -315,12 +315,6 @@ public final class ControllerCallbackLink implements Parcelable {
}
private void ensureMediaControlPermission() {
// Allow API calls from the System UI
if (mContext.checkCallingPermission(android.Manifest.permission.STATUS_BAR_SERVICE)
== PackageManager.PERMISSION_GRANTED) {
return;
}
// Check if it's system server or has MEDIA_CONTENT_CONTROL.
// Note that system server doesn't have MEDIA_CONTENT_CONTROL, so we need extra
// check here.

2
media/java/android/media/session/MediaSession.java
View File

@@ -481,7 +481,7 @@ public final class MediaSession {
* @hide
*/
@SystemApi
ControllerLink getControllerLink() {
public ControllerLink getControllerLink() {
return mControllerLink;
}

6
media/java/android/media/session/SessionCallbackLink.java
View File

@@ -944,12 +944,6 @@ public final class SessionCallbackLink implements Parcelable {
}
private void ensureMediaControlPermission() {
// Allow API calls from the System UI
if (mContext.checkCallingPermission(android.Manifest.permission.STATUS_BAR_SERVICE)
== PackageManager.PERMISSION_GRANTED) {
return;
}
// Check if it's system server or has MEDIA_CONTENT_CONTROL.
// Note that system server doesn't have MEDIA_CONTENT_CONTROL, so we need extra
// check here.