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

Commit 290e9110 authored by Robin Lee's avatar Robin Lee
Browse files

Remove deprecated upgrade path for relatedGroupId 

As per note this has been unused for upwards of 6 months and its
attribute string is no longer referenced anywhere else in Android.

Change-Id: I5f95ffa6b3d91fca203f2d030d40df3fd55b6a70
parent aa118f67

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;