From 2d26b0e4b04080b28d2074b9cf9fbbae7c04a561 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 20 Dec 2016 09:57:43 +0900 Subject: [PATCH] Stricter NetworkNotificationManagerTest This patch changes NetworkNotificationManagerTest to populate extraInfo of NetworkInfo in order to catch regressions in malformed format Strings of log statements in NetworkNotificationManager. Test: verified that the test fails when reintroducing the format String bug. Bug: 33737715 (cherry picked from commit 3cb1d2b45d640419ac7e825239cd32a967c24c37) Change-Id: Ic2f23e860a17cb83b90edcfd2ba365134cacfe36 --- .../android/server/connectivity/NetworkNotificationManager.java | 2 +- .../server/connectivity/NetworkNotificationManagerTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java index 70faa5ac4a..68fe5053b5 100644 --- a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java +++ b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java @@ -182,7 +182,7 @@ public class NetworkNotificationManager { details = r.getString(R.string.network_switch_metered_detail, toTransport, fromTransport); } else { - Slog.wtf(TAG, "Unknown notification type " + notifyType + "on network transport " + Slog.wtf(TAG, "Unknown notification type " + notifyType + " on network transport " + getTransportName(transportType)); return; } diff --git a/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java b/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java index 98073ce1e5..21c2de79d6 100644 --- a/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java +++ b/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java @@ -80,6 +80,7 @@ public class NetworkNotificationManagerTest extends TestCase { when(mCtx.getResources()).thenReturn(mResources); when(mCtx.getPackageManager()).thenReturn(mPm); when(mCtx.getApplicationInfo()).thenReturn(new ApplicationInfo()); + when(mNetworkInfo.getExtraInfo()).thenReturn("extra"); when(mResources.getColor(anyInt(), any())).thenReturn(0xFF607D8B); mManager = new NetworkNotificationManager(mCtx, mTelephonyManager, mNotificationManager);