summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/enterprise
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-04-03 18:31:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-04-03 18:31:39 +0000
commit4720ba39e314d871b13b6a2f930cfefdd3466588 (patch)
tree848853fb8f550689afb492b831baa51b02aca2b9 /src/com/android/settings/enterprise
parent6f61ae0adf3680fdcc30e1862f03eb6affd43d0e (diff)
parent01cfb9d8c54dd2c888cea15987e7644e8a78a3e0 (diff)
downloadpackages_apps_Settings-4720ba39e314d871b13b6a2f930cfefdd3466588.tar.gz
packages_apps_Settings-4720ba39e314d871b13b6a2f930cfefdd3466588.tar.bz2
packages_apps_Settings-4720ba39e314d871b13b6a2f930cfefdd3466588.zip
Merge "Remove wrapper for ConnectionManager/IPackageManager" into pi-dev
Diffstat (limited to 'src/com/android/settings/enterprise')
-rw-r--r--src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 1eb95dfdce..eead69f878 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -23,6 +23,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.content.res.Resources;
+import android.net.ConnectivityManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
@@ -32,7 +33,6 @@ import android.view.View;
import com.android.settings.R;
import com.android.settings.vpn2.VpnUtils;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.Date;
@@ -44,13 +44,13 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
private final DevicePolicyManager mDpm;
private final PackageManagerWrapper mPm;
private final UserManager mUm;
- private final ConnectivityManagerWrapper mCm;
+ private final ConnectivityManager mCm;
private final Resources mResources;
private static final int MY_USER_ID = UserHandle.myUserId();
public EnterprisePrivacyFeatureProviderImpl(Context context, DevicePolicyManager dpm,
- PackageManagerWrapper pm, UserManager um, ConnectivityManagerWrapper cm,
+ PackageManagerWrapper pm, UserManager um, ConnectivityManager cm,
Resources resources) {
mContext = context.getApplicationContext();
mDpm = dpm;