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

Merge "Make PendingIntent.send public API." into udc-dev am: 4be490ab45

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22142409

Change-Id: Ib3f308e8726ab2a08a954a80b0dee3d66680e47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Achim Thesmann
2023-03-18 22:35:25 +00:00
committed by Automerger Merge Worker
parent 0abb54fd4e 4be490ab45
commit 2da19ea05d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -6942,6 +6942,7 @@ package android.app {
method public void send() throws android.app.PendingIntent.CanceledException; method public void send() throws android.app.PendingIntent.CanceledException;
method public void send(int) throws android.app.PendingIntent.CanceledException; method public void send(int) throws android.app.PendingIntent.CanceledException;
method public void send(android.content.Context, int, @Nullable android.content.Intent) throws android.app.PendingIntent.CanceledException; method public void send(android.content.Context, int, @Nullable android.content.Intent) throws android.app.PendingIntent.CanceledException;
method public void send(@Nullable android.os.Bundle) throws android.app.PendingIntent.CanceledException;
method public void send(int, @Nullable android.app.PendingIntent.OnFinished, @Nullable android.os.Handler) throws android.app.PendingIntent.CanceledException; method public void send(int, @Nullable android.app.PendingIntent.OnFinished, @Nullable android.os.Handler) throws android.app.PendingIntent.CanceledException;
method public void send(android.content.Context, int, @Nullable android.content.Intent, @Nullable android.app.PendingIntent.OnFinished, @Nullable android.os.Handler) throws android.app.PendingIntent.CanceledException; method public void send(android.content.Context, int, @Nullable android.content.Intent, @Nullable android.app.PendingIntent.OnFinished, @Nullable android.os.Handler) throws android.app.PendingIntent.CanceledException;
method public void send(android.content.Context, int, @Nullable android.content.Intent, @Nullable android.app.PendingIntent.OnFinished, @Nullable android.os.Handler, @Nullable String) throws android.app.PendingIntent.CanceledException; method public void send(android.content.Context, int, @Nullable android.content.Intent, @Nullable android.app.PendingIntent.OnFinished, @Nullable android.os.Handler, @Nullable String) throws android.app.PendingIntent.CanceledException;

4
core/java/android/app/PendingIntent.java
View File

@@ -892,10 +892,8 @@ public final class PendingIntent implements Parcelable {
* @param options Additional options the caller would like to provide to modify the * @param options Additional options the caller would like to provide to modify the
* sending behavior. May be built from an {@link ActivityOptions} to apply to an * sending behavior. May be built from an {@link ActivityOptions} to apply to an
* activity start. * activity start.
*
* @hide
*/ */
public void send(Bundle options) throws CanceledException { public void send(@Nullable Bundle options) throws CanceledException {
send(null, 0, null, null, null, null, options); send(null, 0, null, null, null, null, options);
} }