Merge "[SP15.2] Remove unused getVtDataUsage in Telephony"
diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java
index 8a0e497..b90b69d 100644
--- a/src/java/com/android/internal/telephony/Phone.java
+++ b/src/java/com/android/internal/telephony/Phone.java
@@ -25,7 +25,6 @@
import android.content.SharedPreferences;
import android.net.LinkProperties;
import android.net.NetworkCapabilities;
-import android.net.NetworkStats;
import android.net.Uri;
import android.os.AsyncResult;
import android.os.Handler;
@@ -4077,18 +4076,6 @@
}
/**
- * Get aggregated video call data usage since boot.
- * Permissions android.Manifest.permission.READ_NETWORK_USAGE_HISTORY is required.
- *
- * @param perUidStats True if requesting data usage per uid, otherwise overall usage.
- * @return Snapshot of video call data usage
- */
- public NetworkStats getVtDataUsage(boolean perUidStats) {
- if (mImsPhone == null) return null;
- return mImsPhone.getVtDataUsage(perUidStats);
- }
-
- /**
* SIP URIs aliased to the current subscriber given by the IMS implementation.
* Applicable only on IMS; used in absence of line1number.
* @return array of SIP URIs aliased to the current subscriber
diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
index 38eea50..1942653 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
@@ -50,7 +50,6 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import android.net.NetworkStats;
import android.net.Uri;
import android.os.AsyncResult;
import android.os.Bundle;
@@ -1995,11 +1994,6 @@
return mWakeLock;
}
- @Override
- public NetworkStats getVtDataUsage(boolean perUidStats) {
- return mCT.getVtDataUsage(perUidStats);
- }
-
/**
* Update roaming state and WFC mode in the following situations:
* 1) voice is in service.
diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
index c1c274a..2575986 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
@@ -263,8 +263,7 @@
/**
* A class implementing {@link AbstractNetworkStatsProvider} to report VT data usage to system.
*/
- // TODO: 1. Directly reports diff in updateVtDataUsage.
- // 2. Remove unused getVtDataUsage.
+ // TODO: Directly reports diff in updateVtDataUsage.
@VisibleForTesting(visibility = PRIVATE)
public class VtDataUsageProvider extends AbstractNetworkStatsProvider {
private int mToken = 0;
@@ -4345,29 +4344,6 @@
return isActiveCallVideo && isActiveCallOnWifi && isIncomingCallAudio && !isVoWifiEnabled;
}
- /**
- * Get aggregated video call data usage since boot.
- *
- * @param perUidStats True if requesting data usage per uid, otherwise overall usage.
- * @return Snapshot of video call data usage
- */
- public NetworkStats getVtDataUsage(boolean perUidStats) {
-
- // If there is an ongoing VT call, request the latest VT usage from the modem. The latest
- // usage will return asynchronously so it won't be counted in this round, but it will be
- // eventually counted when next getVtDataUsage is called.
- if (mState != PhoneConstants.State.IDLE) {
- for (ImsPhoneConnection conn : mConnections) {
- VideoProvider videoProvider = conn.getVideoProvider();
- if (videoProvider != null) {
- videoProvider.onRequestConnectionDataUsage();
- }
- }
- }
-
- return perUidStats ? mVtDataUsageUidSnapshot : mVtDataUsageSnapshot;
- }
-
public void registerPhoneStateListener(PhoneStateListener listener) {
mPhoneStateListeners.add(listener);
}
