PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up FeatureFactory.getFeature()

Browse Source 
Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
This commit is contained in:
Chaohui Wang
2023-08-04 15:42:43 +08:00
parent 0062308347
commit 8e2ae547d6
220 changed files with 282 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/ChangeWifiStateDetails.java
View File

@@ -95,7 +95,7 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader
protected void logSpecialPermissionChange(boolean newState, String packageName) {
int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW
: SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY;
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider().action(getContext(),
logCategory, packageName);
}

2
src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
View File

@@ -232,7 +232,7 @@ public class ConfigureWifiEntryFragment extends InstrumentedFragment implements
}
};
mNetworkDetailsTracker = FeatureFactory.getFactory(context)
mNetworkDetailsTracker = FeatureFactory.getFeatureFactory()
.getWifiTrackerLibProvider()
.createNetworkDetailsTracker(
getSettingsLifecycle(),

2
src/com/android/settings/wifi/NetworkRequestDialogFragment.java
View File

@@ -112,7 +112,7 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme
}
};
final Context context = getContext();
mWifiPickerTracker = FeatureFactory.getFactory(context)
mWifiPickerTracker = FeatureFactory.getFeatureFactory()
.getWifiTrackerLibProvider()
.createWifiPickerTracker(getSettingsLifecycle(), context,
new Handler(Looper.getMainLooper()),

2
src/com/android/settings/wifi/WifiConnectionPreferenceController.java
View File

@@ -112,7 +112,7 @@ public class WifiConnectionPreferenceController extends AbstractPreferenceContro
return SystemClock.elapsedRealtime();
}
};
mWifiPickerTracker = FeatureFactory.getFactory(context)
mWifiPickerTracker = FeatureFactory.getFeatureFactory()
.getWifiTrackerLibProvider()
.createWifiPickerTracker(lifecycle, context,
new Handler(Looper.getMainLooper()),

2
src/com/android/settings/wifi/WifiDialogActivity.java
View File

@@ -140,7 +140,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
return SystemClock.elapsedRealtime();
}
};
mNetworkDetailsTracker = FeatureFactory.getFactory(this)
mNetworkDetailsTracker = FeatureFactory.getFeatureFactory()
.getWifiTrackerLibProvider()
.createNetworkDetailsTracker(
getLifecycle(),

2
src/com/android/settings/wifi/WifiPickerTrackerHelper.java
View File

@@ -78,7 +78,7 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
Process.THREAD_PRIORITY_BACKGROUND);
mWorkerThread.start();
mWifiPickerTracker = FeatureFactory.getFactory(context)
mWifiPickerTracker = FeatureFactory.getFeatureFactory()
.getWifiTrackerLibProvider()
.createWifiPickerTracker(lifecycle, context,
new Handler(Looper.getMainLooper()),

2
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -294,7 +294,7 @@ public class WifiSettings extends RestrictedSettingsFragment
mMainHandler = new Handler(Looper.getMainLooper());
mWorkerHandler = mWorkerThread.getThreadHandler();
mWifiPickerTracker = FeatureFactory.getFactory(context)
mWifiPickerTracker = FeatureFactory.getFeatureFactory()
.getWifiTrackerLibProvider()
.createWifiPickerTracker(getSettingsLifecycle(), context,
mMainHandler, mWorkerHandler,

2
src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
View File

@@ -192,7 +192,7 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
return SystemClock.elapsedRealtime();
}
};
mWifiPickerTracker = FeatureFactory.getFactory(mActivity.getApplicationContext())
mWifiPickerTracker = FeatureFactory.getFeatureFactory()
.getWifiTrackerLibProvider()
.createWifiPickerTracker(getSettingsLifecycle(), mActivity,
new Handler(Looper.getMainLooper()),

2
src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
View File

@@ -280,7 +280,7 @@ public class WifiNetworkDetailsFragment extends RestrictedDashboardFragment impl
}
};
mNetworkDetailsTracker = FeatureFactory.getFactory(context)
mNetworkDetailsTracker = FeatureFactory.getFeatureFactory()
.getWifiTrackerLibProvider()
.createNetworkDetailsTracker(
getSettingsLifecycle(),

2
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

@@ -400,7 +400,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
}
};
final Context context = getContext();
mWifiPickerTracker = FeatureFactory.getFactory(context)
mWifiPickerTracker = FeatureFactory.getFeatureFactory()
.getWifiTrackerLibProvider()
.createWifiPickerTracker(getSettingsLifecycle(), context,
new Handler(Looper.getMainLooper()),

2
src/com/android/settings/wifi/repository/WifiHotspotRepository.java
View File

@@ -657,6 +657,6 @@ public class WifiHotspotRepository {
}
private void log(String msg) {
FeatureFactory.getFactory(mAppContext).getWifiFeatureProvider().verboseLog(TAG, msg);
FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg);
}
}

