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

Commit 68a12cca authored by Chris Antol's avatar Chris Antol Committed by Android (Google) Code Review
Browse files

Merge "Only override embedded activity locale if source package lookup yields... 

Merge "Only override embedded activity locale if source package lookup yields locales to match" into udc-dev
parents 269c2879 d9bc8013

services/core/java/com/android/server/wm/ActivityRecord.java

+4 −8
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ import android.os.Bundle; 
import android.os.Debug;

import android.os.IBinder;

import android.os.IRemoteCallback;

import android.os.LocaleList;

import android.os.PersistableBundle;

import android.os.Process;

import android.os.RemoteCallbackList;
@@ -10589,17 +10588,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            return;

        }



        LocaleList locale;

        final ActivityTaskManagerInternal.PackageConfig appConfig =

                mAtmService.mPackageConfigPersister.findPackageConfiguration(

                        task.realActivity.getPackageName(), mUserId);

        // if there is no app locale for the package, clear the target activity's locale.

        if (appConfig == null || appConfig.mLocales == null || appConfig.mLocales.isEmpty()) {

            locale = LocaleList.getEmptyLocaleList();

        } else {

            locale = appConfig.mLocales;

        // If package lookup yields locales, set the target activity's locales to match,

        // otherwise leave target activity as-is.

        if (appConfig != null && appConfig.mLocales != null && !appConfig.mLocales.isEmpty()) {

            resolvedConfig.setLocales(appConfig.mLocales);

        }

        resolvedConfig.setLocales(locale);

    }



    /**