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

Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into udc-dev am: b1f9d26174 am: f8a3717611

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173332

Change-Id: I39e37e5f705ef0934aa740e3f1bef1ba12fcd58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Josh Hou
2023-03-22 07:28:46 +00:00
committed by Automerger Merge Worker
parent 3314b8f897 f8a3717611
commit 5139a9b98c
5 changed files with 11 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/robotests/src/com/android/settings/localepicker/AppLocalePickerActivityTest.java
View File

@@ -75,7 +75,6 @@ import java.util.Locale;
shadows = {
AppLocalePickerActivityTest.ShadowApplicationPackageManager.class,
AppLocalePickerActivityTest.ShadowResources.class,
AppLocalePickerActivityTest.ShadowUserHandle.class,
})
public class AppLocalePickerActivityTest {
private static final String TEST_PACKAGE_NAME = "com.android.settings";
@@ -108,7 +107,6 @@ public class AppLocalePickerActivityTest {
ReflectionHelpers.setStaticField(AppLocaleUtil.class, "sLocaleConfig", null);
ShadowResources.setDisAllowPackage(false);
ShadowApplicationPackageManager.setNoLaunchEntry(false);
ShadowUserHandle.setUserId(0);
}
@Test
@@ -171,17 +169,6 @@ public class AppLocalePickerActivityTest {
assertThat(controller.get().isFinishing()).isTrue();
}
@Test
public void launchAppLocalePickerActivity_modifyAppLocalesOfAnotherUser_failed() {
ShadowUserHandle.setUserId(10);
ActivityController<TestAppLocalePickerActivity> controller =
initActivityController(true);
controller.create();
assertThat(controller.get().isFinishing()).isTrue();
}
@Test
public void launchAppLocalePickerActivity_intentWithoutPackageName_failed() {
ActivityController<TestAppLocalePickerActivity> controller =
@@ -292,17 +279,4 @@ public class AppLocalePickerActivityTest {
sDisAllowPackage = disAllowPackage;
}
}
@Implements(UserHandle.class)
public static class ShadowUserHandle {
private static int sUserId = 0;
private static void setUserId(int userId) {
sUserId = userId;
}
@Implementation
public static int getUserId(int userId) {
return sUserId;
}
}
}