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

Commit bf35150d authored by Nancy Chen's avatar Nancy Chen Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Add color to PhoneAccount objects (2/3)""" into lmp-sprout-dev

parents 1e01a160 06ce062a

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LOCAL_PACKAGE_NAME := Telecom 
LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true



LOCAL_PROGUARD_ENABLED := optimization

LOCAL_PROGUARD_FLAGS := $(proguard.flags)



# Workaround for "local variable type mismatch" error.

LOCAL_DX_FLAGS += --no-locals

src/com/android/server/telecom/PhoneAccountRegistrar.java

+8 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ public final class PhoneAccountRegistrar { 
    private final Context mContext;

    private State mState;



    @VisibleForTesting

    public PhoneAccountRegistrar(Context context) {

        this(context, FILE_NAME);

    }
@@ -809,6 +810,7 @@ public final class PhoneAccountRegistrar { 
        private static final String SUBSCRIPTION_ADDRESS = "subscription_number";

        private static final String CAPABILITIES = "capabilities";

        private static final String ICON_RES_ID = "icon_res_id";

        private static final String COLOR = "color";

        private static final String LABEL = "label";

        private static final String SHORT_DESCRIPTION = "short_description";

        private static final String SUPPORTED_URI_SCHEMES = "supported_uri_schemes";
@@ -831,6 +833,7 @@ public final class PhoneAccountRegistrar { 
                writeTextSafely(SUBSCRIPTION_ADDRESS, o.getSubscriptionAddress(), serializer);

                writeTextSafely(CAPABILITIES, Integer.toString(o.getCapabilities()), serializer);

                writeTextSafely(ICON_RES_ID, Integer.toString(o.getIconResId()), serializer);

                writeTextSafely(COLOR, Integer.toString(o.getColor()), serializer);

                writeTextSafely(LABEL, o.getLabel(), serializer);

                writeTextSafely(SHORT_DESCRIPTION, o.getShortDescription(), serializer);

                writeStringList(SUPPORTED_URI_SCHEMES, o.getSupportedUriSchemes(), serializer);
@@ -848,6 +851,7 @@ public final class PhoneAccountRegistrar { 
                Uri subscriptionAddress = null;

                int capabilities = 0;

                int iconResId = 0;

                int color = 0;

                String label = null;

                String shortDescription = null;

                List<String> supportedUriSchemes = null;
@@ -870,6 +874,9 @@ public final class PhoneAccountRegistrar { 
                    } else if (parser.getName().equals(ICON_RES_ID)) {

                        parser.next();

                        iconResId = Integer.parseInt(parser.getText());

                    } else if (parser.getName().equals(COLOR)) {

                        parser.next();

                        color = Integer.parseInt(parser.getText());

                    } else if (parser.getName().equals(LABEL)) {

                        parser.next();

                        label = parser.getText();
@@ -907,6 +914,7 @@ public final class PhoneAccountRegistrar { 
                        .setSubscriptionAddress(subscriptionAddress)

                        .setCapabilities(capabilities)

                        .setIconResId(iconResId)

                        .setColor(color)

                        .setShortDescription(shortDescription)

                        .setSupportedUriSchemes(supportedUriSchemes)

                        .build();

tests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ public class PhoneAccountRegistrarTest extends AndroidTestCase { 
            assertEquals(a.getSubscriptionAddress(), b.getSubscriptionAddress());

            assertEquals(a.getCapabilities(), b.getCapabilities());

            assertEquals(a.getIconResId(), b.getIconResId());

            assertEquals(a.getColor(), b.getColor());

            assertEquals(a.getLabel(), b.getLabel());

            assertEquals(a.getShortDescription(), b.getShortDescription());

            assertEquals(a.getSupportedUriSchemes(), b.getSupportedUriSchemes());