Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68469c79 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Remove deprecated upgrade path for relatedGroupId"

parents 6d5ba653 290e9110

services/core/java/com/android/server/pm/UserManagerService.java

+0 −6
Original line number Diff line number Diff line
@@ -948,12 +948,6 @@ public class UserManagerService extends IUserManager.Stub { 
                lastAttemptTime = readLongAttribute(parser, ATTR_LAST_RETRY_MS, 0L);

                profileGroupId = readIntAttribute(parser, ATTR_PROFILE_GROUP_ID,

                        UserInfo.NO_PROFILE_GROUP_ID);

                if (profileGroupId == UserInfo.NO_PROFILE_GROUP_ID) {

                    // This attribute was added and renamed during development of L.

                    // TODO Remove upgrade path by 1st May 2014

                    profileGroupId = readIntAttribute(parser, "relatedGroupId",

                            UserInfo.NO_PROFILE_GROUP_ID);

                }

                String valueString = parser.getAttributeValue(null, ATTR_PARTIAL);

                if ("true".equals(valueString)) {

                    partial = true;