From d11b29cfe0a0f2210b1ce228cfd8f5628dced8f5 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Mon, 23 May 2022 17:18:46 -0700 Subject: 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 --- telephony/java/android/telephony/data/DataProfile.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/telephony/java/android/telephony/data/DataProfile.java b/telephony/java/android/telephony/data/DataProfile.java index fa1bae41f433..5e111639b100 100644 --- a/telephony/java/android/telephony/data/DataProfile.java +++ b/telephony/java/android/telephony/data/DataProfile.java @@ -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; -- cgit v1.2.3-59-g8ed1b