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

Merge "Fix Trust Agent discovery for FBE" into nyc-dev

Browse Source 
am: 957df516f0

* commit '957df516f006129198847ff9448004c097e1be98':
  Fix Trust Agent discovery for FBE

Change-Id: I51cfea9ab91950fea7f0e599a4300b4ac42d5849
This commit is contained in:
Adrian Roos
2016-05-05 14:12:39 +00:00
committed by android-build-merger
parent 9a1cc86c35 957df516f0
commit a4de8ee5ee
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,7 @@ import android.os.RemoteException;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.os.storage.StorageManager;
import android.provider.Settings; import android.provider.Settings;
import android.service.trust.TrustAgentService; import android.service.trust.TrustAgentService;
import android.util.ArraySet; import android.util.ArraySet;
@@ -103,6 +104,7 @@ public class TrustManagerService extends SystemService {
private static final int MSG_SWITCH_USER = 9; private static final int MSG_SWITCH_USER = 9;
private static final int MSG_SET_DEVICE_LOCKED = 10; private static final int MSG_SET_DEVICE_LOCKED = 10;
private static final int MSG_FLUSH_TRUST_USUALLY_MANAGED = 11; private static final int MSG_FLUSH_TRUST_USUALLY_MANAGED = 11;
private static final int MSG_UNLOCK_USER = 12;
private static final int TRUST_USUALLY_MANAGED_FLUSH_DELAY = 2 * 60 * 1000; private static final int TRUST_USUALLY_MANAGED_FLUSH_DELAY = 2 * 60 * 1000;
@@ -253,6 +255,7 @@ public class TrustManagerService extends SystemService {
if (userInfo == null || userInfo.partial || !userInfo.isEnabled() if (userInfo == null || userInfo.partial || !userInfo.isEnabled()
|| userInfo.guestToRemove) continue; || userInfo.guestToRemove) continue;
if (!userInfo.supportsSwitchToByUser()) continue; if (!userInfo.supportsSwitchToByUser()) continue;
if (!StorageManager.isUserKeyUnlocked(userInfo.id)) continue;
if (!mActivityManager.isUserRunning(userInfo.id)) continue; if (!mActivityManager.isUserRunning(userInfo.id)) continue;
if (!lockPatternUtils.isSecure(userInfo.id)) continue; if (!lockPatternUtils.isSecure(userInfo.id)) continue;
if (!mStrongAuthTracker.canAgentsRunForUser(userInfo.id)) continue; if (!mStrongAuthTracker.canAgentsRunForUser(userInfo.id)) continue;
@@ -527,7 +530,8 @@ public class TrustManagerService extends SystemService {
private List<ResolveInfo> resolveAllowedTrustAgents(PackageManager pm, int userId) { private List<ResolveInfo> resolveAllowedTrustAgents(PackageManager pm, int userId) {
List<ResolveInfo> resolveInfos = pm.queryIntentServicesAsUser(TRUST_AGENT_INTENT, List<ResolveInfo> resolveInfos = pm.queryIntentServicesAsUser(TRUST_AGENT_INTENT,
0 /* flags */, userId); PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
userId);
ArrayList<ResolveInfo> allowedAgents = new ArrayList<>(resolveInfos.size()); ArrayList<ResolveInfo> allowedAgents = new ArrayList<>(resolveInfos.size());
for (ResolveInfo resolveInfo : resolveInfos) { for (ResolveInfo resolveInfo : resolveInfos) {
if (resolveInfo.serviceInfo == null) continue; if (resolveInfo.serviceInfo == null) continue;
@@ -664,6 +668,11 @@ public class TrustManagerService extends SystemService {
mHandler.obtainMessage(MSG_SWITCH_USER, userId, 0, null).sendToTarget(); mHandler.obtainMessage(MSG_SWITCH_USER, userId, 0, null).sendToTarget();
} }
@Override
public void onUnlockUser(int userId) {
mHandler.obtainMessage(MSG_UNLOCK_USER, userId, 0, null).sendToTarget();
}
// Plumbing // Plumbing
private final IBinder mService = new ITrustManager.Stub() { private final IBinder mService = new ITrustManager.Stub() {
@@ -896,6 +905,7 @@ public class TrustManagerService extends SystemService {
break; break;
case MSG_START_USER: case MSG_START_USER:
case MSG_CLEANUP_USER: case MSG_CLEANUP_USER:
case MSG_UNLOCK_USER:
refreshAgentList(msg.arg1); refreshAgentList(msg.arg1);
break; break;
case MSG_SWITCH_USER: case MSG_SWITCH_USER:
@@ -918,6 +928,7 @@ public class TrustManagerService extends SystemService {
mLockPatternUtils.setTrustUsuallyManaged(value, userId); mLockPatternUtils.setTrustUsuallyManaged(value, userId);
} }
} }
break;
} }
} }
}; };