PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update usage of ActivityManagerNative.

Browse Source 
Bug: 30977067
Test: N/A
Change-Id: I46e37a09cff059d2784a819bc2651d6973fbd268
This commit is contained in:
Sudheer Shanka
2016-11-10 15:30:14 -08:00
parent 28cd8cba41
commit acb1a61f3f
12 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/Utils.java
View File

@@ -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;
}