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

Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adrian Roos
2014-10-28 14:37:37 +00:00
committed by Android (Google) Code Review
parent 74fe6ce72d 49d53452e7
commit bd6f4a818e
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,11 +122,15 @@ public class TrustManagerService extends SystemService {
@Override @Override
public void onBootPhase(int phase) { public void onBootPhase(int phase) {
if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY && !isSafeMode()) { if (isSafeMode()) {
// No trust agents in safe mode.
return;
}
if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
mPackageMonitor.register(mContext, mHandler.getLooper(), UserHandle.ALL, true); mPackageMonitor.register(mContext, mHandler.getLooper(), UserHandle.ALL, true);
mReceiver.register(mContext); mReceiver.register(mContext);
refreshAgentList(UserHandle.USER_ALL); refreshAgentList(UserHandle.USER_ALL);
} else if (phase == SystemService.PHASE_BOOT_COMPLETED && !isSafeMode()) { } else if (phase == SystemService.PHASE_BOOT_COMPLETED) {
maybeEnableFactoryTrustAgents(mLockPatternUtils, UserHandle.USER_OWNER); maybeEnableFactoryTrustAgents(mLockPatternUtils, UserHandle.USER_OWNER);
} }
} }
@@ -174,6 +178,10 @@ public class TrustManagerService extends SystemService {
void refreshAgentList(int userId) { void refreshAgentList(int userId) {
if (DEBUG) Slog.d(TAG, "refreshAgentList()"); if (DEBUG) Slog.d(TAG, "refreshAgentList()");
if (isSafeMode()) {
// Don't ever bind to trust agents in safe mode.
return;
}
if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_OWNER) { if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_OWNER) {
Log.e(TAG, "refreshAgentList(userId=" + userId + "): Invalid user handle," Log.e(TAG, "refreshAgentList(userId=" + userId + "): Invalid user handle,"
+ " must be USER_ALL or a specific user.", new Throwable("here")); + " must be USER_ALL or a specific user.", new Throwable("here"));
@@ -580,6 +588,10 @@ public class TrustManagerService extends SystemService {
protected void dump(FileDescriptor fd, final PrintWriter fout, String[] args) { protected void dump(FileDescriptor fd, final PrintWriter fout, String[] args) {
mContext.enforceCallingPermission(Manifest.permission.DUMP, mContext.enforceCallingPermission(Manifest.permission.DUMP,
"dumping TrustManagerService"); "dumping TrustManagerService");
if (isSafeMode()) {
fout.println("disabled because the system is in safe mode.");
return;
}
final UserInfo currentUser; final UserInfo currentUser;
final List<UserInfo> userInfos = mUserManager.getUsers(true /* excludeDying */); final List<UserInfo> userInfos = mUserManager.getUsers(true /* excludeDying */);
try { try {