commit 89e0a1a033e6db0316f807cee49bb51f6f6fc4b5
author Ying Wang <wangying@google.com> Mon Mar 30 22:50:40 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 30 22:50:41 2015 +0000
tree ef0e182f3829e27363e1d5b37687ed07013cac6c
parent d6b693b90b6cad114a58d097fd6283e8f6dd9f6f
parent b67cd46436d3ee88ee42820fca9a8fe3cd2dc497

Merge "Fix build."

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 159fa62..831e1e6 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -27947,7 +27947,7 @@
     field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.SEARCH_INDEXABLES_PROVIDER";
   }
 
-  private static class SearchIndexablesContract.BaseColumns {
+  public static class SearchIndexablesContract.BaseColumns {
     field public static final java.lang.String COLUMN_CLASS_NAME = "className";
     field public static final java.lang.String COLUMN_ICON_RESID = "iconResId";
     field public static final java.lang.String COLUMN_INTENT_ACTION = "intentAction";
@@ -27957,26 +27957,14 @@
   }
 
   public static final class SearchIndexablesContract.NonIndexableKey extends android.provider.SearchIndexablesContract.BaseColumns {
-    field public static final java.lang.String COLUMN_CLASS_NAME = "className";
-    field public static final java.lang.String COLUMN_ICON_RESID = "iconResId";
-    field public static final java.lang.String COLUMN_INTENT_ACTION = "intentAction";
-    field public static final java.lang.String COLUMN_INTENT_TARGET_CLASS = "intentTargetClass";
-    field public static final java.lang.String COLUMN_INTENT_TARGET_PACKAGE = "intentTargetPackage";
     field public static final java.lang.String COLUMN_KEY_VALUE = "key";
-    field public static final java.lang.String COLUMN_RANK = "rank";
     field public static final java.lang.String MIME_TYPE = "vnd.android.cursor.dir/non_indexables_key";
   }
 
   public static final class SearchIndexablesContract.RawData extends android.provider.SearchIndexablesContract.BaseColumns {
-    field public static final java.lang.String COLUMN_CLASS_NAME = "className";
     field public static final java.lang.String COLUMN_ENTRIES = "entries";
-    field public static final java.lang.String COLUMN_ICON_RESID = "iconResId";
-    field public static final java.lang.String COLUMN_INTENT_ACTION = "intentAction";
-    field public static final java.lang.String COLUMN_INTENT_TARGET_CLASS = "intentTargetClass";
-    field public static final java.lang.String COLUMN_INTENT_TARGET_PACKAGE = "intentTargetPackage";
     field public static final java.lang.String COLUMN_KEY = "key";
     field public static final java.lang.String COLUMN_KEYWORDS = "keywords";
-    field public static final java.lang.String COLUMN_RANK = "rank";
     field public static final java.lang.String COLUMN_SCREEN_TITLE = "screenTitle";
     field public static final java.lang.String COLUMN_SUMMARY_OFF = "summaryOff";
     field public static final java.lang.String COLUMN_SUMMARY_ON = "summaryOn";
@@ -27986,12 +27974,6 @@
   }
 
   public static final class SearchIndexablesContract.XmlResource extends android.provider.SearchIndexablesContract.BaseColumns {
-    field public static final java.lang.String COLUMN_CLASS_NAME = "className";
-    field public static final java.lang.String COLUMN_ICON_RESID = "iconResId";
-    field public static final java.lang.String COLUMN_INTENT_ACTION = "intentAction";
-    field public static final java.lang.String COLUMN_INTENT_TARGET_CLASS = "intentTargetClass";
-    field public static final java.lang.String COLUMN_INTENT_TARGET_PACKAGE = "intentTargetPackage";
-    field public static final java.lang.String COLUMN_RANK = "rank";
     field public static final java.lang.String COLUMN_XML_RESID = "xmlResId";
     field public static final java.lang.String MIME_TYPE = "vnd.android.cursor.dir/indexables_xml_res";
   }

core/java/android/provider/SearchIndexablesContract.java

diff --git a/core/java/android/provider/SearchIndexablesContract.java b/core/java/android/provider/SearchIndexablesContract.java
index 88326ab..93ac7f6 100644
--- a/core/java/android/provider/SearchIndexablesContract.java
+++ b/core/java/android/provider/SearchIndexablesContract.java
@@ -236,7 +236,7 @@
     /**
      * The base columns.
      */
-    private static class BaseColumns {
+    public static class BaseColumns {
         private BaseColumns() {
         }