Resubmit: Adding support for new Contacts columns for names and sorting

        This is in preparation for fixing bugs:
        Bug: 2075641
        Bug: 2021660
        Bug: 2164422
        Bug: 2267198

Change-Id: I7696abe8c8fd17d8854632cc8e818b9e4d2e643c

1 files changed, 7 insertions, 3 deletions

diff --git a/tests/src/com/android/providers/contacts/ContactsActor.java b/tests/src/com/android/providers/contacts/ContactsActor.java
index 4568e5f..7dd980c 100644
--- a/tests/src/com/android/providers/contacts/ContactsActor.java
+++ b/tests/src/com/android/providers/contacts/ContactsActor.java
@@ -23,8 +23,8 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Binder;
@@ -43,10 +43,10 @@ import android.test.mock.MockContentResolver;
 import android.test.mock.MockContext;
 import android.test.mock.MockPackageManager;
 import android.test.mock.MockResources;
-import android.util.Log;
 import android.util.TypedValue;
 
 import java.util.HashMap;
+import java.util.Locale;
 
 /**
  * Helper class that encapsulates an "actor" which is owned by a specific
@@ -131,7 +131,11 @@ public class ContactsActor {
             mPackageManager.addPackage(3000, PACKAGE_GREEN);
             mPackageManager.addPackage(4000, PACKAGE_BLUE);
 
-            mRes = new RestrictionMockResources(overallContext.getResources());
+            Resources resources = overallContext.getResources();
+            Configuration configuration = new Configuration(resources.getConfiguration());
+            configuration.locale = Locale.US;
+            resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+            mRes = new RestrictionMockResources(resources);
         }
 
         @Override