2
src/com/android/settings/wifi/slice/ContextualWifiSlice.java
View File

@@ -65,7 +65,7 @@ public class ContextualWifiSlice extends WifiSlice {
@Override
public Slice getSlice() {
final long currentUiSession = FeatureFactory.getFactory(mContext)
final long currentUiSession = FeatureFactory.getFeatureFactory()
.getSlicesFeatureProvider().getUiSessionToken();
if (currentUiSession != sActiveUiSession) {
sActiveUiSession = currentUiSession;

4
src/com/android/settings/wifi/tether/WifiHotspotSecuritySettings.java
View File

@@ -63,7 +63,7 @@ public class WifiHotspotSecuritySettings extends DashboardFragment implements
}
protected void loadViewModel() {
mWifiHotspotSecurityViewModel = FeatureFactory.getFactory(getContext())
mWifiHotspotSecurityViewModel = FeatureFactory.getFeatureFactory()
.getWifiFeatureProvider().getWifiHotspotSecurityViewModel(this);
LiveData<List<WifiHotspotSecurityViewModel.ViewItem>> viewItemListData =
mWifiHotspotSecurityViewModel.getViewItemListData();
@@ -115,6 +115,6 @@ public class WifiHotspotSecuritySettings extends DashboardFragment implements
}
private void log(String msg) {
FeatureFactory.getFactory(getContext()).getWifiFeatureProvider().verboseLog(TAG, msg);
FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg);
}
}

4
src/com/android/settings/wifi/tether/WifiHotspotSecurityViewModel.java
View File

@@ -65,7 +65,7 @@ public class WifiHotspotSecurityViewModel extends AndroidViewModel {
mViewItemMap.put(SECURITY_TYPE_WPA2_PSK, new ViewItem(KEY_SECURITY_WPA2));
mViewItemMap.put(SECURITY_TYPE_OPEN, new ViewItem(KEY_SECURITY_NONE));
mWifiHotspotRepository = FeatureFactory.getFactory(application).getWifiFeatureProvider()
mWifiHotspotRepository = FeatureFactory.getFeatureFactory().getWifiFeatureProvider()
.getWifiHotspotRepository();
mWifiHotspotRepository.getSecurityType().observeForever(mSecurityTypeObserver);
mWifiHotspotRepository.getSpeedType().observeForever(mSpeedTypeObserver);
@@ -159,6 +159,6 @@ public class WifiHotspotSecurityViewModel extends AndroidViewModel {
}
private void log(String msg) {
FeatureFactory.getFactory(getApplication()).getWifiFeatureProvider().verboseLog(TAG, msg);
FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg);
}
}

4
src/com/android/settings/wifi/tether/WifiHotspotSpeedSettings.java
View File

@@ -77,7 +77,7 @@ public class WifiHotspotSpeedSettings extends DashboardFragment implements
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
loadPreferences();
mWifiHotspotSpeedViewModel = FeatureFactory.getFactory(getContext())
mWifiHotspotSpeedViewModel = FeatureFactory.getFeatureFactory()
.getWifiFeatureProvider().getWifiHotspotSpeedViewModel(this);
onSpeedInfoMapDataChanged(mWifiHotspotSpeedViewModel.getSpeedInfoMapData().getValue());
mWifiHotspotSpeedViewModel.getSpeedInfoMapData()
@@ -138,6 +138,6 @@ public class WifiHotspotSpeedSettings extends DashboardFragment implements
}
private void log(String msg) {
FeatureFactory.getFactory(getContext()).getWifiFeatureProvider().verboseLog(TAG, msg);
FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg);
}
}

4
src/com/android/settings/wifi/tether/WifiHotspotSpeedViewModel.java
View File

