Merge "catch USER_ALL in badging check" into oc-dev

services/core/java/com/android/server/notification/RankingHelper.java

@@ -1158,6 +1158,9 @@ public class RankingHelper implements RankingConfig {
 
     public boolean badgingEnabled(UserHandle userHandle) {
         int userId = userHandle.getIdentifier();
+        if (userId == UserHandle.USER_ALL) {
+            return false;
+        }
         if (mBadgingEnabled.indexOfKey(userId) < 0) {
             mBadgingEnabled.put(userId,
                     Secure.getIntForUser(mContext.getContentResolver(),

services/tests/notification/src/com/android/server/notification/RankingHelperTest.java

@@ -1231,6 +1231,15 @@ public class RankingHelperTest extends NotificationTestCase {
         assertFalse(mHelper.badgingEnabled(USER));
     }
 
+    @Test
+    public void testBadgingForUserAll() throws Exception {
+        try {
+            mHelper.badgingEnabled(UserHandle.ALL);
+        } catch (Exception e) {
+            fail("just don't throw");
+        }
+    }
+
     @Test
     public void testBadgingOverrideUserIsolation() throws Exception {
         Secure.putIntForUser(getContext().getContentResolver(),