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

Commit 98cd162b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-b48636b17b6249d997779ca51ed7a029" into udc-mainline-prod 

* changes:
  Fixes @Nullable issues in System UI and WMShell.
  Fix kotlin nullable errors in frameworks/base
  Fix kotlin nullable errors in PermissionService.
  Fix kotlin nullable errors in SilkFX tests
  Fix kotlin nullable errors in PackageInstallerSessions
  Fix kotlin nullable errors in Input tests
  Fix kotlin nullable errors in EasterEgg
  Fix kotlin nullable errors in perftests
  Fix kotlin nullable errors in SettingsLib
  Fix kotlin nullable errors in CredentialManager
  Fix kotlin nullable errors in services.permission
parents 4cb6c852 0b00a5de

apct-tests/perftests/core/src/android/input/MotionPredictorBenchmark.kt

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ class MotionPredictorBenchmark { 
                eventTime, ACTION_MOVE, /*x=*/eventPosition, /*y=*/eventPosition)

            predictor.record(moveEvent)

            val predictionTime = eventTime + eventInterval

            val predicted = predictor.predict(predictionTime.toNanos())

            val predicted = checkNotNull(predictor.predict(predictionTime.toNanos()))

            assertTrue(predicted.eventTime <= (predictionTime + offset).toMillis())

        }

    }

core/java/android/credentials/ui/BaseDialogResult.java

+3 −4
Original line number Diff line number Diff line
@@ -85,15 +85,15 @@ public class BaseDialogResult implements Parcelable { 
     */

    public static final int RESULT_CODE_DATA_PARSING_FAILURE = 3;



    @NonNull

    @Nullable

    private final IBinder mRequestToken;



    public BaseDialogResult(@NonNull IBinder requestToken) {

    public BaseDialogResult(@Nullable IBinder requestToken) {

        mRequestToken = requestToken;

    }



    /** Returns the unique identifier for the request that launched the operation. */

    @NonNull

    @Nullable

    public IBinder getRequestToken() {

        return mRequestToken;

    }
@@ -101,7 +101,6 @@ public class BaseDialogResult implements Parcelable { 
    protected BaseDialogResult(@NonNull Parcel in) {

        IBinder requestToken = in.readStrongBinder();

        mRequestToken = requestToken;

        AnnotationValidations.validate(NonNull.class, null, mRequestToken);

    }



    @Override

core/java/android/credentials/ui/UserSelectionDialogResult.java

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public final class UserSelectionDialogResult extends BaseDialogResult implements 
    @Nullable private ProviderPendingIntentResponse mProviderPendingIntentResponse;



    public UserSelectionDialogResult(

            @NonNull IBinder requestToken, @NonNull String providerId,

            @Nullable IBinder requestToken, @NonNull String providerId,

            @NonNull String entryKey, @NonNull String entrySubkey) {

        super(requestToken);

        mProviderId = providerId;
@@ -69,7 +69,7 @@ public final class UserSelectionDialogResult extends BaseDialogResult implements 
    }



    public UserSelectionDialogResult(

            @NonNull IBinder requestToken, @NonNull String providerId,

            @Nullable IBinder requestToken, @NonNull String providerId,

            @NonNull String entryKey, @NonNull String entrySubkey,

            @Nullable ProviderPendingIntentResponse providerPendingIntentResponse) {

        super(requestToken);

core/tests/PackageInstallerSessions/src/android/content/pm/PackageSessionTests.kt

+4 −2
Original line number Diff line number Diff line
@@ -445,7 +445,9 @@ class PackageSessionTests { 
                    Manifest.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION)

        }

        handlerThread = HandlerThread("PackageSessionTests")

        handlerThread?.start()

        handler = Handler(handlerThread?.looper)

        handlerThread?.let {

            it.start()

            handler = Handler(it.looper)

        }

    }

}

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt

+4 −4
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ class ManageEducationView constructor(context: Context, positioner: BubblePositi 
    private val ANIMATE_DURATION: Long = 200



    private val positioner: BubblePositioner = positioner

    private val manageView by lazy { findViewById<ViewGroup>(R.id.manage_education_view) }

    private val manageButton by lazy { findViewById<Button>(R.id.manage_button) }

    private val gotItButton by lazy { findViewById<Button>(R.id.got_it) }

    private val manageView by lazy { requireViewById<ViewGroup>(R.id.manage_education_view) }

    private val manageButton by lazy { requireViewById<Button>(R.id.manage_button) }

    private val gotItButton by lazy { requireViewById<Button>(R.id.got_it) }



    private var isHiding = false

    private var realManageButtonRect = Rect()
@@ -122,7 +122,7 @@ class ManageEducationView constructor(context: Context, positioner: BubblePositi 
            manageButton

                .setOnClickListener {

                    hide()

                    expandedView.findViewById<View>(R.id.manage_button).performClick()

                    expandedView.requireViewById<View>(R.id.manage_button).performClick()

                }

            gotItButton.setOnClickListener { hide() }

            setOnClickListener { hide() }