Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Call notifyLockedProfile in TrustManagerService instead of KeyguardViewMediator." into nyc-dev

Browse Source
This commit is contained in:
Nicolas Prévot
2016-04-15 09:52:54 +00:00
committed by Android (Google) Code Review
parent 88bc0bbb13 c662898a18
commit 428fdd104c
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -1215,7 +1215,6 @@ public class KeyguardViewMediator extends SystemUI {
private void lockProfile(int userId) { private void lockProfile(int userId) {
mTrustManager.setDeviceLockedForUser(userId, true); mTrustManager.setDeviceLockedForUser(userId, true);
notifyLockedProfile(userId);
} }
private boolean shouldWaitForProvisioning() { private boolean shouldWaitForProvisioning() {
@@ -1546,13 +1545,6 @@ public class KeyguardViewMediator extends SystemUI {
} }
} }
private void notifyLockedProfile(@UserIdInt int userId) {
try {
ActivityManagerNative.getDefault().notifyLockedProfile(userId);
} catch (RemoteException e) {
}
}
/** /**
* Handle message sent by {@link #showLocked}. * Handle message sent by {@link #showLocked}.
* @see #SHOW * @see #SHOW

7
services/core/java/com/android/server/trust/TrustManagerService.java
View File

@@ -26,6 +26,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.Manifest; import android.Manifest;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManagerNative;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.app.trust.ITrustListener; import android.app.trust.ITrustListener;
import android.app.trust.ITrustManager; import android.app.trust.ITrustManager;
@@ -318,6 +319,12 @@ public class TrustManagerService extends SystemService {
synchronized (mDeviceLockedForUser) { synchronized (mDeviceLockedForUser) {
mDeviceLockedForUser.put(userId, locked); mDeviceLockedForUser.put(userId, locked);
} }
if (locked) {
try {
ActivityManagerNative.getDefault().notifyLockedProfile(userId);
} catch (RemoteException e) {
}
}
} }
} }