diff options
| author | Paul Hu <paulhu@google.com> | 2021-01-22 03:09:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-22 03:09:15 +0000 |
| commit | 27e9efd794024048b1c98c4e1bb0d0d5a49909f9 (patch) | |
| tree | 2e630e1eb6817f56205ca4402e5bf41a1aa07b1d /test-mock | |
| parent | d197ef1ff5b0b4a3916b56467c4091f20410c55f (diff) | |
| parent | 796c87835254d84c1d1ad210b3bc3ffa13683271 (diff) | |
Merge "Expose Context#sendStickyBroadcast(Intent, Bundle)" am: 846e5f178d am: c9e394fc27 am: 796c878352
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1491876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4d6e07f92301baae6056d0891bc292cbd67450f
Diffstat (limited to 'test-mock')
| -rw-r--r-- | test-mock/api/current.txt | 1 | ||||
| -rw-r--r-- | test-mock/src/android/test/mock/MockContext.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/test-mock/api/current.txt b/test-mock/api/current.txt index 1110790c373f..d1a68d4e9cb2 100644 --- a/test-mock/api/current.txt +++ b/test-mock/api/current.txt @@ -117,6 +117,7 @@ package android.test.mock { method public void sendOrderedBroadcast(android.content.Intent, String, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle); method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, String, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle); method public void sendStickyBroadcast(android.content.Intent); + method public void sendStickyBroadcast(android.content.Intent, android.os.Bundle); method public void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle); method public void sendStickyOrderedBroadcast(android.content.Intent, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle); method public void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle); diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java index 98e7b53a30cc..5391bd8642d5 100644 --- a/test-mock/src/android/test/mock/MockContext.java +++ b/test-mock/src/android/test/mock/MockContext.java @@ -493,6 +493,11 @@ public class MockContext extends Context { } @Override + public void sendStickyBroadcast(Intent intent, Bundle options) { + throw new UnsupportedOperationException(); + } + + @Override public void sendStickyOrderedBroadcast(Intent intent, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData, Bundle initialExtras) { |