Merge "Remove ActivityManager#getService() API" (cb4a48c6) · Commits · e / os / android_frameworks_base

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

+6 −12

Original line number	Diff line number	Diff line
		@@ -26,9 +26,8 @@ import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.Log;
		import android.util.Slog;
		import com.android.server.SystemService;

		import java.util.List;
		import com.android.server.SystemService;

		/** This class provides a system service that monitors media resource usage. */
		public class MediaResourceMonitorService extends SystemService {
		@@ -62,8 +61,7 @@ public class MediaResourceMonitorService extends SystemService {
		if (pkgNames == null) {
		return;
		}
		UserManager manager = (UserManager) getContext().getSystemService(
		Context.USER_SERVICE);
		UserManager manager = getContext().getSystemService(UserManager.class);
		int[] userIds = manager.getEnabledProfileIds(ActivityManager.getCurrentUser());
		if (userIds == null \|\| userIds.length == 0) {
		return;
		@@ -81,16 +79,12 @@ public class MediaResourceMonitorService extends SystemService {
		}

		private String[] getPackageNamesFromPid(int pid) {
		try {
		for (ActivityManager.RunningAppProcessInfo proc :
		ActivityManager.getService().getRunningAppProcesses()) {
		ActivityManager manager = getContext().getSystemService(ActivityManager.class);
		for (ActivityManager.RunningAppProcessInfo proc : manager.getRunningAppProcesses()) {
		if (proc.pid == pid) {
		return proc.pkgList;
		}
		}
		} catch (RemoteException e) {
		Slog.w(TAG, "ActivityManager.getRunningAppProcesses() failed");
		}
		return null;
		}
		}