Search - add support for saving the UserId in the Index - part 2

- get UserId for remote SearchIndexablesProvider and put it into
the Index too

This CL depends on that Framework CL: a0791edf01524be7c9ae819b11c05e8191a97ded

See bug: ##15837747 Search - update for Enterprise support

Change-Id: I47789aa02545bbacc68468cabfb32a253003ec5b

1 files changed, 4 insertions, 0 deletions

diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index 8f30ef9d2..96c070285 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -72,6 +72,7 @@ import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY;
+import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID;
 
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RANK;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID;
@@ -103,6 +104,7 @@ public class Index {
     public static final int COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS = 11;
     public static final int COLUMN_INDEX_ENABLED = 12;
     public static final int COLUMN_INDEX_KEY = 13;
+    public static final int COLUMN_INDEX_USER_ID = 14;
 
     public static final String ENTRIES_SEPARATOR = "|";
 
@@ -609,6 +611,7 @@ public class Index {
                             COLUMN_INDEX_RAW_INTENT_TARGET_CLASS);
 
                     final String key = cursor.getString(COLUMN_INDEX_RAW_KEY);
+                    final int userId = cursor.getInt(COLUMN_INDEX_RAW_USER_ID);
 
                     SearchIndexableRaw data = new SearchIndexableRaw(packageContext);
                     data.rank = rank;
@@ -625,6 +628,7 @@ public class Index {
                     data.intentTargetPackage = targetPackage;
                     data.intentTargetClass = targetClass;
                     data.key = key;
+                    data.userId = userId;
 
                     addIndexableData(data);
                 }