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

Add Always on VPN to Privacy Settings page

Browse Source 
This CL adds information about always-on VPNs to the Enterprise
Privacy Settings page.

Test: make RunSettingsRoboTests
Bug: 32692748

Change-Id: I2b59e2ec4c55308b323aaa478cd9c847fe0b4b55
This commit is contained in:
Bartosz Fabianowski
2017-01-09 12:05:59 +01:00
parent 78427d7467
commit fc018e4672
16 changed files with 552 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/overlay/FeatureFactoryImpl.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.overlay;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.net.ConnectivityManager;
import android.os.UserManager;
import android.support.annotation.Keep;
import com.android.settings.applications.ApplicationFeatureProvider;
@@ -37,6 +39,7 @@ import com.android.settings.security.SecurityFeatureProvider;
import com.android.settings.security.SecurityFeatureProviderImpl;
import com.android.settings.search2.SearchFeatureProvider;
import com.android.settings.search2.SearchFeatureProviderImpl;
import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
/**
* {@link FeatureFactory} implementation for AOSP Settings.
@@ -101,7 +104,10 @@ public class FeatureFactoryImpl extends FeatureFactory {
mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(
new DevicePolicyManagerWrapperImpl((DevicePolicyManager) context
.getSystemService(Context.DEVICE_POLICY_SERVICE)),
new PackageManagerWrapperImpl(context.getPackageManager()));
new PackageManagerWrapperImpl(context.getPackageManager()),
UserManager.get(context),
new ConnectivityManagerWrapperImpl((ConnectivityManager) context
.getSystemService(Context.CONNECTIVITY_SERVICE)));
}
return mEnterprisePrivacyFeatureProvider;
}