Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev

Browse Source 
* changes:
  DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
  DO NOT MERGE Fix malformed log statement.
This commit is contained in:
TreeHugger Robot
2016-12-20 04:58:51 +00:00
committed by Android (Google) Code Review
parent 793c634d1e 8e21030679
commit 7eaec196b7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,8 +142,9 @@ public class NetworkNotificationManager {
if (DBG) { if (DBG) {
Slog.d(TAG, String.format( Slog.d(TAG, String.format(
"showNotification tag=%s event=%s transport=%s extraInfo=%d highPrioriy=%s", "showNotification tag=%s event=%s transport=%s extraInfo=%s highPrioriy=%s",
tag, nameOf(eventId), getTransportName(transportType), extraInfo, highPriority)); tag, nameOf(eventId), getTransportName(transportType), extraInfo,
highPriority));
} }
Resources r = Resources.getSystem(); Resources r = Resources.getSystem();
@@ -227,13 +228,14 @@ public class NetworkNotificationManager {
} }
final int eventId = mNotificationTypeMap.get(id); final int eventId = mNotificationTypeMap.get(id);
if (DBG) { if (DBG) {
Slog.d(TAG, String.format("clearing notification tag=%s event=", tag, nameOf(eventId))); Slog.d(TAG, String.format("clearing notification tag=%s event=%s", tag,
nameOf(eventId)));
} }
try { try {
mNotificationManager.cancelAsUser(tag, eventId, UserHandle.ALL); mNotificationManager.cancelAsUser(tag, eventId, UserHandle.ALL);
} catch (NullPointerException npe) { } catch (NullPointerException npe) {
Slog.d(TAG, String.format( Slog.d(TAG, String.format(
"failed to clear notification tag=%s event=", tag, nameOf(eventId)), npe); "failed to clear notification tag=%s event=%s", tag, nameOf(eventId)), npe);
} }
mNotificationTypeMap.delete(id); mNotificationTypeMap.delete(id);
} }