LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Revert "RateLimitTest: temporarily dump ConnectivityThread if setUp fails"" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-27 22:51:34 +00:00
committed by Gerrit Code Review
parent 66f39a5667 479dbbd906
commit dd3e7e0159
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/cts/net/src/android/net/cts/RateLimitTest.java
View File

@@ -36,7 +36,6 @@ import android.content.Context;
import android.icu.text.MessageFormat; import android.icu.text.MessageFormat;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.ConnectivitySettingsManager; import android.net.ConnectivitySettingsManager;
import android.net.ConnectivityThread;
import android.net.InetAddresses; import android.net.InetAddresses;
import android.net.IpPrefix; import android.net.IpPrefix;
import android.net.LinkAddress; import android.net.LinkAddress;
@@ -190,19 +189,7 @@ public class RateLimitTest {
// whatever happens, don't leave the device in rate limited state. // whatever happens, don't leave the device in rate limited state.
ConnectivitySettingsManager.setIngressRateLimitInBytesPerSecond(mContext, -1); ConnectivitySettingsManager.setIngressRateLimitInBytesPerSecond(mContext, -1);
} }
if (mSocket == null) { if (mSocket != null) mSocket.close();
// HACK(b/272147742): dump ConnectivityThread if test initialization failed.
final StackTraceElement[] elements = ConnectivityThread.get().getStackTrace();
final StringBuilder sb = new StringBuilder();
// Skip first element as it includes the invocation of getStackTrace()
for (int i = 1; i < elements.length; i++) {
sb.append(elements[i]);
sb.append("\n");
}
Log.e(TAG, sb.toString());
} else {
mSocket.close();
}
if (mNetworkAgent != null) mNetworkAgent.unregister(); if (mNetworkAgent != null) mNetworkAgent.unregister();
if (mTunInterface != null) mTunInterface.getFileDescriptor().close(); if (mTunInterface != null) mTunInterface.getFileDescriptor().close();
if (mCm != null) mCm.unregisterNetworkCallback(mNetworkCallback); if (mCm != null) mCm.unregisterNetworkCallback(mNetworkCallback);