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

Merge "Add IBinder extensions to TvInputService" am: 7f7a8d7bbb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10550195

Change-Id: Ic3e92b87b9ff8fff7a2204c3f68fd2c36d7549db
This commit is contained in:
Henry Fang
2020-10-24 05:20:46 +00:00
committed by Automerger Merge Worker
parent f914cf0f77 7f7a8d7bbb
commit 4c71d11d46
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -4936,6 +4936,7 @@ package android.media.tv {
}
public abstract class TvInputService extends android.app.Service {
method @Nullable public android.os.IBinder createExtension();
method @Nullable public android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo);
method @Nullable public String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);
method @Nullable public android.media.tv.TvInputInfo onHdmiDeviceAdded(android.hardware.hdmi.HdmiDeviceInfo);

25
media/java/android/media/tv/TvInputService.java
View File

@@ -152,7 +152,7 @@ public abstract class TvInputService extends Service {
@Override
public final IBinder onBind(Intent intent) {
return new ITvInputService.Stub() {
ITvInputService.Stub tvInputServiceBinder = new ITvInputService.Stub() {
@Override
public void registerCallback(ITvInputServiceCallback cb) {
if (cb != null) {
@@ -181,7 +181,8 @@ public abstract class TvInputService extends Service {
args.arg2 = cb;
args.arg3 = inputId;
args.arg4 = sessionId;
mServiceHandler.obtainMessage(ServiceHandler.DO_CREATE_SESSION, args).sendToTarget();
mServiceHandler.obtainMessage(ServiceHandler.DO_CREATE_SESSION,
args).sendToTarget();
}
@Override
@@ -228,6 +229,26 @@ public abstract class TvInputService extends Service {
deviceInfo).sendToTarget();
}
};
IBinder ext = createExtension();
if (ext != null) {
tvInputServiceBinder.setExtension(ext);
}
return tvInputServiceBinder;
}
/**
* Returns a new {@link android.os.Binder}
*
* <p> if an extension is provided on top of existing {@link TvInputService}; otherwise,
* return {@code null}. Override to provide extended interface.
*
* @see android.os.Binder#setExtension(IBinder)
* @hide
*/
@Nullable
@SystemApi
public IBinder createExtension() {
return null;
}
/**

1
non-updatable-api/system-current.txt
View File

@@ -4876,6 +4876,7 @@ package android.media.tv {
}
public abstract class TvInputService extends android.app.Service {
method @Nullable public android.os.IBinder createExtension();
method @Nullable public android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo);
method @Nullable public String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);
method @Nullable public android.media.tv.TvInputInfo onHdmiDeviceAdded(android.hardware.hdmi.HdmiDeviceInfo);