joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Do not display "null" in sign-in note details" into main am: 488d40d122

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3130956

Change-Id: Idd9fd645abed2842c337eee4bf7df71e0b401047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-06-13 09:59:20 +00:00 • committed by Automerger Merge Worker
commit d700a20d74
2 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
service/src/com/android/server/connectivity/NetworkNotificationManager.java
View file

@ -170,9 +170,11 @@ public class NetworkNotificationManager {
&& !TextUtils.isEmpty(nai.linkProperties.getCaptivePortalData()
.getVenueFriendlyName())) {
name = nai.linkProperties.getCaptivePortalData().getVenueFriendlyName();
} else if (!TextUtils.isEmpty(extraInfo)) {
name = extraInfo;
} else {
name = TextUtils.isEmpty(extraInfo)
? WifiInfo.sanitizeSsid(nai.networkCapabilities.getSsid()) : extraInfo;
final String ssid = WifiInfo.sanitizeSsid(nai.networkCapabilities.getSsid());
name = ssid == null ? "" : ssid;
}
// Only notify for Internet-capable networks.
if (!nai.networkCapabilities.hasCapability(NET_CAPABILITY_INTERNET)) return;

32
tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
View file

@ -113,6 +113,7 @@ public class NetworkNotificationManagerTest {
private static final NetworkCapabilities CELL_CAPABILITIES = new NetworkCapabilities();
private static final NetworkCapabilities WIFI_CAPABILITIES = new NetworkCapabilities();
private static final NetworkCapabilities VPN_CAPABILITIES = new NetworkCapabilities();
private static final NetworkCapabilities BT_CAPABILITIES = new NetworkCapabilities();
static {
CELL_CAPABILITIES.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
CELL_CAPABILITIES.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
@ -128,6 +129,9 @@ public class NetworkNotificationManagerTest {
VPN_CAPABILITIES.addTransportType(NetworkCapabilities.TRANSPORT_VPN);
VPN_CAPABILITIES.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
VPN_CAPABILITIES.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN);
BT_CAPABILITIES.addTransportType(NetworkCapabilities.TRANSPORT_BLUETOOTH);
BT_CAPABILITIES.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
}
/**
@ -159,7 +163,9 @@ public class NetworkNotificationManagerTest {
@Mock NetworkAgentInfo mWifiNai;
@Mock NetworkAgentInfo mCellNai;
@Mock NetworkAgentInfo mVpnNai;
@Mock NetworkAgentInfo mBluetoothNai;
@Mock NetworkInfo mNetworkInfo;
@Mock NetworkInfo mEmptyNetworkInfo;
ArgumentCaptor<Notification> mCaptor;
NetworkNotificationManager mManager;
@ -174,6 +180,8 @@ public class NetworkNotificationManagerTest {
mCellNai.networkInfo = mNetworkInfo;
mVpnNai.networkCapabilities = VPN_CAPABILITIES;
mVpnNai.networkInfo = mNetworkInfo;
mBluetoothNai.networkCapabilities = BT_CAPABILITIES;
mBluetoothNai.networkInfo = mEmptyNetworkInfo;
mDisplayMetrics.density = 2.275f;
doReturn(true).when(mVpnNai).isVPN();
doReturn(mResources).when(mCtx).getResources();
@ -542,10 +550,11 @@ public class NetworkNotificationManagerTest {
R.string.wifi_no_internet_detailed);
}
private void runTelephonySignInNotificationTest(String testTitle, String testContents) {
private void runSignInNotificationTest(NetworkAgentInfo nai, String testTitle,
String testContents) {
final int id = 101;
final String tag = NetworkNotificationManager.tagFor(id);
mManager.showNotification(id, SIGN_IN, mCellNai, null, null, false);
mManager.showNotification(id, SIGN_IN, nai, null, null, false);
final ArgumentCaptor<Notification> noteCaptor = ArgumentCaptor.forClass(Notification.class);
verify(mNotificationManager).notify(eq(tag), eq(SIGN_IN.eventId), noteCaptor.capture());
@ -565,7 +574,7 @@ public class NetworkNotificationManagerTest {
doReturn(testContents).when(mResources).getString(
R.string.mobile_network_available_no_internet_detailed, TEST_OPERATOR_NAME);
runTelephonySignInNotificationTest(testTitle, testContents);
runSignInNotificationTest(mCellNai, testTitle, testContents);
}
@Test
@ -579,6 +588,21 @@ public class NetworkNotificationManagerTest {
doReturn(testContents).when(mResources).getString(
R.string.mobile_network_available_no_internet_detailed_unknown_carrier);
runTelephonySignInNotificationTest(testTitle, testContents);
runSignInNotificationTest(mCellNai, testTitle, testContents);
}
@Test
public void testBluetoothSignInNotification_EmptyNotificationContents() {
final String testTitle = "Test title";
final String testContents = "Test contents";
doReturn(testTitle).when(mResources).getString(
R.string.network_available_sign_in, 0);
doReturn(testContents).when(mResources).getString(
eq(R.string.network_available_sign_in_detailed), any());
runSignInNotificationTest(mBluetoothNai, testTitle, testContents);
// The details should be queried with an empty string argument. In practice the notification
// contents may just be an empty string, since the default translation just outputs the arg.
verify(mResources).getString(eq(R.string.network_available_sign_in_detailed), eq(""));
}
}