Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60b85827 authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge \"MediaResourceMonitor: Send broadcast to current users\" into nyc-mr1-dev 

am: 7f4f52cb

Change-Id: I9a35cebe9e4d645733e71b82b52a2c7d5e6c0e84
parents 1e0f58ac 7f4f52cb

services/core/java/com/android/server/media/MediaResourceMonitorService.java

+15 −6
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.media.IMediaResourceMonitor; 
import android.os.Binder;

import android.os.Binder;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import com.android.server.SystemService;

import com.android.server.SystemService;
@@ -59,12 +60,20 @@ public class MediaResourceMonitorService extends SystemService { 
            final long identity = Binder.clearCallingIdentity();

            final long identity = Binder.clearCallingIdentity();

            try {

            try {

                String pkgNames[] = getPackageNamesFromPid(pid);

                String pkgNames[] = getPackageNamesFromPid(pid);

                if (pkgNames != null) {

                if (pkgNames == null) {

                    return;

                }

                UserManager manager = (UserManager) getContext().getSystemService(

                        Context.USER_SERVICE);

                int[] userIds = manager.getEnabledProfileIds(ActivityManager.getCurrentUser());

                if (userIds == null || userIds.length == 0) {

                    return;

                }

                Intent intent = new Intent(Intent.ACTION_MEDIA_RESOURCE_GRANTED);

                Intent intent = new Intent(Intent.ACTION_MEDIA_RESOURCE_GRANTED);

                intent.putExtra(Intent.EXTRA_PACKAGES, pkgNames);

                intent.putExtra(Intent.EXTRA_PACKAGES, pkgNames);

                intent.putExtra(Intent.EXTRA_MEDIA_RESOURCE_TYPE, type);

                intent.putExtra(Intent.EXTRA_MEDIA_RESOURCE_TYPE, type);

                    getContext().sendBroadcastAsUser(intent,

                for (int userId : userIds) {

                            new UserHandle(ActivityManager.getCurrentUser()),

                    getContext().sendBroadcastAsUser(intent, UserHandle.of(userId),

                            android.Manifest.permission.RECEIVE_MEDIA_RESOURCE_USAGE);

                            android.Manifest.permission.RECEIVE_MEDIA_RESOURCE_USAGE);

                }

                }

            } finally {

            } finally {