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

DO NOT MERGE Captive portal systel log improvements

Browse Source 
This patch improves system logging around captive portal detection to
make inspection of bug reports sligthly easier:

- NetworkMonitor now logs by default CMD_CAPTIVE_PORTAL_RECHECK and
  CMD_CAPTIVE_PORTAL_APP_FINISHED. Other system logs are kept off with
  a new VDBG boolean contant,
- NetworkNotificationManager now prints the notification id at
  notification time. This allows to easily correlate show and clear.
- errors in NetworkNotificationManager are logged as Throwable instead
  of through their implicit toString() method.

Test: $ runtest frameworks-net
Bug: 32198726

(cherry picked from commit 8b025bf108c729156b40159038befa0e6c5bebce)

Change-Id: I7780c389a94c4b9fa226f53b02fe5960d1c08618
This commit is contained in:
Hugo Benichi
2016-11-21 13:50:05 +09:00
parent 274de89c51
commit 47230f539a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
View File

@@ -114,7 +114,7 @@ public class NetworkNotificationManager {
} }
if (DBG) { if (DBG) {
Slog.d(TAG, "showNotification " + notifyType Slog.d(TAG, "showNotification id=" + id + " " + notifyType
+ " transportType=" + getTransportName(transportType) + " transportType=" + getTransportName(transportType)
+ " extraInfo=" + extraInfo + " highPriority=" + highPriority); + " extraInfo=" + extraInfo + " highPriority=" + highPriority);
} }
@@ -187,7 +187,7 @@ public class NetworkNotificationManager {
try { try {
mNotificationManager.notifyAsUser(NOTIFICATION_ID, id, notification, UserHandle.ALL); mNotificationManager.notifyAsUser(NOTIFICATION_ID, id, notification, UserHandle.ALL);
} catch (NullPointerException npe) { } catch (NullPointerException npe) {
Slog.d(TAG, "setNotificationVisible: visible notificationManager npe=" + npe); Slog.d(TAG, "setNotificationVisible: visible notificationManager error", npe);
} }
} }
@@ -198,7 +198,7 @@ public class NetworkNotificationManager {
try { try {
mNotificationManager.cancelAsUser(NOTIFICATION_ID, id, UserHandle.ALL); mNotificationManager.cancelAsUser(NOTIFICATION_ID, id, UserHandle.ALL);
} catch (NullPointerException npe) { } catch (NullPointerException npe) {
Slog.d(TAG, "setNotificationVisible: cancel notificationManager npe=" + npe); Slog.d(TAG, "setNotificationVisible: cancel notificationManager error", npe);
} }
} }