From 6d8587a81cdd10741ea28ef096e8bf7fe2149be0 Mon Sep 17 00:00:00 2001 From: Dongwon Kang Date: Tue, 22 Mar 2016 15:20:40 -0700 Subject: [PATCH] MediaResourceMonitor: Change argument type from string to int Bug: 27529962 Change-Id: I29c165ccf6b44b0ca6812f1ccae758d67b225e0d --- .../android/media/IMediaResourceMonitor.aidl | 2 +- .../media/MediaResourceMonitorService.java | 22 ++++--------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/media/java/android/media/IMediaResourceMonitor.aidl b/media/java/android/media/IMediaResourceMonitor.aidl index 7b4bc3962ff17..cf0e56d1e7862 100644 --- a/media/java/android/media/IMediaResourceMonitor.aidl +++ b/media/java/android/media/IMediaResourceMonitor.aidl @@ -19,6 +19,6 @@ package android.media; /** {@hide} */ interface IMediaResourceMonitor { - oneway void notifyResourceGranted(in int pid, String type, String subType, long value); + oneway void notifyResourceGranted(in int pid, in int type); } diff --git a/services/core/java/com/android/server/media/MediaResourceMonitorService.java b/services/core/java/com/android/server/media/MediaResourceMonitorService.java index 50dd607e5a5a8..e169d638c442b 100644 --- a/services/core/java/com/android/server/media/MediaResourceMonitorService.java +++ b/services/core/java/com/android/server/media/MediaResourceMonitorService.java @@ -37,13 +37,6 @@ public class MediaResourceMonitorService extends SystemService { private static final String SERVICE_NAME = "media_resource_monitor"; - /* - * Resource types. Should be in sync with: - * frameworks/av/media/libmedia/MediaResource.cpp - */ - private static final String RESOURCE_AUDIO_CODEC = "audio-codec"; - private static final String RESOURCE_VIDEO_CODEC = "video-codec"; - private final MediaResourceMonitorImpl mMediaResourceMonitorImpl; public MediaResourceMonitorService(Context context) { @@ -58,25 +51,18 @@ public class MediaResourceMonitorService extends SystemService { class MediaResourceMonitorImpl extends IMediaResourceMonitor.Stub { @Override - public void notifyResourceGranted(int pid, String type, String subType, long value) + public void notifyResourceGranted(int pid, int type) throws RemoteException { if (DEBUG) { - Slog.d(TAG, "notifyResourceGranted(pid=" + pid + ", type=" + type + ", subType=" - + subType + ", value=" + value + ")"); + Slog.d(TAG, "notifyResourceGranted(pid=" + pid + ", type=" + type + ")"); } final long identity = Binder.clearCallingIdentity(); try { String pkgNames[] = getPackageNamesFromPid(pid); - Integer resourceType = null; - if (RESOURCE_AUDIO_CODEC.equals(subType)) { - resourceType = Intent.EXTRA_MEDIA_RESOURCE_TYPE_AUDIO_CODEC; - } else if (RESOURCE_VIDEO_CODEC.equals(subType)) { - resourceType = Intent.EXTRA_MEDIA_RESOURCE_TYPE_VIDEO_CODEC; - } - if (pkgNames != null && resourceType != null) { + if (pkgNames != null) { Intent intent = new Intent(Intent.ACTION_MEDIA_RESOURCE_GRANTED); intent.putExtra(Intent.EXTRA_PACKAGES, pkgNames); - intent.putExtra(Intent.EXTRA_MEDIA_RESOURCE_TYPE, resourceType); + intent.putExtra(Intent.EXTRA_MEDIA_RESOURCE_TYPE, type); getContext().sendBroadcastAsUser(intent, new UserHandle(ActivityManager.getCurrentUser()), android.Manifest.permission.RECEIVE_MEDIA_RESOURCE_USAGE);