Merge "[SP15] Remove unused getVtDataUsage in TelephonyMananger" am:... (2a682793) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ import android.content.Context;
		import android.content.Intent;
		import android.database.Cursor;
		import android.net.ConnectivityManager;
		import android.net.NetworkStats;
		import android.net.Uri;
		import android.os.AsyncTask;
		import android.os.Binder;
		@@ -11081,28 +11080,6 @@ public class TelephonyManager {
		}
		}

		/**
		* Get aggregated video call data usage since boot.
		* Permissions android.Manifest.permission.READ_NETWORK_USAGE_HISTORY is required.
		*
		* @param how one of the NetworkStats.STATS_PER_* constants depending on whether the request is
		* for data usage per uid or overall usage.
		* @return Snapshot of video call data usage
		* @hide
		*/
		public NetworkStats getVtDataUsage(int how) {
		boolean perUidStats = (how == NetworkStats.STATS_PER_UID);
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		return service.getVtDataUsage(getSubId(), perUidStats);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#getVtDataUsage", e);
		}
		return null;
		}

		/**
		* Policy control of data connection. Usually used when data limit is passed.
		* @param enabled True if enabling the data, otherwise disabling.

+0 −10

Original line number	Diff line number	Diff line
		@@ -1623,16 +1623,6 @@ interface ITelephony {
		*/
		void carrierActionResetAll(int subId);

		/**
		* 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
		* @hide
		*/
		NetworkStats getVtDataUsage(int subId, boolean perUidStats);

		/**
		* Gets the voice call forwarding info {@link CallForwardingInfo}, given the call forward
		* reason.