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

Commit ef87afff authored by Sanket Padawe's avatar Sanket Padawe Committed by Android Git Automerger
Browse files

am 1ba2b168: am 52f811ec: Merge "Remove checks to support new sim color... 

am 1ba2b168: am 52f811ec: Merge "Remove checks to support new sim color selection." into lmp-mr1-dev

* commit '1ba2b168':
  Remove checks to support new sim color selection.
parents 2a4c7618 1ba2b168

telephony/java/android/telephony/SubscriptionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ public class SubscriptionManager implements BaseColumns { 


    /**

     * Set SIM color by simInfo index

     * @param color the color of the SIM

     * @param color the rgb value of color of the SIM

     * @param subId the unique SubInfoRecord index in database

     * @return the number of records updated

     * @hide
@@ -478,7 +478,7 @@ public class SubscriptionManager implements BaseColumns { 
    public static int setColor(int color, int subId) {

        if (VDBG) logd("[setColor]+ color:" + color + " subId:" + subId);

        int size = sSimBackgroundDarkRes.length;

        if (!isValidSubId(subId) || color < 0 || color >= size) {

        if (!isValidSubId(subId)) {

            logd("[setColor]- fail");

            return -1;

        }