Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1ba2b168c0397e833272acbb4b7b8334e1789a6e':
  Remove checks to support new sim color selection.
This commit is contained in:
Sanket Padawe
2014-10-30 11:03:41 +00:00
committed by Android Git Automerger
parent 2a4c7618ef 1ba2b168c0
commit ef87affff7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -470,7 +470,7 @@ public class SubscriptionManager implements BaseColumns {
/** /**
* Set SIM color by simInfo index * 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 * @param subId the unique SubInfoRecord index in database
* @return the number of records updated * @return the number of records updated
* @hide * @hide
@@ -478,7 +478,7 @@ public class SubscriptionManager implements BaseColumns {
public static int setColor(int color, int subId) { public static int setColor(int color, int subId) {
if (VDBG) logd("[setColor]+ color:" + color + " subId:" + subId); if (VDBG) logd("[setColor]+ color:" + color + " subId:" + subId);
int size = sSimBackgroundDarkRes.length; int size = sSimBackgroundDarkRes.length;
if (!isValidSubId(subId) || color < 0 || color >= size) { if (!isValidSubId(subId)) {
logd("[setColor]- fail"); logd("[setColor]- fail");
return -1; return -1;
} }