commit d601360904df9b811205f44f15c89f12703d6d72
author Amin Shaikh <ashaikh@google.com> Fri Mar 24 15:52:32 2017 -0700
committer Amin Shaikh <ashaikh@google.com> Fri Mar 24 16:08:32 2017 -0700
tree 4e39ba5a7bd9fad73c9995877d3bef58eeef20f5
parent 424c8c1716cfe601704b71523743d26611a72e17

Parse NotificationChannel ID meta-data.

- Add this new meta-data field on NetworkRecommendationProvider to NetworkScorerAppData

Bug: 36571359
Test: runtest frameworks-services
Change-Id: Ic8c594bea406fc5183a4919b808bce5159912650

services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java

diff --git a/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java b/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java
index e8663a2..9197ccf9 100644
--- a/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java
@@ -62,6 +62,8 @@
 public class NetworkScorerAppManagerTest {
     private static String MOCK_SERVICE_LABEL = "Mock Service";
     private static String MOCK_OVERRIDEN_SERVICE_LABEL = "Mock Service Label Override";
+    private static String MOCK_NETWORK_AVAILABLE_NOTIFICATION_CHANNEL_ID =
+            "Mock Network Available Notification Channel Id";
 
     @Mock private Context mMockContext;
     @Mock private PackageManager mMockPm;
@@ -168,13 +170,30 @@
         mockScoreNetworksGranted(recoComponent.getPackageName());
         mockRecommendationServiceAvailable(recoComponent, 924 /* packageUid */,
                 enableUseOpenWifiComponent.getPackageName());
-        mockEnableUseOpenWifiActivity(enableUseOpenWifiComponent);
 
         final NetworkScorerAppData activeScorer = mNetworkScorerAppManager.getActiveScorer();
         assertNotNull(activeScorer);
         assertEquals(recoComponent, activeScorer.getRecommendationServiceComponent());
         assertEquals(924, activeScorer.packageUid);
         assertEquals(enableUseOpenWifiComponent, activeScorer.getEnableUseOpenWifiActivity());
+        assertNull(activeScorer.getNetworkAvailableNotificationChannelId());
+    }
+
+    @Test
+    public void testGetActiveScorer_providerAvailable_networkAvailableNotificationChannelIdSet() {
+        final ComponentName recoComponent = new ComponentName("package1", "class1");
+        setNetworkRecoPackageSetting(recoComponent.getPackageName());
+        mockScoreNetworksGranted(recoComponent.getPackageName());
+        mockRecommendationServiceAvailable(recoComponent, 924 /* packageUid */,
+                null /* enableUseOpenWifiActivityPackage */, false /* serviceLabelOverride */,
+                true /* setNotificationChannelId */);
+
+        final NetworkScorerAppData activeScorer = mNetworkScorerAppManager.getActiveScorer();
+        assertNotNull(activeScorer);
+        assertEquals(recoComponent, activeScorer.getRecommendationServiceComponent());
+        assertEquals(924, activeScorer.packageUid);
+        assertEquals(MOCK_NETWORK_AVAILABLE_NOTIFICATION_CHANNEL_ID,
+                activeScorer.getNetworkAvailableNotificationChannelId());
     }
 
     @Test
@@ -368,6 +387,13 @@
 
     private void mockRecommendationServiceAvailable(final ComponentName compName, int packageUid,
             String enableUseOpenWifiActivityPackage, boolean serviceLabelOverride) {
+        mockRecommendationServiceAvailable(compName, packageUid, enableUseOpenWifiActivityPackage,
+                serviceLabelOverride, false);
+    }
+
+    private void mockRecommendationServiceAvailable(final ComponentName compName, int packageUid,
+            String enableUseOpenWifiActivityPackage, boolean serviceLabelOverride,
+            boolean setNotificationChannel) {
         final ResolveInfo serviceInfo = new ResolveInfo();
         serviceInfo.serviceInfo = new ServiceInfo();
         serviceInfo.serviceInfo.name = compName.getClassName();
@@ -390,6 +416,14 @@
         } else {
             serviceInfo.serviceInfo.nonLocalizedLabel = MOCK_SERVICE_LABEL;
         }
+        if (setNotificationChannel) {
+            if (serviceInfo.serviceInfo.metaData == null) {
+                serviceInfo.serviceInfo.metaData = new Bundle();
+            }
+            serviceInfo.serviceInfo.metaData.putString(
+                    NetworkScoreManager.NETWORK_AVAILABLE_NOTIFICATION_CHANNEL_ID_META_DATA,
+                    MOCK_NETWORK_AVAILABLE_NOTIFICATION_CHANNEL_ID);
+        }
 
         final int flags = PackageManager.GET_META_DATA;
         when(mMockPm.resolveService(