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

Commit f9ddcf69 authored by Mengjun Leng's avatar Mengjun Leng Committed by Jordan Liu
Browse files

Overload setTelephonyProperty without phone ID 

Some properties are not per-phone.

Test: ServiceStateTrackerTest.java
Fixes: 62048110
Change-Id: I80ffc85b511e6a173a1dee50412b1fc48ef43d90
parent de65acb9

telephony/java/android/telephony/TelephonyManager.java

+29 −2
Original line number Diff line number Diff line
@@ -4563,7 +4563,7 @@ public class TelephonyManager { 
    }



    /**

     * Sets the telephony property with the value specified.

     * Sets a per-phone telephony property with the value specified.

     *

     * @hide

     */
@@ -4612,6 +4612,20 @@ public class TelephonyManager { 
        SystemProperties.set(property, propVal);

    }



    /**

     * Sets a global telephony property with the value specified.

     *

     * @hide

     */

    public static void setTelephonyProperty(String property, String value) {

        if (value == null) {

            value = "";

        }

        Rlog.d(TAG, "setTelephonyProperty: success" + " property=" +

                property + " value: " + value);

        SystemProperties.set(property, value);

    }



    /**

     * Convenience function for retrieving a value from the secure settings

     * value list as an integer.  Note that internally setting values are
@@ -4701,7 +4715,7 @@ public class TelephonyManager { 
    }



    /**

     * Gets the telephony property.

     * Gets a per-phone telephony property.

     *

     * @hide

     */
@@ -4717,6 +4731,19 @@ public class TelephonyManager { 
        return propVal == null ? defaultVal : propVal;

    }



    /**

     * Gets a global telephony property.

     *

     * See also getTelephonyProperty(phoneId, property, defaultVal). Most telephony properties are

     * per-phone.

     *

     * @hide

     */

    public static String getTelephonyProperty(String property, String defaultVal) {

        String propVal = SystemProperties.get(property);

        return propVal == null ? defaultVal : propVal;

    }



    /** @hide */

    public int getSimCount() {

        // FIXME Need to get it from Telephony Dev Controller when that gets implemented!