Show VPN app only in always on vpn fragment

Bug: 29173464

Change-Id: I3a0ac61b50e763942a075e9faf8afe9df63739ab

Author: tony-mak

app/src/main/java/com/afwsamples/testdpc/common/SelectAppFragment.java

@@ -45,8 +45,8 @@ public abstract class SelectAppFragment extends Fragment implements View.OnClick
 
     private EditText mCurrentSelectedPackage;
     private EditText mNewSelectedPackage;
-    private ListView mAppList;
-    private ArrayList<String> mAppPackages;
+    private ListView mAppListView;
+    private List<String> mAppPackages;
 
     @Override
     public void onResume() {
@@ -57,7 +57,7 @@ public void onResume() {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mAppPackages = new ArrayList<String>();
+        mAppPackages = createAppList();
     }
 
     @Override
@@ -67,32 +67,32 @@ public View onCreateView(LayoutInflater layoutInflater, ViewGroup container,
 
         mCurrentSelectedPackage = (EditText) view.findViewById(R.id.selected_package_current);
         mNewSelectedPackage = (EditText) view.findViewById(R.id.selected_package_new);
-        mAppList = (ListView) view.findViewById(R.id.select_app_list);
-        populateApps();
-
+        mAppListView = (ListView) view.findViewById(R.id.select_app_list);
+        AppInfoArrayAdapter appInfoArrayAdapter = new AppInfoArrayAdapter(getActivity(),
+                R.id.pkg_name, mAppPackages, true);
+        mAppListView.setAdapter(appInfoArrayAdapter);
         view.findViewById(R.id.selected_package_set).setOnClickListener(this);
         view.findViewById(R.id.selected_package_clear).setOnClickListener(this);
-        mAppList.setOnItemClickListener(this);
-
+        mAppListView.setOnItemClickListener(this);
         return view;
     }
 
-    private void populateApps() {
+    /**
+     * @return a list of apps that users are allowed to select from.
+     */
+    protected List<String> createAppList() {
+        List<String> appList = new ArrayList<>();
         PackageManager pm = getActivity().getPackageManager();
         List<ApplicationInfo> allApps = pm.getInstalledApplications(0 /* No flag */);
         Collections.sort(allApps, new ApplicationInfo.DisplayNameComparator(pm));
-        mAppPackages.clear();
         for(ApplicationInfo info : allApps) {
             if ((pm.getLaunchIntentForPackage(info.packageName)) != null) {
-                mAppPackages.add(info.packageName);
+                appList.add(info.packageName);
             }
         }
-        AppInfoArrayAdapter appInfoArrayAdapter = new AppInfoArrayAdapter(getActivity(),
-                R.id.pkg_name, mAppPackages, true);
-        mAppList.setAdapter(appInfoArrayAdapter);
+        return appList;
     }
 
-
     @Override
     public void onClick(View v) {
         switch (v.getId()) {

app/src/main/java/com/afwsamples/testdpc/policy/networking/AlwaysOnVpnFragment.java

@@ -20,14 +20,22 @@
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.VpnService;
 import android.os.Build;
 import android.os.Bundle;
 
 import com.afwsamples.testdpc.DeviceAdminReceiver;
 import com.afwsamples.testdpc.R;
 import com.afwsamples.testdpc.common.SelectAppFragment;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * This fragment provides a setting for always-on VPN apps.
  *
@@ -42,6 +50,8 @@ public class AlwaysOnVpnFragment extends SelectAppFragment {
 
     private DevicePolicyManager mDpm;
 
+    private static final Intent VPN_INTENT = new Intent(VpnService.SERVICE_INTERFACE);
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -54,6 +64,20 @@ public void onResume() {
         getActivity().getActionBar().setTitle(R.string.set_always_on_vpn);
     }
 
+    @Override
+    protected List<String> createAppList() {
+        Set<String> apps = new HashSet<>();
+        PackageManager pm = getActivity().getPackageManager();
+        List<ResolveInfo> serviceInfos = pm.queryIntentServices(VPN_INTENT, 0);
+        for (ResolveInfo serviceInfo : serviceInfos) {
+            if (serviceInfo.serviceInfo == null) {
+                continue;
+            }
+            apps.add(serviceInfo.serviceInfo.packageName);
+        }
+        return new ArrayList<>(apps);
+    }
+
     @Override
     protected void setSelectedPackage(String pkg) {
         try {