diff --git a/src/com/android/mms/service/DownloadRequest.java b/src/com/android/mms/service/DownloadRequest.java
index 9463bb6..da7ffb1 100644
--- a/src/com/android/mms/service/DownloadRequest.java
+++ b/src/com/android/mms/service/DownloadRequest.java
@@ -17,7 +17,7 @@
 package com.android.mms.service;
 
 import android.app.Activity;
-import android.app.ActivityManagerNative;
+import android.app.ActivityManager;
 import android.app.AppOpsManager;
 import android.app.PendingIntent;
 import android.content.ContentValues;
@@ -200,7 +200,7 @@
         // Get a list of currently started users.
         int[] users = null;
         try {
-            users = ActivityManagerNative.getDefault().getRunningUserIds();
+            users = ActivityManager.getService().getRunningUserIds();
         } catch (RemoteException re) {
         }
         if (users == null) {
