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

Merge changes from topics "setIconTint", "sync_update" am: c2b80123cf am: 5939ba6991

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481030

Change-Id: Idebc3d06b04af8ab2a6c0299ddec619d6a5228b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-10 19:50:22 +00:00
committed by Automerger Merge Worker
parent 84be41fe31 5939ba6991
commit 2d1e772720
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2109,7 +2109,7 @@ public class SubscriptionManager {
/** /**
* Set SIM icon tint color for subscription ID * Set SIM icon tint color for subscription ID
* @param tint the RGB value of icon tint color of the SIM * @param tint the RGB value of icon tint color of the SIM
* @param subId the unique Subscritpion ID in database * @param subId the unique subscription ID in database
* @return the number of records updated * @return the number of records updated
* @hide * @hide
*/ */
@@ -2117,7 +2117,7 @@ public class SubscriptionManager {
public int setIconTint(@ColorInt int tint, int subId) { public int setIconTint(@ColorInt int tint, int subId) {
if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId); if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId);
return setSubscriptionPropertyHelper(subId, "setIconTint", return setSubscriptionPropertyHelper(subId, "setIconTint",
(iSub)-> iSub.setIconTint(tint, subId) (iSub)-> iSub.setIconTint(subId, tint)
); );
} }

4
telephony/java/com/android/internal/telephony/ISub.aidl
View File

@@ -135,11 +135,11 @@ interface ISub {
/** /**
* Set SIM icon tint color by simInfo index * Set SIM icon tint color by simInfo index
* @param tint the icon tint color of the SIM
* @param subId the unique SubscriptionInfo index in database * @param subId the unique SubscriptionInfo index in database
* @param tint the icon tint color of the SIM
* @return the number of records updated * @return the number of records updated
*/ */
int setIconTint(int tint, int subId); int setIconTint(int subId, int tint);
/** /**
* Set display name by simInfo index with name source * Set display name by simInfo index with name source