Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chris Antol
2023-04-13 16:43:57 +00:00
committed by Android (Google) Code Review
parent 269c287976 d9bc801301
commit 68a12cca80
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -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);
}
/**