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

Merge "Frameworks: Make MockUtils more robust" into pi-dev

Browse Source 
am: 16e56f7815

Change-Id: I9b4d9a9ef82cf373eed15cea47dd0a73aacbe56c
This commit is contained in:
Andreas Gampe
2018-03-19 17:29:05 +00:00
committed by android-build-merger
parent ea9665cbe5 16e56f7815
commit f0e1e01c44
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) {