From 51de567d5250dcf6fe62465560a28cafcf427eb5 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Sun, 18 Mar 2018 16:46:24 -0700
Subject: [PATCH] Frameworks: Make MockUtils more robust

Avoid a NullPointerException.

Bug: 75459260
Test: mmma frameworks/base/services/tests/servicestests
Change-Id: I2e273b3bd808226507e5e50b537d70edb25950a6
---
 .../src/com/android/server/devicepolicy/MockUtils.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java b/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java
index 92ea766566934..17e58325734fb 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java
@@ -22,6 +22,7 @@ import com.android.server.pm.UserRestrictionsUtils;
 
 import android.content.ComponentName;
 import android.content.Intent;
+import android.os.BaseBundle;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.util.ArraySet;
@@ -92,7 +93,10 @@ public class MockUtils {
             public boolean matches(Object item) {
                 if (item == null) return false;
                 if (!intent.filterEquals((Intent) item)) return false;
-                return intent.getExtras().kindofEquals(((Intent) item).getExtras());
+                BaseBundle extras = intent.getExtras();
+                BaseBundle itemExtras = ((Intent) item).getExtras();
+                return (extras == itemExtras) || (extras != null &&
+                        extras.kindofEquals(itemExtras));
             }
             @Override
             public void describeTo(Description description) {