Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: e55b0a1f17

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

Change-Id: I6e886a1516844cabcf543c9581e66e6868b42d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack Yu
2022-05-25 16:08:09 +00:00
committed by Automerger Merge Worker
parent 2dd4aafcf6 e55b0a1f17
commit 3e610aeb0c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/android/telephony/data/DataProfile.java
View File

@@ -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() { public boolean isEnabled() {
if (mApnSetting != null) { if (mApnSetting != null) {
return mApnSetting.isEnabled(); return mApnSetting.isEnabled();
} }
return false; return true;
} }
/** /**
@@ -534,7 +535,7 @@ public final class DataProfile implements Parcelable {
@Type @Type
private int mType = -1; private int mType = -1;
private boolean mEnabled; private boolean mEnabled = true;
@ApnType @ApnType
private int mSupportedApnTypesBitmask; private int mSupportedApnTypesBitmask;