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

                    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));

                        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);