Merge "Fix constructors for SearchIndexableData and SearchIndexableResource" (296832e0) · Commits · e / os / android_frameworks_base

core/java/android/provider/SearchIndexableData.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;