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

Commit c2b80123 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics "setIconTint", "sync_update" 

* changes:
  Added setIconTint
  Added sync update database support
parents c44c3153 8f04afbf

core/res/res/values/config_telephony.xml

+5 −0
Original line number Diff line number Diff line
@@ -117,4 +117,9 @@ 
    <!-- Whether using the new SubscriptionManagerService or the old SubscriptionController -->

    <bool name="config_using_subscription_manager_service">false</bool>

    <java-symbol type="bool" name="config_using_subscription_manager_service" />



    <!-- Whether asynchronously update the subscription database or not. Async mode increases

         the performance, but sync mode reduces the chance of database/cache out-of-sync. -->

    <bool name="config_subscription_database_async_update">true</bool>

    <java-symbol type="bool" name="config_subscription_database_async_update" />

</resources>

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