@@ -65,7 +65,7 @@ public class WifiHotspotSpeedViewModel extends AndroidViewModel {
public WifiHotspotSpeedViewModel(@NotNull Application application) {
super(application);
mWifiHotspotRepository = FeatureFactory.getFactory(application).getWifiFeatureProvider()
mWifiHotspotRepository = FeatureFactory.getFeatureFactory().getWifiFeatureProvider()
.getWifiHotspotRepository();
mWifiHotspotRepository.get6gAvailable().observeForever(m6gAvailableObserver);
mWifiHotspotRepository.get5gAvailable().observeForever(m5gAvailableObserver);
@@ -177,6 +177,6 @@ public class WifiHotspotSpeedViewModel extends AndroidViewModel {
}
private void log(String msg) {
FeatureFactory.getFactory(getApplication()).getWifiFeatureProvider().verboseLog(TAG, msg);
FeatureFactory.getFeatureFactory().getWifiFeatureProvider().verboseLog(TAG, msg);
}
}

2
src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
View File

@@ -38,7 +38,7 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl
public WifiTetherAutoOffPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
WifiHotspotRepository wifiHotspotRepository = FeatureFactory.getFactory(context)
WifiHotspotRepository wifiHotspotRepository = FeatureFactory.getFeatureFactory()
.getWifiFeatureProvider().getWifiHotspotRepository();
if (wifiHotspotRepository.isSpeedFeatureAvailable() && wifiHotspotRepository.isDualBand()) {
mNeedShutdownSecondarySap = true;

2
src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
View File

@@ -44,7 +44,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceController extends
WifiTetherBasePreferenceController.OnTetherConfigUpdateListener listener) {
super(context, listener);
// If the Wi-Fi Hotspot Speed Feature available, then hide this controller.
mShouldHidePreference = FeatureFactory.getFactory(context)
mShouldHidePreference = FeatureFactory.getFeatureFactory()
.getWifiFeatureProvider().getWifiHotspotRepository().isSpeedFeatureAvailable();
Log.d(TAG, "mShouldHidePreference:" + mShouldHidePreference);
if (mShouldHidePreference) {

2
src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
View File

@@ -54,7 +54,7 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
WifiTetherPasswordPreferenceController(Context context, OnTetherConfigUpdateListener listener,
MetricsFeatureProvider provider) {
super(context, listener);
FeatureFactory featureFactory = FeatureFactory.getFactory(context);
FeatureFactory featureFactory = FeatureFactory.getFeatureFactory();
mMetricsFeatureProvider = (provider != null) ? provider
: featureFactory.getMetricsFeatureProvider();
mWifiHotspotRepository = featureFactory.getWifiFeatureProvider().getWifiHotspotRepository();

2
src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
View File

@@ -63,7 +63,7 @@ public class WifiTetherSSIDPreferenceController extends WifiTetherBasePreference
super(context, listener);
mWifiDeviceNameTextValidator = new WifiDeviceNameTextValidator();
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@Override

2
src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
View File

@@ -56,7 +56,7 @@ public class WifiTetherSecurityPreferenceController extends WifiTetherBasePrefer
OnTetherConfigUpdateListener listener) {
super(context, listener);
// If the Wi-Fi Hotspot Speed Feature available, then hide this controller.
mShouldHidePreference = FeatureFactory.getFactory(context)
mShouldHidePreference = FeatureFactory.getFeatureFactory()
.getWifiFeatureProvider().getWifiHotspotRepository().isSpeedFeatureAvailable();
Log.d(TAG, "shouldHidePreference():" + mShouldHidePreference);
if (mShouldHidePreference) {

2
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -144,7 +144,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
return;
}
mWifiTetherViewModel = FeatureFactory.getFactory(getContext()).getWifiFeatureProvider()
mWifiTetherViewModel = FeatureFactory.getFeatureFactory().getWifiFeatureProvider()
.getWifiTetherViewModel(this);
if (mWifiTetherViewModel != null) {
setupSpeedFeature(mWifiTetherViewModel.isSpeedFeatureAvailable());

2
src/com/android/settings/wifi/tether/WifiTetherViewModel.java
View File

@@ -80,7 +80,7 @@ public class WifiTetherViewModel extends AndroidViewModel {
public WifiTetherViewModel(@NotNull Application application) {
super(application);
mWifiHotspotRepository = FeatureFactory.getFactory(application).getWifiFeatureProvider()
mWifiHotspotRepository = FeatureFactory.getFeatureFactory().getWifiFeatureProvider()
.getWifiHotspotRepository();
}