diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-09-11 20:16:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-11 20:16:59 +0000 |
| commit | ceccceccffbd2668b98e21487f2323f80d2c7b98 (patch) | |
| tree | aba1d4902c557287350a10325a7b334351f663c4 /core | |
| parent | d292f790be5074998c1adc5feb4fea031d0d3d09 (diff) | |
| parent | aca405cd592679af4a4b31b01dfed6fd59c4a168 (diff) | |
| download | frameworks_base-ceccceccffbd2668b98e21487f2323f80d2c7b98.zip frameworks_base-ceccceccffbd2668b98e21487f2323f80d2c7b98.tar.gz frameworks_base-ceccceccffbd2668b98e21487f2323f80d2c7b98.tar.bz2 | |
Merge changes Ib1274847,I2eb2a1bf into klp-dev
* changes:
Fix SDK build.
Request all tethering interfaces, fix corruption.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/IConnectivityManager.aidl | 6 | ||||
| -rw-r--r-- | core/java/android/os/INetworkManagementService.aidl | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index b3fa79f..c1da2e3 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -93,12 +93,6 @@ interface IConnectivityManager String[] getTetheredIfaces(); - /** - * Return list of interface pairs that are actively tethered. Even indexes are - * remote interface, and odd indexes are corresponding local interfaces. - */ - String[] getTetheredIfacePairs(); - String[] getTetheringErroredIfaces(); String[] getTetherableUsbRegexs(); diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 61e5a4b..21b8ae5 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -260,11 +260,9 @@ interface INetworkManagementService NetworkStats getNetworkStatsUidDetail(int uid); /** - * Return summary of network statistics for the requested pairs of - * tethering interfaces. Even indexes are remote interface, and odd - * indexes are corresponding local interfaces. + * Return summary of network statistics all tethering interfaces. */ - NetworkStats getNetworkStatsTethering(in String[] ifacePairs); + NetworkStats getNetworkStatsTethering(); /** * Set quota for an interface. |