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

Merge "Remove networkScorer wrapper" into pi-dev am: 272d3b5096

Browse Source 
am: 0cad854925

Change-Id: Ieb6bf1eed2e0877d5223bb45036af42ed6ebd791
This commit is contained in:
Fan Zhang
2018-03-31 03:34:46 +00:00
committed by android-build-merger
parent 1ad1a29d88 0cad854925
commit 62b5000647
10 changed files with 85 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/network/NetworkScorerPicker.java
View File

@@ -26,11 +26,11 @@ import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settings.wrapper.NetworkScoreManagerWrapper;
import java.util.List;
@@ -40,7 +40,7 @@ import java.util.List;
public class NetworkScorerPicker extends InstrumentedPreferenceFragment implements
RadioButtonPreference.OnClickListener {
private NetworkScoreManagerWrapper mNetworkScoreManager;
private NetworkScoreManager mNetworkScoreManager;
@Override
public int getMetricsCategory() {
@@ -56,12 +56,12 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen
@Override
public void onAttach(Context context) {
super.onAttach(context);
mNetworkScoreManager = createNetworkScorerManagerWrapper(context);
mNetworkScoreManager = createNetworkScorerManager(context);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
Bundle savedInstanceState) {
final View view = super.onCreateView(inflater, container, savedInstanceState);
// this is needed so the back button goes back to previous fragment
setHasOptionsMenu(true);
@@ -138,7 +138,7 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen
}
@VisibleForTesting
NetworkScoreManagerWrapper createNetworkScorerManagerWrapper(Context context) {
return new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
NetworkScoreManager createNetworkScorerManager(Context context) {
return (NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
}
}

28
src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.network;
import android.content.Context;
import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppData;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.wrapper.NetworkScoreManagerWrapper;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
@@ -30,22 +30,19 @@ import java.util.List;
* {@link AbstractPreferenceController} that shows the active network scorer and toggles the
* preference based on whether or not there are valid scorers installed.
*/
public class NetworkScorerPickerPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
public class NetworkScorerPickerPreferenceController extends BasePreferenceController {
private static final String KEY_NETWORK_SCORER_PICKER = "network_scorer_picker";
private final NetworkScoreManager mNetworkScoreManager;
private final NetworkScoreManagerWrapper mNetworkScoreManager;
public NetworkScorerPickerPreferenceController(Context context,
NetworkScoreManagerWrapper networkScoreManager) {
super(context);
mNetworkScoreManager = networkScoreManager;
public NetworkScorerPickerPreferenceController(Context context, String key) {
super(context, key);
mNetworkScoreManager =
(NetworkScoreManager) mContext.getSystemService(Context.NETWORK_SCORE_SERVICE);
}
@Override
public String getPreferenceKey() {
return KEY_NETWORK_SCORER_PICKER;
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
@@ -67,9 +64,4 @@ public class NetworkScorerPickerPreferenceController extends AbstractPreferenceC
preference.setSummary(scorer.getRecommendationServiceLabel());
}
}
@Override
public boolean isAvailable() {
return true;
}
}

11
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -21,18 +21,15 @@ import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.NetworkScoreManager;
import android.net.wifi.WifiManager;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.NetworkScorerPickerPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
import com.android.settings.wrapper.NetworkScoreManagerWrapper;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
@@ -74,16 +71,12 @@ public class ConfigureWifiSettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final NetworkScoreManagerWrapper networkScoreManagerWrapper =
new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context);
mUseOpenWifiPreferenceController = new UseOpenWifiPreferenceController(context, this,
networkScoreManagerWrapper, getLifecycle());
getLifecycle());
final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(mWifiWakeupPreferenceController);
controllers.add(new NetworkScorerPickerPreferenceController(context,
networkScoreManagerWrapper));
controllers.add(new NotifyOpenNetworksPreferenceController(context, getLifecycle()));
controllers.add(mUseOpenWifiPreferenceController);
controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), wifiManager));
@@ -112,7 +105,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
List<String> keys = super.getNonIndexableKeys(context);
// If connected to WiFi, this IP address will be the same as the Status IP.
// Or, if there is no connection they will say unavailable.

17
src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
View File

