Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd588c0 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

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

am: 7b7967a8

Change-Id: I6b828ef65e4b3bbf22f7ae0b9bdbd5561ec4b26b
parents 270bd527 7b7967a8

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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);

        }