Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f17d4f14 authored by Soonil Nagarkar's avatar Soonil Nagarkar Committed by Automerger Merge Worker
Browse files

Merge "Update Nullability per API review" into sc-dev am: 1419d29d 

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

Change-Id: I3d7afc3064683587495483662f83c0eac951f3d4
parents a5f48274 1419d29d

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6320,13 +6320,13 @@ package android.app { 
    method public static android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int);

    method public static android.app.PendingIntent getActivity(android.content.Context, int, @NonNull android.content.Intent, int, @Nullable android.os.Bundle);

    method public static android.app.PendingIntent getBroadcast(android.content.Context, int, @NonNull android.content.Intent, int);

    method @NonNull public String getCreatorPackage();

    method @Nullable public String getCreatorPackage();

    method public int getCreatorUid();

    method @NonNull public android.os.UserHandle getCreatorUserHandle();

    method public static android.app.PendingIntent getForegroundService(android.content.Context, int, @NonNull android.content.Intent, int);

    method @NonNull public android.content.IntentSender getIntentSender();

    method public static android.app.PendingIntent getService(android.content.Context, int, @NonNull android.content.Intent, int);

    method @Deprecated @NonNull public String getTargetPackage();

    method @Deprecated @Nullable public String getTargetPackage();

    method public boolean isActivity();

    method public boolean isBroadcast();

    method public boolean isForegroundService();

core/java/android/app/PendingIntent.java

+2 −2
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ public final class PendingIntent implements Parcelable { 
     * @deprecated Renamed to {@link #getCreatorPackage()}.

     */

    @Deprecated

    @NonNull

    @Nullable

    public String getTargetPackage() {

        return getCreatorPackage();

    }
@@ -1032,7 +1032,7 @@ public final class PendingIntent implements Parcelable { 
     *

     * @return The package name of the PendingIntent.

     */

    @NonNull

    @Nullable

    public String getCreatorPackage() {

        return getCachedInfo().getCreatorPackage();

    }