diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-01-07 00:20:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-07 00:20:51 +0000 |
| commit | b07e14152b1d10e3fb84a071869264de1dd1453b (patch) | |
| tree | 14fd02b423c6c89e171089f83c9717961adf7a59 /core/java/android | |
| parent | 8bf65d078fb388b47e6ded3aad0bcd1e7e08593f (diff) | |
| parent | 191069d56e5c0f5881076bbff3294ec2031b0af6 (diff) | |
Merge "Test InstantAppResolverService method fallback"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/InstantAppResolverService.java | 6 | ||||
| -rw-r--r-- | core/java/android/app/TEST_MAPPING | 4 | ||||
| -rw-r--r-- | core/java/android/content/pm/TEST_MAPPING | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/core/java/android/app/InstantAppResolverService.java b/core/java/android/app/InstantAppResolverService.java index a413c606b76f..0cd030e0f699 100644 --- a/core/java/android/app/InstantAppResolverService.java +++ b/core/java/android/app/InstantAppResolverService.java @@ -35,6 +35,7 @@ import android.os.UserHandle; import android.util.Log; import android.util.Slog; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.SomeArgs; import java.util.Arrays; @@ -297,7 +298,10 @@ public abstract class InstantAppResolverService extends Service { public static final class InstantAppResolutionCallback { private final IRemoteCallback mCallback; private final int mSequence; - InstantAppResolutionCallback(int sequence, IRemoteCallback callback) { + + /** @hide **/ + @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + public InstantAppResolutionCallback(int sequence, IRemoteCallback callback) { mCallback = callback; mSequence = sequence; } diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING index c585b5fcdc19..7b45b725f5b6 100644 --- a/core/java/android/app/TEST_MAPPING +++ b/core/java/android/app/TEST_MAPPING @@ -48,6 +48,10 @@ } ], "file_patterns": ["INotificationManager\\.aidl"] + }, + { + "name": "FrameworksInstantAppResolverTests", + "file_patterns": ["(/|^)InstantAppResolve[^/]*"] } ], "postsubmit": [ diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING index df4ae097a158..0549c34cc034 100644 --- a/core/java/android/content/pm/TEST_MAPPING +++ b/core/java/android/content/pm/TEST_MAPPING @@ -9,5 +9,11 @@ { "path": "system/apex/tests" } + ], + "presubmit": [ + { + "name": "FrameworksInstantAppResolverTests", + "file_patterns": ["(/|^)InstantApp[^/]*"] + } ] } |