From b67cd46436d3ee88ee42820fca9a8fe3cd2dc497 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 30 Mar 2015 15:46:30 -0700
Subject: [PATCH] Fix build.

private class SearchIndexablesContract.BaseColumns is extended by public
classes. We need to make it public too.

Change-Id: Id77575f7857020531b9d311ca5ba12c6462268a5
---
 api/system-current.txt                        | 20 +------------------
 .../provider/SearchIndexablesContract.java    |  2 +-
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 9513ab60b480a..8a1af02ad3774 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -27947,7 +27947,7 @@ package android.provider {
     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 @@ package android.provider {
   }
 
   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 @@ package android.provider {
   }
 
   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";
   }
diff --git a/core/java/android/provider/SearchIndexablesContract.java b/core/java/android/provider/SearchIndexablesContract.java
index 88326ab3a58cb..93ac7f686127e 100644
--- a/core/java/android/provider/SearchIndexablesContract.java
+++ b/core/java/android/provider/SearchIndexablesContract.java
@@ -236,7 +236,7 @@ public class SearchIndexablesContract {
     /**
      * The base columns.
      */
-    private static class BaseColumns {
+    public static class BaseColumns {
         private BaseColumns() {
         }