Remove context from getSupportFeatureProvider

Bug: 286764889
Test: m Settings
Change-Id: I5635c7a809fd24d59da377993c7d1435d0c839e3
This commit is contained in:
Chaohui Wang
2023-07-04 13:21:33 +08:00
parent 778c2dc3d5
commit da796d80f1
7 changed files with 9 additions and 13 deletions

View File

@@ -66,8 +66,11 @@ abstract class FeatureFactory {
*/ */
abstract val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider abstract val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider
abstract fun getSupportFeatureProvider(context: Context): SupportFeatureProvider? /** Implementation for [SupportFeatureProvider]. */
open val supportFeatureProvider: SupportFeatureProvider? = null
abstract val metricsFeatureProvider: MetricsFeatureProvider abstract val metricsFeatureProvider: MetricsFeatureProvider
abstract fun getPowerUsageFeatureProvider(context: Context): PowerUsageFeatureProvider abstract fun getPowerUsageFeatureProvider(context: Context): PowerUsageFeatureProvider
/** /**

View File

@@ -95,8 +95,6 @@ open class FeatureFactoryImpl : FeatureFactory() {
override val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider = override val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider =
HardwareInfoFeatureProviderImpl HardwareInfoFeatureProviderImpl
override fun getSupportFeatureProvider(context: Context): SupportFeatureProvider? = null
override val metricsFeatureProvider by lazy { SettingsMetricsFeatureProvider() } override val metricsFeatureProvider by lazy { SettingsMetricsFeatureProvider() }
override fun getPowerUsageFeatureProvider(context: Context) = powerUsageFeatureProvider override fun getPowerUsageFeatureProvider(context: Context) = powerUsageFeatureProvider

View File

@@ -42,8 +42,8 @@ public class SupportDashboardActivity extends Activity implements Indexable {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
SupportFeatureProvider supportFeatureProvider = FeatureFactory.getFactory(this) SupportFeatureProvider supportFeatureProvider = FeatureFactory.getFeatureFactory()
.getSupportFeatureProvider(this); .getSupportFeatureProvider();
// try to launch support if we have the feature provider // try to launch support if we have the feature provider
if (supportFeatureProvider != null) { if (supportFeatureProvider != null) {

View File

@@ -34,8 +34,7 @@ public class SupportPreferenceController extends BasePreferenceController {
public SupportPreferenceController(Context context, String preferenceKey) { public SupportPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mSupportFeatureProvider = FeatureFactory.getFactory(context) mSupportFeatureProvider = FeatureFactory.getFeatureFactory().getSupportFeatureProvider();
.getSupportFeatureProvider(context);
} }
public void setActivity(Activity activity) { public void setActivity(Activity activity) {

View File

@@ -145,7 +145,7 @@ public class FakeFeatureFactory extends FeatureFactory {
} }
@Override @Override
public SupportFeatureProvider getSupportFeatureProvider(Context context) { public SupportFeatureProvider getSupportFeatureProvider() {
return supportFeatureProvider; return supportFeatureProvider;
} }

View File

@@ -69,10 +69,6 @@ class FakeFeatureFactory : FeatureFactory() {
override val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider override val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider
get() = TODO("Not yet implemented") get() = TODO("Not yet implemented")
override fun getSupportFeatureProvider(context: Context): SupportFeatureProvider? {
TODO("Not yet implemented")
}
override val metricsFeatureProvider = mockMetricsFeatureProvider override val metricsFeatureProvider = mockMetricsFeatureProvider
override fun getPowerUsageFeatureProvider(context: Context): PowerUsageFeatureProvider { override fun getPowerUsageFeatureProvider(context: Context): PowerUsageFeatureProvider {

View File

@@ -144,7 +144,7 @@ public class FakeFeatureFactory extends FeatureFactory {
} }
@Override @Override
public SupportFeatureProvider getSupportFeatureProvider(Context context) { public SupportFeatureProvider getSupportFeatureProvider() {
return supportFeatureProvider; return supportFeatureProvider;
} }