PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Panlingual] Improve performance of displaying app list in Settings.

Browse Source 
- Use existed ApplicationInfo to get needed info.
 - Add unittest to AppLocaleUtil.java

Bug: b/238054165
Bug: b/231904717
Test: Maunal test passed
Test: atest passed
Change-Id: I23f354c366b45d4b684184b3366aeab913bcd3c8
This commit is contained in:
tom hsu
2022-10-25 16:26:55 +08:00
parent 862e9b3040
commit 8bd5e2a52f
7 changed files with 97 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java
View File

@@ -17,27 +17,29 @@
package com.android.settings.applications;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.app.ActivityManager;
import android.app.LocaleConfig;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.os.LocaleList;
import android.util.FeatureFlagUtils;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -53,14 +55,15 @@ public class AppLocaleUtilTest {
@Mock
private ActivityManager mActivityManager;
@Mock
private ApplicationInfo mApplicationInfo;
@Mock
private Resources mResources;
@Mock
private LocaleConfig mLocaleConfig;
private Context mContext;
private String mDisallowedPackage = "com.disallowed.package";
private String mAllowedPackage = "com.allowed.package";
private List<ResolveInfo> mListResolveInfo;
private ApplicationInfo mAppInfo;
@Before
public void setUp() {
@@ -68,47 +71,72 @@ public class AppLocaleUtilTest {
mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mContext.getSystemService(ActivityManager.class)).thenReturn(mActivityManager);
FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_APP_LOCALE_OPT_IN_ENABLED,
true);
setDisallowedPackageName(mDisallowedPackage);
mAppInfo = new ApplicationInfo();
mLocaleConfig = mock(LocaleConfig.class);
}
@After
public void tearDown() {
AppLocaleUtil.sLocaleConfig = null;
}
@Test
@Ignore("b/231904717")
public void canDisplayLocaleUi_showUI() throws PackageManager.NameNotFoundException {
setApplicationInfo(/*no platform key*/ false);
public void canDisplayLocaleUi_showUI() {
when(mLocaleConfig.getStatus()).thenReturn(LocaleConfig.STATUS_SUCCESS);
when(mLocaleConfig.getSupportedLocales()).thenReturn(LocaleList.forLanguageTags("en-US"));
AppLocaleUtil.sLocaleConfig = mLocaleConfig;
setActivityInfo(mAllowedPackage);
mAppInfo.packageName = mAllowedPackage;
assertTrue(AppLocaleUtil.canDisplayLocaleUi(mContext, mAllowedPackage, mListResolveInfo));
assertTrue(AppLocaleUtil.canDisplayLocaleUi(mContext, mAppInfo, mListResolveInfo));
}
@Test
@Ignore("b/231904717")
public void canDisplayLocaleUi_notShowUI_hasPlatformKey()
throws PackageManager.NameNotFoundException {
setApplicationInfo(/*has platform key*/ true);
public void canDisplayLocaleUi_notShowUI_hasPlatformKey() {
setActivityInfo(mAllowedPackage);
mAppInfo.privateFlags |= ApplicationInfo.PRIVATE_FLAG_SIGNED_WITH_PLATFORM_KEY;
mAppInfo.packageName = mAllowedPackage;
assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mAllowedPackage, mListResolveInfo));
assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mAppInfo, mListResolveInfo));
}
@Test
@Ignore("b/231904717")
public void canDisplayLocaleUi_notShowUI_noLauncherEntry()
throws PackageManager.NameNotFoundException {
setApplicationInfo(/*no platform key*/false);
public void canDisplayLocaleUi_notShowUI_noLauncherEntry() {
setActivityInfo("");
assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mAllowedPackage, mListResolveInfo));
assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mAppInfo, mListResolveInfo));
}
@Test
@Ignore("b/231904717")
public void canDisplayLocaleUi_notShowUI_matchDisallowedPackageList()
throws PackageManager.NameNotFoundException {
setApplicationInfo(/*no platform key*/false);
public void canDisplayLocaleUi_notShowUI_matchDisallowedPackageList() {
setActivityInfo("");
mAppInfo.packageName = mDisallowedPackage;
assertFalse(AppLocaleUtil
.canDisplayLocaleUi(mContext, mDisallowedPackage, mListResolveInfo));
.canDisplayLocaleUi(mContext, mAppInfo, mListResolveInfo));
}
@Test
public void getPackageLocales_getLocales_success() {
when(mLocaleConfig.getStatus()).thenReturn(LocaleConfig.STATUS_SUCCESS);
when(mLocaleConfig.getSupportedLocales()).thenReturn(LocaleList.forLanguageTags("en-US"));
LocaleList result = AppLocaleUtil.getPackageLocales(mLocaleConfig);
assertFalse(result.isEmpty());
}
@Test
public void getPackageLocales_getLocales_failed() {
when(mLocaleConfig.getStatus()).thenReturn(LocaleConfig.STATUS_PARSING_FAILED);
LocaleList result = AppLocaleUtil.getPackageLocales(mLocaleConfig);
assertNull(result);
}
private void setDisallowedPackageName(String packageName) {
@@ -116,20 +144,6 @@ public class AppLocaleUtilTest {
when(mResources.getStringArray(anyInt())).thenReturn(new String[]{packageName});
}
private void setApplicationInfo(boolean signedWithPlatformKey)
throws PackageManager.NameNotFoundException {
ApplicationInfo applicationInfo = new ApplicationInfo();
if (signedWithPlatformKey) {
applicationInfo.privateFlags = applicationInfo.privateFlags
| ApplicationInfo.PRIVATE_FLAG_SIGNED_WITH_PLATFORM_KEY;
}
PackageInfo packageInfo = new PackageInfo();
packageInfo.applicationInfo = applicationInfo;
when(mPackageManager.getPackageInfoAsUser(anyString(), anyInt(), anyInt())).thenReturn(
packageInfo);
}
private void setActivityInfo(String packageName) {
ResolveInfo resolveInfo = mock(ResolveInfo.class);
ActivityInfo activityInfo = mock(ActivityInfo.class);