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

Commit ccda4906 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: e55b0a1f 

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



Change-Id: I12accca49ced1a57b037ac62c470a6e9737f8b2a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3d48b82 e55b0a1f

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;