Merge "Don't crash system server" into oc-mr1-dev

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

@@ -494,7 +494,7 @@ abstract public class ManagedServices {
             return info;
         }
         throw new SecurityException("Disallowed call from unknown " + getCaption() + ": "
-                + service);
+                + service + " " + service.getClass());
     }
 
     public void unregisterService(IInterface service, int userid) {

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

@@ -737,6 +737,9 @@ public class ZenModeHelper {
             mConfig = config;
             mHandler.postApplyConfig(config, reason, setRingerMode);
             return true;
+        } catch (SecurityException e) {
+            Log.wtf(TAG, "Invalid rule in config", e);
+            return false;
         } finally {
             Binder.restoreCallingIdentity(identity);
         }