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

Commit eb65d152 authored by Robert Burns's avatar Robert Burns
Browse files

Profiles: Sort profiles alphabetically 

Change-Id: I23a460d5dcbfc8b20bc2a406586b39686b83a427
parent bcab1a93

core/java/android/app/Profile.java

+12 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import java.util.UUID; 
/**

 * @hide

 */

public final class Profile implements Parcelable {

public final class Profile implements Parcelable, Comparable {



    private String mName;
@@ -93,6 +93,17 @@ public final class Profile implements Parcelable { 
        readFromParcel(in);

    }



    public int compareTo(Object obj)

    {

        Profile tmp = (Profile) obj;

        if (mName.compareTo(tmp.mName) < 0) {

            return -1;

        } else if (mName.compareTo(tmp.mName) > 0) {

            return 1;

        }

        return 0;

    }



    /** @hide */

    public void addProfileGroup(ProfileGroup value) {

        if (value.isDefaultGroup()) {

services/java/com/android/server/ProfileManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.ParcelUuid; 
import java.io.FileReader;

import java.io.FileWriter;

import java.io.IOException;

import java.util.Arrays;

import java.util.HashMap;

import java.util.Map;

import java.util.UUID;
@@ -284,7 +285,9 @@ public class ProfileManagerService extends IProfileManager.Stub { 


    @Override

    public Profile[] getProfiles() throws RemoteException {

        return mProfiles.values().toArray(new Profile[mProfiles.size()]);

        Profile[] tmpArr = mProfiles.values().toArray(new Profile[mProfiles.size()]);

        Arrays.sort(tmpArr);

        return tmpArr;

    }



    @Override