From a2a6be113f263bc12c81d3c81069f592cc76a6c7 Mon Sep 17 00:00:00 2001 From: Dongwon Kang Date: Tue, 22 Mar 2016 15:22:18 -0700 Subject: [PATCH] MediaResourceMonitor: Change argument type from string to int Bug: 27529962 Change-Id: Ic4228aa74c9730134c61a2668932c6ab3b785afc --- include/binder/IMediaResourceMonitor.h | 9 +++++++-- libs/binder/IMediaResourceMonitor.cpp | 13 ++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/binder/IMediaResourceMonitor.h b/include/binder/IMediaResourceMonitor.h index b7b9c50eb9..c671f7a529 100644 --- a/include/binder/IMediaResourceMonitor.h +++ b/include/binder/IMediaResourceMonitor.h @@ -27,8 +27,13 @@ class IMediaResourceMonitor : public IInterface { public: DECLARE_META_INTERFACE(MediaResourceMonitor); - virtual void notifyResourceGranted(/*in*/ int32_t pid, /*in*/ const String16& type, - /*in*/ const String16& subType, /*in*/ int64_t value) = 0; + // Values should be in sync with Intent.EXTRA_MEDIA_RESOURCE_TYPE_XXX. + enum { + TYPE_VIDEO_CODEC = 0, + TYPE_AUDIO_CODEC = 1, + }; + + virtual void notifyResourceGranted(/*in*/ int32_t pid, /*in*/ const int32_t type) = 0; enum { NOTIFY_RESOURCE_GRANTED = IBinder::FIRST_CALL_TRANSACTION, diff --git a/libs/binder/IMediaResourceMonitor.cpp b/libs/binder/IMediaResourceMonitor.cpp index e8deb4a955..4800f5ba61 100644 --- a/libs/binder/IMediaResourceMonitor.cpp +++ b/libs/binder/IMediaResourceMonitor.cpp @@ -28,15 +28,12 @@ public: BpMediaResourceMonitor(const sp& impl) : BpInterface(impl) {} - virtual void notifyResourceGranted(/*in*/ int32_t pid, /*in*/ const String16& type, - /*in*/ const String16& subType, /*in*/ int64_t value) + virtual void notifyResourceGranted(/*in*/ int32_t pid, /*in*/ const int32_t type) { Parcel data, reply; data.writeInterfaceToken(IMediaResourceMonitor::getInterfaceDescriptor()); data.writeInt32(pid); - data.writeString16(type); - data.writeString16(subType); - data.writeInt64(value); + data.writeInt32(type); remote()->transact(NOTIFY_RESOURCE_GRANTED, data, &reply, IBinder::FLAG_ONEWAY); } }; @@ -51,10 +48,8 @@ status_t BnMediaResourceMonitor::onTransact( uint32_t code, const Parcel& data, case NOTIFY_RESOURCE_GRANTED: { CHECK_INTERFACE(IMediaResourceMonitor, data, reply); int32_t pid = data.readInt32(); - const String16 type = data.readString16(); - const String16 subType = data.readString16(); - int64_t value = data.readInt64(); - notifyResourceGranted(/*in*/ pid, /*in*/ type, /*in*/ subType, /*in*/ value); + const int32_t type = data.readInt32(); + notifyResourceGranted(/*in*/ pid, /*in*/ type); return NO_ERROR; } break; default: -- 2.11.0