diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-11-10 15:30:14 -0800 |
|---|---|---|
| committer | Sudheer Shanka <sudheersai@google.com> | 2016-11-14 12:59:11 -0800 |
| commit | acb1a61f3f1309fadbf762f4273fc6f641927586 (patch) | |
| tree | 388cbd2dc8ce34a060cc7935e2f90ed50ff13e6f /src/com/android/settings/Utils.java | |
| parent | 28cd8cba419324250bed07903bb5ac27e59f0700 (diff) | |
| download | packages_apps_Settings-acb1a61f3f1309fadbf762f4273fc6f641927586.tar.gz packages_apps_Settings-acb1a61f3f1309fadbf762f4273fc6f641927586.tar.bz2 packages_apps_Settings-acb1a61f3f1309fadbf762f4273fc6f641927586.zip | |
Update usage of ActivityManagerNative.
Bug: 30977067
Test: N/A
Change-Id: I46e37a09cff059d2784a819bc2651d6973fbd268
Diffstat (limited to 'src/com/android/settings/Utils.java')
| -rw-r--r-- | src/com/android/settings/Utils.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 6f4482cb49..835757c5e0 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -18,7 +18,6 @@ package com.android.settings; import android.annotation.Nullable; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AlertDialog; import android.app.AppGlobals; import android.app.Dialog; @@ -648,7 +647,7 @@ public final class Utils extends com.android.settingslib.Utils { public static UserHandle getSecureTargetUser(IBinder activityToken, UserManager um, @Nullable Bundle arguments, @Nullable Bundle intentExtras) { UserHandle currentUser = new UserHandle(UserHandle.myUserId()); - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); try { String launchedFromPackage = am.getLaunchedFromPackage(activityToken); boolean launchedFromSettingsApp = SETTINGS_PACKAGE_NAME.equals(launchedFromPackage); @@ -698,7 +697,7 @@ public final class Utils extends com.android.settingslib.Utils { public static UserHandle getInsecureTargetUser(IBinder activityToken, @Nullable Bundle arguments, @Nullable Bundle intentExtras) { UserHandle currentUser = new UserHandle(UserHandle.myUserId()); - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); try { UserHandle launchedFromUser = new UserHandle(UserHandle.getUserId( am.getLaunchedFromUid(activityToken))); @@ -1117,7 +1116,7 @@ public final class Utils extends com.android.settingslib.Utils { public static boolean unlockWorkProfileIfNecessary(Context context, int userId) { try { - if (!ActivityManagerNative.getDefault().isUserRunning(userId, + if (!ActivityManager.getService().isUserRunning(userId, ActivityManager.FLAG_AND_LOCKED)) { return false; } |