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

Commit 475683bc 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: ccda4906

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



Change-Id: I9a707b4309ffa173df22a77cdcd2144e308f8e26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96e6e1cc ccda4906

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

+4 −3
Original line number 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() {

        if (mApnSetting != null) {

            return mApnSetting.isEnabled();

        }

        return false;

        return true;

    }



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

        private int mType = -1;



        private boolean mEnabled;

        private boolean mEnabled = true;



        @ApnType

        private int mSupportedApnTypesBitmask;