Merge c6c474c4ee331a1c0eb1b54f7f9d515a7a7af21e on remote branch
Change-Id: I80dc93d5afa92ce5621ab42349363e1656accfd7
diff --git a/ims/ims-ext-common/src/org/codeaurora/ims/QtiVideoCallDataUsage.java b/ims/ims-ext-common/src/org/codeaurora/ims/QtiVideoCallDataUsage.java
index c188fb9..cabc02d 100644
--- a/ims/ims-ext-common/src/org/codeaurora/ims/QtiVideoCallDataUsage.java
+++ b/ims/ims-ext-common/src/org/codeaurora/ims/QtiVideoCallDataUsage.java
@@ -25,6 +25,10 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Changes from Qualcomm Innovation Center are provided under the following license:
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * SPDX-License_Identifier: BSD-3-Clause-Clear
*/
package org.codeaurora.ims;
@@ -40,10 +44,12 @@
public class QtiVideoCallDataUsage implements Parcelable {
private long[] mDataUsage;
- public static final int DATA_USAGE_LTE = 0;
+ public static final int DATA_USAGE_WWAN = 0;
public static final int DATA_USAGE_WLAN = 1;
+ public static final int DATA_USAGE_C_IWLAN = 2;
public static final int DATA_USAGE_INVALID_VALUE = -1;
- private static final String[] TEXT = {"LteDataUsage = "," WlanDataUsage = "};
+ private static final String[] TEXT =
+ {"WwanDataUsage = "," WlanDataUsage = ", " CIWlanDataUsage = "};
public QtiVideoCallDataUsage(long[] dUsage) {
if (dUsage == null || dUsage.length == 0 ) {
@@ -57,10 +63,10 @@
}
/*
- * This method returns LTE Data Usage
+ * This method returns WWAN Data Usage
*/
- public long getLteDataUsage() {
- return mDataUsage.length > DATA_USAGE_LTE ? mDataUsage[DATA_USAGE_LTE] :
+ public long getWwanDataUsage() {
+ return mDataUsage.length > DATA_USAGE_WWAN ? mDataUsage[DATA_USAGE_WWAN] :
DATA_USAGE_INVALID_VALUE;
}
@@ -72,6 +78,14 @@
DATA_USAGE_INVALID_VALUE;
}
+ /*
+ * This method returns C_IWLAN Data Usage
+ */
+ public long getCiwlanDataUsage() {
+ return mDataUsage.length > DATA_USAGE_C_IWLAN ? mDataUsage[DATA_USAGE_C_IWLAN] :
+ DATA_USAGE_INVALID_VALUE;
+ }
+
@Override
public void writeToParcel(Parcel dest, int flag) {
dest.writeLongArray(mDataUsage);