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

Merge "Add trivial nullability annotations."

Browse Source
This commit is contained in:
Jeff Sharkey
2019-03-06 16:17:56 +00:00
committed by Android (Google) Code Review
parent 095adc27dc ba4acd5575
commit 715b34be65
7 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@@ -9560,8 +9560,8 @@ package android.content {
method public final void unregisterContentObserver(@NonNull android.database.ContentObserver);
method public final int update(@RequiresPermission.Write @NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[]);
method public static void validateSyncExtrasBundle(android.os.Bundle);
method public static android.content.ContentResolver wrap(@NonNull android.content.ContentProvider);
method public static android.content.ContentResolver wrap(@NonNull android.content.ContentProviderClient);
method @NonNull public static android.content.ContentResolver wrap(@NonNull android.content.ContentProvider);
method @NonNull public static android.content.ContentResolver wrap(@NonNull android.content.ContentProviderClient);
field public static final String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";
field public static final String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";
field public static final String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";
@@ -23810,7 +23810,7 @@ package android.media {
method public android.graphics.Bitmap getThumbnailBitmap();
method public byte[] getThumbnailBytes();
method @Nullable public long[] getThumbnailRange();
method public boolean hasAttribute(String);
method public boolean hasAttribute(@NonNull String);
method public boolean hasThumbnail();
method public boolean isThumbnailCompressed();
method public void saveAttributes() throws java.io.IOException;
@@ -38433,7 +38433,7 @@ package android.provider {
field public static final String ACTION_REVIEW_SECURE = "android.provider.action.REVIEW_SECURE";
field public static final String ACTION_VIDEO_CAPTURE = "android.media.action.VIDEO_CAPTURE";
field public static final String AUTHORITY = "media";
field public static final android.net.Uri AUTHORITY_URI;
field @NonNull public static final android.net.Uri AUTHORITY_URI;
field public static final String EXTRA_BRIGHTNESS = "android.provider.extra.BRIGHTNESS";
field public static final String EXTRA_DURATION_LIMIT = "android.intent.extra.durationLimit";
field public static final String EXTRA_FINISH_ON_COMPLETION = "android.intent.extra.finishOnCompletion";

6
api/system-current.txt
View File

@@ -5592,9 +5592,9 @@ package android.os {
method public boolean isSystem();
method public static int myUserId();
method public static android.os.UserHandle of(int);
field public static final android.os.UserHandle ALL;
field public static final android.os.UserHandle CURRENT;
field public static final android.os.UserHandle SYSTEM;
field @NonNull public static final android.os.UserHandle ALL;
field @NonNull public static final android.os.UserHandle CURRENT;
field @NonNull public static final android.os.UserHandle SYSTEM;
}
public class UserManager {

6
api/test-current.txt
View File

@@ -1752,9 +1752,9 @@ package android.os {
method public static int getAppId(int);
method public int getIdentifier();
method public static boolean isApp(int);
field public static final android.os.UserHandle ALL;
field public static final android.os.UserHandle CURRENT;
field public static final android.os.UserHandle SYSTEM;
field @NonNull public static final android.os.UserHandle ALL;
field @NonNull public static final android.os.UserHandle CURRENT;
field @NonNull public static final android.os.UserHandle SYSTEM;
}
public class UserManager {

6
core/java/android/content/ContentResolver.java
View File

@@ -623,7 +623,7 @@ public abstract class ContentResolver implements ContentInterface {
}
/** {@hide} */
public static ContentResolver wrap(@NonNull ContentInterface wrapped) {
public static @NonNull ContentResolver wrap(@NonNull ContentInterface wrapped) {
Preconditions.checkNotNull(wrapped);
return new ContentResolver(null, wrapped) {
@@ -654,7 +654,7 @@ public abstract class ContentResolver implements ContentInterface {
* Create a {@link ContentResolver} instance that redirects all its methods
* to the given {@link ContentProvider}.
*/
public static ContentResolver wrap(@NonNull ContentProvider wrapped) {
public static @NonNull ContentResolver wrap(@NonNull ContentProvider wrapped) {
return wrap((ContentInterface) wrapped);
}
@@ -662,7 +662,7 @@ public abstract class ContentResolver implements ContentInterface {
* Create a {@link ContentResolver} instance that redirects all its methods
* to the given {@link ContentProviderClient}.
*/
public static ContentResolver wrap(@NonNull ContentProviderClient wrapped) {
public static @NonNull ContentResolver wrap(@NonNull ContentProviderClient wrapped) {
return wrap((ContentInterface) wrapped);
}

11
core/java/android/os/UserHandle.java
View File

@@ -17,6 +17,7 @@
package android.os;
import android.annotation.AppIdInt;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.annotation.UserIdInt;
@@ -40,7 +41,7 @@ public final class UserHandle implements Parcelable {
/** @hide A user handle to indicate all users on the device */
@SystemApi
@TestApi
public static final UserHandle ALL = new UserHandle(USER_ALL);
public static final @NonNull UserHandle ALL = new UserHandle(USER_ALL);
/** @hide A user id to indicate the currently active user */
public static final @UserIdInt int USER_CURRENT = -2;
@@ -48,7 +49,7 @@ public final class UserHandle implements Parcelable {
/** @hide A user handle to indicate the current user of the device */
@SystemApi
@TestApi
public static final UserHandle CURRENT = new UserHandle(USER_CURRENT);
public static final @NonNull UserHandle CURRENT = new UserHandle(USER_CURRENT);
/** @hide A user id to indicate that we would like to send to the current
* user, but if this is calling from a user process then we will send it
@@ -58,7 +59,7 @@ public final class UserHandle implements Parcelable {
/** @hide A user handle to indicate that we would like to send to the current
* user, but if this is calling from a user process then we will send it
* to the caller's user instead of failing with a security exception */
public static final UserHandle CURRENT_OR_SELF = new UserHandle(USER_CURRENT_OR_SELF);
public static final @NonNull UserHandle CURRENT_OR_SELF = new UserHandle(USER_CURRENT_OR_SELF);
/** @hide An undefined user id */
public static final @UserIdInt int USER_NULL = -10000;
@@ -77,7 +78,7 @@ public final class UserHandle implements Parcelable {
* check the target user's flag {@link android.content.pm.UserInfo#isAdmin}.
*/
@Deprecated
public static final UserHandle OWNER = new UserHandle(USER_OWNER);
public static final @NonNull UserHandle OWNER = new UserHandle(USER_OWNER);
/** @hide A user id constant to indicate the "system" user of the device */
public static final @UserIdInt int USER_SYSTEM = 0;
@@ -88,7 +89,7 @@ public final class UserHandle implements Parcelable {
/** @hide A user handle to indicate the "system" user of the device */
@SystemApi
@TestApi
public static final UserHandle SYSTEM = new UserHandle(USER_SYSTEM);
public static final @NonNull UserHandle SYSTEM = new UserHandle(USER_SYSTEM);
/**
* @hide Enable multi-user related side effects. Set this to false if

2
core/java/android/provider/MediaStore.java
View File

@@ -98,7 +98,7 @@ public final class MediaStore {
/** The authority for the media provider */
public static final String AUTHORITY = "media";
/** A content:// style uri to the authority for the media provider */
public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);
public static final @NonNull Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);
/**
* Volume name used for content on "internal" storage of device. This

2
media/java/android/media/ExifInterface.java
View File

@@ -1891,7 +1891,7 @@ public class ExifInterface {
*
* @param tag the name of the tag.
*/
public boolean hasAttribute(String tag) {
public boolean hasAttribute(@NonNull String tag) {
return (getExifAttribute(tag) != null);
}