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

Commit a1577dc7 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Traffic descriptor only data profile should be enabled" into tm-dev am:... 

Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: e55b0a1f am: 89398af0 am: 1d40ba5b am: 07e44e21

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



Change-Id: Ia6ad145b2adc3e8bdb2a56cce0486f18c4207758
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aef3f712 07e44e21

telephony/java/android/telephony/data/DataProfile.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -232,13 +232,14 @@ public final class DataProfile implements Parcelable { 
    }

    }





    /**

    /**

     * @return True if the profile is enabled.

     * @return {@code true} if the profile is enabled. If the profile only has a

     * {@link TrafficDescriptor}, but no {@link ApnSetting}, then this profile is always enabled.

     */

     */

    public boolean isEnabled() {

    public boolean isEnabled() {

        if (mApnSetting != null) {

        if (mApnSetting != null) {

            return mApnSetting.isEnabled();

            return mApnSetting.isEnabled();

        }

        }

        return false;

        return true;

    }

    }





    /**

    /**
@@ -534,7 +535,7 @@ public final class DataProfile implements Parcelable { 
        @Type

        @Type

        private int mType = -1;

        private int mType = -1;





        private boolean mEnabled;

        private boolean mEnabled = true;





        @ApnType

        @ApnType

        private int mSupportedApnTypesBitmask;

        private int mSupportedApnTypesBitmask;