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

am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev

Browse Source 
* commit 'cc19e8b85b223e8a4b36ce3342c28f250fb08f91':
  DevicePolicy: Don't warn about managed profile CAs
This commit is contained in:
Robin Lee
2014-11-26 12:02:06 +00:00
committed by Android Git Automerger
parent 1fb141f83b cc19e8b85b
commit a7ffed86fc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -96,7 +96,6 @@ import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.JournaledFile; import com.android.internal.util.JournaledFile;
import com.android.internal.util.XmlUtils; import com.android.internal.util.XmlUtils;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.org.conscrypt.TrustedCertificateStore;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.SystemService; import com.android.server.SystemService;
import com.android.server.devicepolicy.DevicePolicyManagerService.ActiveAdmin.TrustAgentInfo; import com.android.server.devicepolicy.DevicePolicyManagerService.ActiveAdmin.TrustAgentInfo;
@@ -1645,12 +1644,18 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
private void manageNotification(UserHandle userHandle) { private void manageNotification(UserHandle userHandle) {
final UserInfo userInfo = mUserManager.getUserInfo(userHandle.getIdentifier());
// Inactive users or managed profiles shouldn't provoke a warning
if (!mUserManager.isUserRunning(userHandle)) { if (!mUserManager.isUserRunning(userHandle)) {
return; return;
} }
if (userInfo == null || userInfo.isManagedProfile()) {
return;
}
// Call out to KeyChain to check for user-added CAs
boolean hasCert = false; boolean hasCert = false;
final long id = Binder.clearCallingIdentity();
try { try {
KeyChainConnection kcs = KeyChain.bindAsUser(mContext, userHandle); KeyChainConnection kcs = KeyChain.bindAsUser(mContext, userHandle);
try { try {
@@ -1666,8 +1671,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (RuntimeException e) { } catch (RuntimeException e) {
Log.e(LOG_TAG, "Could not connect to KeyChain service", e); Log.e(LOG_TAG, "Could not connect to KeyChain service", e);
} finally {
Binder.restoreCallingIdentity(id);
} }
if (!hasCert) { if (!hasCert) {
getNotificationManager().cancelAsUser( getNotificationManager().cancelAsUser(
@@ -1675,6 +1678,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
return; return;
} }
// Build and show a warning notification
int smallIconId; int smallIconId;
String contentText; String contentText;
final String ownerName = getDeviceOwnerName(); final String ownerName = getDeviceOwnerName();