From 773a56bbf48beaa0ee10de55e08387ab1024ae26 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Fri, 11 Apr 2014 15:15:34 -0700
Subject: [PATCH] Fix constructors for SearchIndexableData and
 SearchIndexableResource

- fix locale initialization
- fix constructor chain

Change-Id: Id072574cca79fd49013e0b796b98a12d0bb8459f
---
 core/java/android/provider/SearchIndexableData.java     | 4 ++--
 core/java/android/provider/SearchIndexableResource.java | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/java/android/provider/SearchIndexableData.java b/core/java/android/provider/SearchIndexableData.java
index 3f88f180b3007..60bcc40a7a1f3 100644
--- a/core/java/android/provider/SearchIndexableData.java
+++ b/core/java/android/provider/SearchIndexableData.java
@@ -115,6 +115,7 @@ public abstract class SearchIndexableData {
      * Default constructor.
      */
     public SearchIndexableData() {
+        locale = Locale.getDefault();
         enabled = true;
     }
 
@@ -124,9 +125,8 @@ public abstract class SearchIndexableData {
      * @param ctx the Context
      */
     public SearchIndexableData(Context ctx) {
+        this();
         context = ctx;
-        locale = Locale.getDefault();
-        enabled = true;
     }
 
     @Override
diff --git a/core/java/android/provider/SearchIndexableResource.java b/core/java/android/provider/SearchIndexableResource.java
index bf33c653662e3..c807df2fd3972 100644
--- a/core/java/android/provider/SearchIndexableResource.java
+++ b/core/java/android/provider/SearchIndexableResource.java
@@ -48,6 +48,7 @@ public class SearchIndexableResource extends SearchIndexableData {
      * @param iconResId the resource ID associated with the data.
      */
     public SearchIndexableResource(int rank, int xmlResId, String className, int iconResId) {
+        super();
         this.rank = rank;
         this.xmlResId = xmlResId;
         this.className = className;