@@ -21,7 +21,6 @@ import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.wrapper.NetworkScoreManagerWrapper;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -38,11 +37,12 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {
private static final String KEY_USE_OPEN_WIFI_AUTOMATICALLY = "use_open_wifi_automatically";
@VisibleForTesting static final int REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY = 400;
@VisibleForTesting
static final int REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY = 400;
private final ContentResolver mContentResolver;
private final Fragment mFragment;
private final NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
private final NetworkScoreManager mNetworkScoreManager;
private final SettingObserver mSettingObserver;
private Preference mPreference;
@@ -50,11 +50,12 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
private boolean mDoFeatureSupportedScorersExist;
public UseOpenWifiPreferenceController(Context context, Fragment fragment,
NetworkScoreManagerWrapper networkScoreManagerWrapper, Lifecycle lifecycle) {
Lifecycle lifecycle) {
super(context);
mContentResolver = context.getContentResolver();
mFragment = fragment;
mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
mNetworkScoreManager =
(NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
mSettingObserver = new SettingObserver();
updateEnableUseWifiComponentName();
checkForFeatureSupportedScorers();
@@ -62,7 +63,7 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
}
private void updateEnableUseWifiComponentName() {
NetworkScorerAppData appData = mNetworkScoreManagerWrapper.getActiveScorer();
NetworkScorerAppData appData = mNetworkScoreManager.getActiveScorer();
mEnableUseWifiComponentName =
appData == null ? null : appData.getEnableUseOpenWifiActivity();
}
@@ -72,7 +73,7 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
mDoFeatureSupportedScorersExist = true;
return;
}
List<NetworkScorerAppData> scorers = mNetworkScoreManagerWrapper.getAllValidScorers();
List<NetworkScorerAppData> scorers = mNetworkScoreManager.getAllValidScorers();
for (NetworkScorerAppData scorer : scorers) {
if (scorer.getEnableUseOpenWifiActivity() != null) {
mDoFeatureSupportedScorersExist = true;
@@ -115,7 +116,7 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
}
final SwitchPreference useOpenWifiPreference = (SwitchPreference) preference;
boolean isScorerSet = mNetworkScoreManagerWrapper.getActiveScorerPackage() != null;
boolean isScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
boolean doesActiveScorerSupportFeature = mEnableUseWifiComponentName != null;
useOpenWifiPreference.setChecked(isSettingEnabled());

5
src/com/android/settings/wifi/WifiWakeupPreferenceController.java
View File

@@ -16,11 +16,7 @@
package com.android.settings.wifi;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
@@ -29,7 +25,6 @@ import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.wrapper.NetworkScoreManagerWrapper;
import com.android.settingslib.core.AbstractPreferenceController;
/**

80
src/com/android/settings/wrapper/NetworkScoreManagerWrapper.java
View File

@@ -1,80 +0,0 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.wrapper;
import android.annotation.Nullable;
import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppData;
import java.util.List;
/**
* Wrapper around {@link NetworkScoreManager} to facilitate unit testing.
*
* TODO: delete this class once robolectric supports Android O
*/
public class NetworkScoreManagerWrapper {
private final NetworkScoreManager mNetworkScoreManager;
public NetworkScoreManagerWrapper(NetworkScoreManager networkScoreManager) {
mNetworkScoreManager = networkScoreManager;
}
/**
* Returns the list of available scorer apps. The list will be empty if there are
* no valid scorers.
*/
public List<NetworkScorerAppData> getAllValidScorers() {
return mNetworkScoreManager.getAllValidScorers();
}
/**
* Obtain the package name of the current active network scorer.
*
* <p>At any time, only one scorer application will receive {@link #ACTION_SCORE_NETWORKS}
* broadcasts and be allowed to call {@link #updateScores}. Applications may use this method to
* determine the current scorer and offer the user the ability to select a different scorer via
* the {@link #ACTION_CHANGE_ACTIVE} intent.
* @return the full package name of the current active scorer, or null if there is no active
* scorer.
*/
@Nullable
public String getActiveScorerPackage() {
return mNetworkScoreManager.getActiveScorerPackage();
}
/**
* Returns metadata about the active scorer or <code>null</code> if there is no active scorer.
*/
@Nullable
public NetworkScorerAppData getActiveScorer() {
return mNetworkScoreManager.getActiveScorer();
}
/**
* Set the active scorer to a new package and clear existing scores.
*
* <p>Should never be called directly without obtaining user consent. This can be done by using
* the {@link #ACTION_CHANGE_ACTIVE} broadcast, or using a custom configuration activity.
*
* @return true if the operation succeeded, or false if the new package is not a valid scorer.
* @throws SecurityException if the caller is not a system process or does not hold the
* {@link android.Manifest.permission#REQUEST_NETWORK_SCORES} permission
*/
public boolean setActiveScorer(String packageName) throws SecurityException {
return mNetworkScoreManager.setActiveScorer(packageName);
}
}