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

Commit 488d37b2 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by android-build-merger
Browse files

Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2 am: ed5beec2 

am: de0ebb08

Change-Id: I60c55b6706e8d43121e8b2c7a35efff38668f66b
parents 55be4efa de0ebb08

api/current.txt

+2 −2
Original line number Original line 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 setAudioChannelCount(int);

    method public android.media.tv.TvTrackInfo.Builder setAudioSampleRate(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 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 setExtra(android.os.Bundle);

    method public android.media.tv.TvTrackInfo.Builder setLanguage(String);

    method public android.media.tv.TvTrackInfo.Builder setLanguage(String);

    method public android.media.tv.TvTrackInfo.Builder setVideoActiveFormatDescription(byte);

    method public android.media.tv.TvTrackInfo.Builder setVideoActiveFormatDescription(byte);
@@ -44004,7 +44004,7 @@ package android.telephony { 
















  public class CarrierConfigManager {







  public class CarrierConfigManager {











    method @Nullable public android.os.PersistableBundle getConfig();







    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 @Nullable public android.os.PersistableBundle getConfigForSubId(int);











    method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);







    method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);











    method public void notifyConfigChangedForSubId(int);







    method public void notifyConfigChangedForSubId(int);

























api/system-current.txt



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -1191,7 +1191,7 @@ package android.app.usage {

























  public static final class UsageEvents.Event {







  public static final class UsageEvents.Event {











    method public int getInstanceId();







    method public int getInstanceId();











    method public String getNotificationChannelId();







    method @Nullable public String getNotificationChannelId();











    method @Nullable public String getTaskRootClassName();







    method @Nullable public String getTaskRootClassName();











    method @Nullable public String getTaskRootPackageName();







    method @Nullable public String getTaskRootPackageName();











    method public boolean isInstantApp();







    method public boolean isInstantApp();

































core/java/android/app/AppOpsManager.java



+5
−4




























Original line number
Original line
Diff line number
Diff line








@@ -3199,7 +3199,7 @@ public class AppOpsManager {









        }







        }































        @Override







        @Override











        public boolean equals(Object obj) {







        public boolean equals(@Nullable Object obj) {











            if (this == obj) {







            if (this == obj) {











                return true;







                return true;











            }







            }










@@ -3230,6 +3230,7 @@ public class AppOpsManager {









            return result;







            return result;











        }







        }


































        @NonNull











        @Override







        @Override











        public String toString() {







        public String toString() {











            return getClass().getSimpleName() + "[from:"







            return getClass().getSimpleName() + "[from:"










@@ -3465,7 +3466,7 @@ public class AppOpsManager {









        };







        };































        @Override







        @Override











        public boolean equals(Object obj) {







        public boolean equals(@Nullable Object obj) {











            if (this == obj) {







            if (this == obj) {











                return true;







                return true;











            }







            }










@@ -3697,7 +3698,7 @@ public class AppOpsManager {









        };







        };































        @Override







        @Override











        public boolean equals(Object obj) {







        public boolean equals(@Nullable Object obj) {











            if (this == obj) {







            if (this == obj) {











                return true;







                return true;











            }







            }










@@ -4051,7 +4052,7 @@ public class AppOpsManager {









        }







        }































        @Override







        @Override











        public boolean equals(Object obj) {







        public boolean equals(@Nullable Object obj) {











            if (this == obj) {







            if (this == obj) {











                return true;







                return true;











            }







            }

































core/java/android/app/StatusBarManager.java



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -620,6 +620,7 @@ public class StatusBarManager {









            mNotificationIcons = true;







            mNotificationIcons = true;











        }







        }


































        @NonNull











        @Override







        @Override











        public String toString() {







        public String toString() {











            StringBuilder sb = new StringBuilder();







            StringBuilder sb = new StringBuilder();

































core/java/android/app/Vr2dDisplayProperties.java



+3
−1




























Original line number
Original line
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.app;





























import android.annotation.IntDef;







import android.annotation.IntDef;











import android.annotation.NonNull;







import android.annotation.NonNull;














import android.annotation.Nullable;











import android.annotation.SystemApi;







import android.annotation.SystemApi;











import android.os.Parcel;







import android.os.Parcel;











import android.os.Parcelable;







import android.os.Parcelable;










@@ -74,6 +75,7 @@ public final class Vr2dDisplayProperties implements Parcelable {









        return result;







        return result;











    }







    }


































    @NonNull











    @Override







    @Override











    public String toString() {







    public String toString() {











        return "Vr2dDisplayProperties{"







        return "Vr2dDisplayProperties{"









@@ -86,7 +88,7 @@ public final class Vr2dDisplayProperties implements Parcelable {









    }







    }































    @Override







    @Override











    public boolean equals(Object o) {







    public boolean equals(@Nullable Object o) {











        if (this == o) return true;







        if (this == o) return true;











        if (o == null || getClass() != o.getClass()) return false;







        if (o == null || getClass() != o.getClass()) return false;