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

Merge "Update Nullability per API review" into sc-dev

Browse Source
This commit is contained in:
Soonil Nagarkar
2021-03-24 04:09:06 +00:00
committed by Android (Google) Code Review
parent ca3ebc1df4 93b6057ebe
commit 1419d29d30
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -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();

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

@@ -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();
}