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

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

Merge "Traffic descriptor only data profile should be enabled" am: cf852e7c 

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



Change-Id: I61b53a87bb9dfc36814e8a944cbb2e63a897da65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5327a51e cf852e7c

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;