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

Commit 02c6e869 authored by Ian Lake's avatar Ian Lake Committed by Android (Google) Code Review
Browse files

Merge "Annotate ComponentCallbacks with nullability annotations"

parents aeff616e 666a965f

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -2310,7 +2310,7 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param newConfig The new device configuration.

     */

    public void onConfigurationChanged(Configuration newConfig) {

    public void onConfigurationChanged(@NonNull Configuration newConfig) {

        if (DEBUG_LIFECYCLE) Slog.v(TAG, "onConfigurationChanged " + this + ": " + newConfig);

        mCalled = true;

core/java/android/app/Application.java

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { 
    }



    @CallSuper

    public void onConfigurationChanged(Configuration newConfig) {

    public void onConfigurationChanged(@NonNull Configuration newConfig) {

        Object[] callbacks = collectComponentCallbacks();

        if (callbacks != null) {

            for (int i=0; i<callbacks.length; i++) {

core/java/android/content/ComponentCallbacks.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.content;



import android.annotation.NonNull;

import android.content.res.Configuration;



/**
@@ -44,7 +45,7 @@ public interface ComponentCallbacks { 
     *

     * @param newConfig The new device configuration.

     */

    void onConfigurationChanged(Configuration newConfig);

    void onConfigurationChanged(@NonNull Configuration newConfig);



    /**

     * This is called when the overall system is running low on memory, and