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

Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev

Browse Source
This commit is contained in:
Kenny Guy
2014-09-25 16:42:10 +00:00
committed by Android (Google) Code Review
parent ccf2fa0031 be16357f40
commit baa05930ec
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java
View File

@@ -229,11 +229,20 @@ public class DeviceOwner {
String profileOwnerComponentStr =
parser.getAttributeValue(null, ATTR_COMPONENT_NAME);
int userId = Integer.parseInt(parser.getAttributeValue(null, ATTR_USERID));
OwnerInfo profileOwnerInfo;
OwnerInfo profileOwnerInfo = null;
if (profileOwnerComponentStr != null) {
profileOwnerInfo = new OwnerInfo(profileOwnerName,
ComponentName.unflattenFromString(profileOwnerComponentStr));
} else {
ComponentName admin = ComponentName.unflattenFromString(
profileOwnerComponentStr);
if (admin != null) {
profileOwnerInfo = new OwnerInfo(profileOwnerName, admin);
} else {
// This shouldn't happen but switch from package name -> component name
// might have written bad device owner files. b/17652534
Slog.e(TAG, "Error parsing device-owner file. Bad component name " +
profileOwnerComponentStr);
}
}
if (profileOwnerInfo == null) {
profileOwnerInfo = new OwnerInfo(profileOwnerName, profileOwnerPackageName);
}
mProfileOwners.put(userId, profileOwnerInfo);