Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Frameworks: Make MockUtils more robust

Browse Source 
Avoid a NullPointerException.

Bug: 75459260
Test: mmma frameworks/base/services/tests/servicestests
Change-Id: I2e273b3bd808226507e5e50b537d70edb25950a6
This commit is contained in:
Andreas Gampe
2018-03-18 16:46:24 -07:00
parent c5d0ed9f3c
commit 51de567d52
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {