diff options
| author | Xin Li <delphij@google.com> | 2023-10-05 15:41:24 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-10-05 15:41:24 -0700 |
| commit | 079ff16c015d1b15f5e9f7b9eeff2a27c2ceea4e (patch) | |
| tree | e80c9004c3c5892154804222c398cd73db5b037b | |
| parent | 94feafd0842a8a2da897da76ecdf87b4768862b0 (diff) | |
| parent | 091f5d3473806c6f537c0327851e38e39749757d (diff) | |
| download | SettingsIntelligence-079ff16c015d1b15f5e9f7b9eeff2a27c2ceea4e.tar.gz | |
Merge Android 14
Bug: 298295554
Merged-In: I45e1b8df5e5eb618bcbf14aa9f48fd7d3f53a780
Change-Id: I18955ae11178e658d2c1bd3c1dbacd16886ca837
3 files changed, 6 insertions, 9 deletions
diff --git a/src/com/android/settings/intelligence/search/indexing/car/CarDatabaseIndexingManager.java b/src/com/android/settings/intelligence/search/indexing/car/CarDatabaseIndexingManager.java index 3026e82..b2601ae 100644 --- a/src/com/android/settings/intelligence/search/indexing/car/CarDatabaseIndexingManager.java +++ b/src/com/android/settings/intelligence/search/indexing/car/CarDatabaseIndexingManager.java @@ -33,7 +33,7 @@ public class CarDatabaseIndexingManager extends DatabaseIndexingManager { } @Override - protected IndexDataConverter getIndexDataConverter(Context context) { - return new CarIndexDataConverter(context); + protected IndexDataConverter getIndexDataConverter() { + return new CarIndexDataConverter(); } } diff --git a/src/com/android/settings/intelligence/search/indexing/car/CarIndexData.java b/src/com/android/settings/intelligence/search/indexing/car/CarIndexData.java index a57d003..b0114aa 100644 --- a/src/com/android/settings/intelligence/search/indexing/car/CarIndexData.java +++ b/src/com/android/settings/intelligence/search/indexing/car/CarIndexData.java @@ -16,7 +16,6 @@ package com.android.settings.intelligence.search.indexing.car; -import android.content.Context; import android.content.Intent; import com.android.settings.intelligence.search.indexing.DatabaseIndexingUtils; @@ -38,9 +37,9 @@ public class CarIndexData extends IndexData { */ public static class Builder extends IndexData.Builder { @Override - protected Intent buildIntent(Context context) { + protected Intent buildIntent() { return DatabaseIndexingUtils.buildDirectSearchResultIntent(getIntentAction(), getIntentTargetPackage(), getIntentTargetClass(), getKey()); } } -}
\ No newline at end of file +} diff --git a/src/com/android/settings/intelligence/search/indexing/car/CarIndexDataConverter.java b/src/com/android/settings/intelligence/search/indexing/car/CarIndexDataConverter.java index 11f35cb..d54ff9e 100644 --- a/src/com/android/settings/intelligence/search/indexing/car/CarIndexDataConverter.java +++ b/src/com/android/settings/intelligence/search/indexing/car/CarIndexDataConverter.java @@ -16,8 +16,6 @@ package com.android.settings.intelligence.search.indexing.car; -import android.content.Context; - import com.android.settings.intelligence.search.indexing.IndexData; import com.android.settings.intelligence.search.indexing.IndexDataConverter; import com.android.settings.intelligence.search.indexing.PreIndexData; @@ -27,8 +25,8 @@ import com.android.settings.intelligence.search.indexing.PreIndexData; */ public class CarIndexDataConverter extends IndexDataConverter { - public CarIndexDataConverter(Context context) { - super(context); + public CarIndexDataConverter() { + super(); } @Override |