Merge "Fix venue info notification not displaying" am: 0eb85a8a70 am:... (07869999) · Commits · e / os / android_packages_modules_NetworkStack

src/com/android/networkstack/NetworkStackNotifier.java

+20 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@

	package com.android.networkstack;		package com.android.networkstack;

			import static android.app.NotificationManager.IMPORTANCE_NONE;

	import android.app.Notification;		import android.app.Notification;
	import android.app.NotificationChannel;		import android.app.NotificationChannel;
	import android.app.NotificationManager;		import android.app.NotificationManager;
	@@ -142,7 +144,19 @@ public class NetworkStackNotifier {
	resources.getString(title),		resources.getString(title),
	importance);		importance);
	channel.setDescription(resources.getString(description));		channel.setDescription(resources.getString(description));
	mNotificationManager.createNotificationChannel(channel);		getNotificationManagerForChannels().createNotificationChannel(channel);
			}

			/**
			* Get the NotificationManager to use to query channels, as opposed to posting notifications.
			*
			* Although notifications are posted as USER_ALL, notification channels are always created
			* based on the UID calling NotificationManager, regardless of the context UserHandle.
			* When querying notification channels, using a USER_ALL context would return no channel: the
			* default context (as UserHandle 0 for NetworkStack) must be used.
			*/
			private NotificationManager getNotificationManagerForChannels() {
			return mContext.getSystemService(NotificationManager.class);
	}		}

	/**		/**
	@@ -284,7 +298,11 @@ public class NetworkStackNotifier {
	}		}

	private boolean isVenueInfoNotificationEnabled() {		private boolean isVenueInfoNotificationEnabled() {
	return mNotificationManager.getNotificationChannel(CHANNEL_VENUE_INFO) != null;		final NotificationChannel channel = getNotificationManagerForChannels()
			.getNotificationChannel(CHANNEL_VENUE_INFO);
			if (channel == null) return false;

			return channel.getImportance() != IMPORTANCE_NONE;
	}		}

	private static String getNotificationTag(@NonNull Network network) {		private static String getNotificationTag(@NonNull Network network) {

tests/unit/src/com/android/networkstack/NetworkStackNotifierTest.kt

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import android.app.Notification
	import android.app.NotificationChannel		import android.app.NotificationChannel
	import android.app.NotificationManager		import android.app.NotificationManager
	import android.app.NotificationManager.IMPORTANCE_DEFAULT		import android.app.NotificationManager.IMPORTANCE_DEFAULT
			import android.app.NotificationManager.IMPORTANCE_NONE
	import android.app.PendingIntent		import android.app.PendingIntent
	import android.app.PendingIntent.FLAG_UPDATE_CURRENT		import android.app.PendingIntent.FLAG_UPDATE_CURRENT
	import android.content.Context		import android.content.Context
	@@ -80,6 +81,8 @@ class NetworkStackNotifierTest {
	@Mock		@Mock
	private lateinit var mNm: NotificationManager		private lateinit var mNm: NotificationManager
	@Mock		@Mock
			private lateinit var mNotificationChannelsNm: NotificationManager
			@Mock
	private lateinit var mCm: ConnectivityManager		private lateinit var mCm: ConnectivityManager
	@Mock		@Mock
	private lateinit var mResources: Resources		private lateinit var mResources: Resources
	@@ -141,10 +144,12 @@ class NetworkStackNotifierTest {
	realContext.packageName, 0, UserHandle.ALL)		realContext.packageName, 0, UserHandle.ALL)

	mAllUserContext.mockService(Context.NOTIFICATION_SERVICE, NotificationManager::class, mNm)		mAllUserContext.mockService(Context.NOTIFICATION_SERVICE, NotificationManager::class, mNm)
			mContext.mockService(Context.NOTIFICATION_SERVICE, NotificationManager::class,
			mNotificationChannelsNm)
	mContext.mockService(Context.CONNECTIVITY_SERVICE, ConnectivityManager::class, mCm)		mContext.mockService(Context.CONNECTIVITY_SERVICE, ConnectivityManager::class, mCm)

	doReturn(NotificationChannel(CHANNEL_VENUE_INFO, "TestChannel", IMPORTANCE_DEFAULT))		doReturn(NotificationChannel(CHANNEL_VENUE_INFO, "TestChannel", IMPORTANCE_DEFAULT))
	.`when`(mNm).getNotificationChannel(CHANNEL_VENUE_INFO)		.`when`(mNotificationChannelsNm).getNotificationChannel(CHANNEL_VENUE_INFO)

	doReturn(mPendingIntent).`when`(mDependencies).getActivityPendingIntent(		doReturn(mPendingIntent).`when`(mDependencies).getActivityPendingIntent(
	any(), any(), anyInt())		any(), any(), anyInt())
	@@ -247,7 +252,8 @@ class NetworkStackNotifierTest {
	fun testConnectedVenueInfoNotification_VenueInfoDisabled() {		fun testConnectedVenueInfoNotification_VenueInfoDisabled() {
	// Venue info (CaptivePortalData) is not available for API <= Q		// Venue info (CaptivePortalData) is not available for API <= Q
	assumeTrue(NetworkInformationShimImpl.useApiAboveQ())		assumeTrue(NetworkInformationShimImpl.useApiAboveQ())
	doReturn(null).`when`(mNm).getNotificationChannel(CHANNEL_VENUE_INFO)		val channel = NotificationChannel(CHANNEL_VENUE_INFO, "test channel", IMPORTANCE_NONE)
			doReturn(channel).`when`(mNotificationChannelsNm).getNotificationChannel(CHANNEL_VENUE_INFO)
	mNotifier.notifyCaptivePortalValidationPending(TEST_NETWORK)		mNotifier.notifyCaptivePortalValidationPending(TEST_NETWORK)
	onLinkPropertiesChanged(mTestCapportLp)		onLinkPropertiesChanged(mTestCapportLp)
	onDefaultNetworkAvailable(TEST_NETWORK)		onDefaultNetworkAvailable(TEST_NETWORK)