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

Commit f163ea38 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "setDataEnabled" am: f50f839e am: 3c49789a am: 2c15ba37 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1481077

Change-Id: I0cca429398f3f029f9b52458bd536f39fe2b8d41
parents 83ada92b 2c15ba37

src/java/com/android/internal/telephony/dataconnection/DataEnabledSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ public class DataEnabledSettings { 
     *

     * @return {@code true} if the overall data is enabled; {@code false} if not.

     */

    public synchronized boolean isDataEnabledWithReason(

    public synchronized boolean isDataEnabledForReason(

            @TelephonyManager.DataEnabledReason int reason) {

        switch (reason) {

            case TelephonyManager.DATA_ENABLED_REASON_USER:

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataEnabledSettingsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -130,13 +130,13 @@ public class DataEnabledSettingsTest extends TelephonyTest { 
    public void testSetThermalDataEnabled() throws Exception {

        mDataEnabledSettingsUT.setDataEnabled(TelephonyManager.DATA_ENABLED_REASON_THERMAL,

                false);

        assertFalse(mDataEnabledSettingsUT.isDataEnabledWithReason(

        assertFalse(mDataEnabledSettingsUT.isDataEnabledForReason(

                TelephonyManager.DATA_ENABLED_REASON_THERMAL));

        assertFalse(mDataEnabledSettingsUT.isDataEnabled());



        mDataEnabledSettingsUT.setDataEnabled(TelephonyManager.DATA_ENABLED_REASON_THERMAL,

                true);

        assertTrue(mDataEnabledSettingsUT.isDataEnabledWithReason(

        assertTrue(mDataEnabledSettingsUT.isDataEnabledForReason(

                TelephonyManager.DATA_ENABLED_REASON_THERMAL));

        assertTrue(mDataEnabledSettingsUT.isDataEnabled());

    }