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

Commit d11b29cf authored by Jack Yu's avatar Jack Yu
Browse files

Traffic descriptor only data profile should be enabled 

If a data profile only contains traffic descriptor, and has no
APN setting, it should be considered enabled.

Fix: 233557423
Test: Manual + atest DataProfileTest
Change-Id: Ied26cbba3bde8491bfd6299a2724fc2c5b26c026
parent e651a60d

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;