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

tests/robotests/src/com/android/settings/localepicker/AppLocalePickerActivityTest.java

@@ -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;
-        }
-    }
 }