summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2014-06-19 13:03:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-17 21:55:55 +0000
commite7cd37e6138c5e769cc6cb398e632bca24d2d1ab (patch)
tree4b3bc0c1337023e7e5ca9940ab2b840e7ddf772d /test-runner
parentf7ecf7c80520c017255cb350d183f0b62022349b (diff)
parent63798c596dc757135950313eb4bb44ca58696c68 (diff)
downloadframeworks_base-e7cd37e6138c5e769cc6cb398e632bca24d2d1ab.zip
frameworks_base-e7cd37e6138c5e769cc6cb398e632bca24d2d1ab.tar.gz
frameworks_base-e7cd37e6138c5e769cc6cb398e632bca24d2d1ab.tar.bz2
Merge "Introducing crossProfileIntentFilters that skip the current profile."
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/src/android/test/mock/MockPackageManager.java21
1 files changed, 2 insertions, 19 deletions
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java
index 17db1b4..a3b32b3 100644
--- a/test-runner/src/android/test/mock/MockPackageManager.java
+++ b/test-runner/src/android/test/mock/MockPackageManager.java
@@ -707,17 +707,8 @@ public class MockPackageManager extends PackageManager {
* @hide
*/
@Override
- public void addCrossProfileIntentFilter(IntentFilter filter, boolean removable,
- int sourceUserId, int targetUserId) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * @hide
- */
- @Override
- public void addForwardingIntentFilter(IntentFilter filter, boolean removable, int sourceUserId,
- int targetUserId) {
+ public void addCrossProfileIntentFilter(IntentFilter filter, int sourceUserId, int targetUserId,
+ int flags) {
throw new UnsupportedOperationException();
}
@@ -729,14 +720,6 @@ public class MockPackageManager extends PackageManager {
throw new UnsupportedOperationException();
}
- /**
- * @hide
- */
- @Override
- public void clearForwardingIntentFilters(int sourceUserId) {
- throw new UnsupportedOperationException();
- }
-
/** {@hide} */
public PackageInstaller getPackageInstaller() {
throw new UnsupportedOperationException();