From 843888e7ecc26f35b84bc07c4f7965323b46c687 Mon Sep 17 00:00:00 2001 From: Ricky Chow Date: Mon, 12 Aug 2019 14:36:20 +1000 Subject: [PATCH] Added null check to fileobserver callback Test: Manual Bug: 139145421 Change-Id: I7eb87729217ceefcccab3f885eb9fe01dd2bfcc1 (cherry picked from commit dffecba3a2a0006f4a5ba452610ad973bbe175dc) --- .../core/java/com/android/server/firewall/IntentFirewall.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/firewall/IntentFirewall.java b/services/core/java/com/android/server/firewall/IntentFirewall.java index 376a864e77726..c2af29ca500b2 100644 --- a/services/core/java/com/android/server/firewall/IntentFirewall.java +++ b/services/core/java/com/android/server/firewall/IntentFirewall.java @@ -32,10 +32,12 @@ import android.os.RemoteException; import android.util.ArrayMap; import android.util.Slog; import android.util.Xml; + import com.android.internal.util.ArrayUtils; import com.android.internal.util.XmlUtils; import com.android.server.EventLogTags; import com.android.server.IntentResolver; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -562,7 +564,7 @@ public class IntentFirewall { @Override public void onEvent(int event, String path) { - if (path.endsWith(".xml")) { + if (path != null && path.endsWith(".xml")) { // we wait 250ms before taking any action on an event, in order to dedup multiple // events. E.g. a delete event followed by a create event followed by a subsequent // write+close event