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

Commit 6794cd32 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix UiTranslationStateCallback crash due to null locales." into sc-dev am: 2c6a3b5c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419522

Change-Id: I512192dc55bfac4cd62a27cd12bee182aa21acaa
parents a2e7f5ff 2c6a3b5c

core/java/android/view/translation/UiTranslationManager.java

+7 −3
Original line number Diff line number Diff line
@@ -315,6 +315,8 @@ public final class UiTranslationManager { 
    private static class UiTranslationStateRemoteCallback extends IRemoteCallback.Stub {

        private final Executor mExecutor;

        private final UiTranslationStateCallback mCallback;

        private ULocale mSourceLocale;

        private ULocale mTargetLocale;



        UiTranslationStateRemoteCallback(Executor executor,

                UiTranslationStateCallback callback) {
@@ -331,10 +333,12 @@ public final class UiTranslationManager { 
            int state = bundle.getInt(EXTRA_STATE);

            switch (state) {

                case STATE_UI_TRANSLATION_STARTED:

                    mSourceLocale = (ULocale) bundle.getSerializable(EXTRA_SOURCE_LOCALE);

                    mTargetLocale = (ULocale) bundle.getSerializable(EXTRA_TARGET_LOCALE);

                    mCallback.onStarted(mSourceLocale, mTargetLocale);

                    break;

                case STATE_UI_TRANSLATION_RESUMED:

                    mCallback.onStarted(

                            (ULocale) bundle.getSerializable(EXTRA_SOURCE_LOCALE),

                            (ULocale) bundle.getSerializable(EXTRA_TARGET_LOCALE));

                    mCallback.onStarted(mSourceLocale, mTargetLocale);

                    break;

                case STATE_UI_TRANSLATION_PAUSED:

                    mCallback.onPaused();