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

Commit 51de567d authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Frameworks: Make MockUtils more robust 

Avoid a NullPointerException.

Bug: 75459260
Test: mmma frameworks/base/services/tests/servicestests
Change-Id: I2e273b3bd808226507e5e50b537d70edb25950a6
parent c5d0ed9f

services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java

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