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

Commit 95647e87 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topics "setIconTint", "sync_update" am: dcfed6ee am: a3e281aa 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2481124



Change-Id: Id2fd3d940eaedbadf9e0739ce4bdd6f70e432f7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 947ddb8e a3e281aa

src/java/com/android/internal/telephony/SubscriptionController.java

+4 −2
Original line number Diff line number Diff line
@@ -1855,12 +1855,14 @@ public class SubscriptionController extends ISub.Stub { 


    /**

     * Set SIM color tint by simInfo index

     * @param tint the tint color of the SIM

     *

     * @param subId the unique SubInfoRecord index in database

     * @param tint the tint color of the SIM

     *

     * @return the number of records updated

     */

    @Override

    public int setIconTint(int tint, int subId) {

    public int setIconTint(int subId, int tint) {

        if (DBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId);



        enforceModifyPhoneState("setIconTint");

src/java/com/android/internal/telephony/subscription/SubscriptionDatabaseManager.java

+112 −9

File changed.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/subscription/SubscriptionInfoInternal.java

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


package com.android.internal.telephony.subscription;



import android.annotation.ColorInt;

import android.annotation.NonNull;

import android.os.UserHandle;

import android.provider.Telephony.SimInfo;
@@ -113,6 +114,7 @@ public class SubscriptionInfoInternal { 
    /**

     * The color to be used for tinting the icon when displaying to the user.

     */

    @ColorInt

    private final int mIconTint;



    /**
@@ -509,6 +511,7 @@ public class SubscriptionInfoInternal { 
     *

     * @return A hexadecimal color value.

     */

    @ColorInt

    public int getIconTint() {

        return mIconTint;

    }

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+37 −9

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionDatabaseManagerTest.java

+205 −5

File changed.

Preview size limit exceeded, changes collapsed.