Merge "Add missing nullability annotations." (34c56bcf) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -2816,7 +2816,7 @@ package android.accessibilityservice {
		method public int describeContents();
		method public int getDisplayId();
		method public int getGestureId();
		method public void writeToParcel(android.os.Parcel, int);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.accessibilityservice.AccessibilityGestureInfo> CREATOR;
		}

		@@ -28198,7 +28198,7 @@ package android.media.tv {
		method public android.media.tv.TvTrackInfo.Builder setAudioChannelCount(int);
		method public android.media.tv.TvTrackInfo.Builder setAudioSampleRate(int);
		method public android.media.tv.TvTrackInfo.Builder setDescription(CharSequence);
		method public android.media.tv.TvTrackInfo.Builder setEncrypted(boolean);
		method @NonNull public android.media.tv.TvTrackInfo.Builder setEncrypted(boolean);
		method public android.media.tv.TvTrackInfo.Builder setExtra(android.os.Bundle);
		method public android.media.tv.TvTrackInfo.Builder setLanguage(String);
		method public android.media.tv.TvTrackInfo.Builder setVideoActiveFormatDescription(byte);
		@@ -44076,7 +44076,7 @@ package android.telephony {

		public class CarrierConfigManager {
		method @Nullable public android.os.PersistableBundle getConfig();
		method @Nullable public android.os.PersistableBundle getConfigByComponentForSubId(String, int);
		method @Nullable public android.os.PersistableBundle getConfigByComponentForSubId(@NonNull String, int);
		method @Nullable public android.os.PersistableBundle getConfigForSubId(int);
		method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);
		method public void notifyConfigChangedForSubId(int);

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1207,7 +1207,7 @@ package android.app.usage {

		public static final class UsageEvents.Event {
		method public int getInstanceId();
		method public String getNotificationChannelId();
		method @Nullable public String getNotificationChannelId();
		method @Nullable public String getTaskRootClassName();
		method @Nullable public String getTaskRootPackageName();
		method public boolean isInstantApp();

core/java/android/accessibilityservice/AccessibilityGestureInfo.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ public final class AccessibilityGestureInfo implements Parcelable {
		return mGestureId;
		}

		@NonNull
		@Override
		public String toString() {
		StringBuilder stringBuilder = new StringBuilder("AccessibilityGestureInfo[");
		@@ -133,7 +134,7 @@ public final class AccessibilityGestureInfo implements Parcelable {
		}

		@Override
		public void writeToParcel(Parcel parcel, int flags) {
		public void writeToParcel(@NonNull Parcel parcel, int flags) {
		parcel.writeInt(mGestureId);
		parcel.writeInt(mDisplayId);
		}

core/java/android/app/AppOpsManager.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.annotation.UnsupportedAppUsage;
		import android.app.usage.UsageStatsManager;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.pm.ParceledListSlice;
		import android.media.AudioAttributes.AttributeUsage;
		import android.os.Binder;
		@@ -3220,7 +3219,7 @@ public class AppOpsManager {
		}

		@Override
		public boolean equals(Object obj) {
		public boolean equals(@Nullable Object obj) {
		if (this == obj) {
		return true;
		}
		@@ -3251,6 +3250,7 @@ public class AppOpsManager {
		return result;
		}

		@NonNull
		@Override
		public String toString() {
		return getClass().getSimpleName() + "[from:"
		@@ -3486,7 +3486,7 @@ public class AppOpsManager {
		};

		@Override
		public boolean equals(Object obj) {
		public boolean equals(@Nullable Object obj) {
		if (this == obj) {
		return true;
		}
		@@ -3718,7 +3718,7 @@ public class AppOpsManager {
		};

		@Override
		public boolean equals(Object obj) {
		public boolean equals(@Nullable Object obj) {
		if (this == obj) {
		return true;
		}
		@@ -4072,7 +4072,7 @@ public class AppOpsManager {
		}

		@Override
		public boolean equals(Object obj) {
		public boolean equals(@Nullable Object obj) {
		if (this == obj) {
		return true;
		}

core/java/android/app/StatusBarManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -620,6 +620,7 @@ public class StatusBarManager {
		mNotificationIcons = true;
		}

		@NonNull
		@Override
		public String toString() {
		StringBuilder sb = new StringBuilder();