commit a2a6be113f263bc12c81d3c81069f592cc76a6c7
author Dongwon Kang <dwkang@google.com> Tue Mar 22 15:22:18 2016 -0700
committer Dongwon Kang <dwkang@google.com> Tue Mar 22 15:55:46 2016 -0700
tree 1b26270a9e0530593179e8f8e1ea5699a016d83e
parent d6c017de4238c0aa448596dae23cbdb9d10ae7fd

MediaResourceMonitor: Change argument type from string to int

Bug: 27529962
Change-Id: Ic4228aa74c9730134c61a2668932c6ab3b785afc

include/binder/IMediaResourceMonitor.h

diff --git a/include/binder/IMediaResourceMonitor.h b/include/binder/IMediaResourceMonitor.h
index b7b9c50..c671f7a 100644
--- a/include/binder/IMediaResourceMonitor.h
+++ b/include/binder/IMediaResourceMonitor.h
@@ -27,8 +27,13 @@
 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,

libs/binder/IMediaResourceMonitor.cpp

diff --git a/libs/binder/IMediaResourceMonitor.cpp b/libs/binder/IMediaResourceMonitor.cpp
index e8deb4a..4800f5b 100644
--- a/libs/binder/IMediaResourceMonitor.cpp
+++ b/libs/binder/IMediaResourceMonitor.cpp
@@ -28,15 +28,12 @@
     BpMediaResourceMonitor(const sp<IBinder>& impl)
         : BpInterface<IMediaResourceMonitor>(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 @@
         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: