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

Modify logging to debug this issue

Browse Source 
Logging exec time on startUsingNetworkFeature as we've had some reports suggesting it's
causing ANRs.
Remove some logging from NDC so it's local log is more useful.

bug:6492166
Change-Id: I258ff6c59bff2c65935242d50496d84720c5d493
This commit is contained in:
Robert Greenwalt
2012-05-22 16:07:46 -07:00
parent 2ffa45267f
commit 1e6991edcf
1 changed files with 109 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/java/com/android/server/ConnectivityService.java
View File

@@ -66,6 +66,7 @@ import android.os.ParcelFileDescriptor;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
@@ -995,11 +996,16 @@ private NetworkStateTracker makeWimaxStateTracker() {
// javadoc from interface // javadoc from interface
public int startUsingNetworkFeature(int networkType, String feature, public int startUsingNetworkFeature(int networkType, String feature,
IBinder binder) { IBinder binder) {
long startTime = 0;
if (DBG) {
startTime = SystemClock.elapsedRealtime();
}
if (VDBG) { if (VDBG) {
log("startUsingNetworkFeature for net " + networkType + ": " + feature + ", uid=" log("startUsingNetworkFeature for net " + networkType + ": " + feature + ", uid="
+ Binder.getCallingUid()); + Binder.getCallingUid());
} }
enforceChangePermission(); enforceChangePermission();
try {
if (!ConnectivityManager.isNetworkTypeValid(networkType) || if (!ConnectivityManager.isNetworkTypeValid(networkType) ||
mNetConfigs[networkType] == null) { mNetConfigs[networkType] == null) {
return Phone.APN_REQUEST_FAILED; return Phone.APN_REQUEST_FAILED;
@@ -1067,8 +1073,8 @@ private NetworkStateTracker makeWimaxStateTracker() {
} }
if (restoreTimer >= 0) { if (restoreTimer >= 0) {
mHandler.sendMessageDelayed( mHandler.sendMessageDelayed(mHandler.obtainMessage(
mHandler.obtainMessage(EVENT_RESTORE_DEFAULT_NETWORK, f), restoreTimer); EVENT_RESTORE_DEFAULT_NETWORK, f), restoreTimer);
} }
if ((ni.isConnectedOrConnecting() == true) && if ((ni.isConnectedOrConnecting() == true) &&
@@ -1092,7 +1098,8 @@ private NetworkStateTracker makeWimaxStateTracker() {
// assume if cannot for now // assume if cannot for now
if (DBG) { if (DBG) {
log("startUsingNetworkFeature reconnecting to " + networkType + ": " + feature); log("startUsingNetworkFeature reconnecting to " + networkType + ": " +
feature);
} }
network.reconnect(); network.reconnect();
return Phone.APN_REQUEST_STARTED; return Phone.APN_REQUEST_STARTED;
@@ -1109,6 +1116,16 @@ private NetworkStateTracker makeWimaxStateTracker() {
} }
} }
return Phone.APN_TYPE_NOT_AVAILABLE; return Phone.APN_TYPE_NOT_AVAILABLE;
} finally {
if (DBG) {
final long execTime = SystemClock.elapsedRealtime() - startTime;
if (execTime > 250) {
loge("startUsingNetworkFeature took too long: " + execTime + "ms");
} else {
if (VDBG) log("startUsingNetworkFeature took " + execTime + "ms");
}
}
}
} }
// javadoc from interface // javadoc from interface