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

Commit 5939ba69 authored Mar 10, 2023 by Treehugger Robot Committed by Automerger Merge Worker Mar 10, 2023

Merge changes from topics "setIconTint", "sync_update" am: c2b80123

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

Change-Id: I215fbd7a0dbc2ec5047a97cfb7ed51528b223cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6551339f c2b80123

telephony/java/android/telephony/SubscriptionManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2109,7 +2109,7 @@ public class SubscriptionManager {
		/**
		* Set SIM icon tint color for subscription ID
		* @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
		* @hide
		*/
		@@ -2117,7 +2117,7 @@ public class SubscriptionManager {
		public int setIconTint(@ColorInt int tint, int subId) {
		if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId);
		return setSubscriptionPropertyHelper(subId, "setIconTint",
		(iSub)-> iSub.setIconTint(tint, subId)
		(iSub)-> iSub.setIconTint(subId, tint)
		);
		}

telephony/java/com/android/internal/telephony/ISub.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -135,11 +135,11 @@ interface ISub {

		/**
		* 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 tint the icon tint color of the SIM
		* @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