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

DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java

Browse Source 
Commit fb2609d3eee1c7a4dda889c000f32183a044978a added a string
format which caused an exception.  On top of the fixes to this
from e1406167186c2cabe683b3c1511ad6733e9106c9, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.

Bug: 33737715
Test: Build and run SUW

(cherry picked from commit 835cb49639fc7cb75819564fa15f2f5a0bd5dee2)

Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36
This commit is contained in:
Paul Stewart
2016-12-19 08:45:32 -08:00
committed by Hugo Benichi
parent 1360fb4b3b
commit c39ecf10e0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,8 @@ 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=%s 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);
} }