Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be (de0ebb08) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -28139,7 +28139,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);
		@@ -44004,7 +44004,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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -1191,7 +1191,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();

+5 −4

Original line number	Diff line number	Diff line
		@@ -3199,7 +3199,7 @@ public class AppOpsManager {
		}

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

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

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

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

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

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.app;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -74,6 +75,7 @@ public final class Vr2dDisplayProperties implements Parcelable {
		return result;
		}

		@NonNull
		@Override
		public String toString() {
		return "Vr2dDisplayProperties{"
		@@ -86,7 +88,7 @@ public final class Vr2dDisplayProperties implements Parcelable {
		}

		@Override
		public boolean equals(Object o) {
		public boolean equals(@Nullable Object o) {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;