Skip to content

Commit 3cdc9a8

Browse files
committed
Avoid clearing always-on when setAlwaysOnVpn fails
It makes it harder to see the effect of setAlwaysOnVpn after it fails. Also, print the exception for debugging purpose Bug: 29074350 Change-Id: Ib1248d5057ecb9de2bd69a9054494729e05bd6af
1 parent 1d19b38 commit 3cdc9a8

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import android.net.VpnService;
2727
import android.os.Build;
2828
import android.os.Bundle;
29+
import android.util.Log;
2930

3031
import com.afwsamples.testdpc.DeviceAdminReceiver;
3132
import com.afwsamples.testdpc.R;
@@ -47,7 +48,7 @@
4748
*/
4849
@TargetApi(Build.VERSION_CODES.N)
4950
public class AlwaysOnVpnFragment extends SelectAppFragment {
50-
51+
private static final String TAG = "AlwaysOnVpnFragment";
5152
private DevicePolicyManager mDpm;
5253

5354
private static final Intent VPN_INTENT = new Intent(VpnService.SERVICE_INTERFACE);
@@ -84,9 +85,7 @@ protected void setSelectedPackage(String pkg) {
8485
final ComponentName who = DeviceAdminReceiver.getComponentName(getActivity());
8586
mDpm.setAlwaysOnVpnPackage(who, pkg, /* lockdownEnabled */ true);
8687
} catch (PackageManager.NameNotFoundException | UnsupportedOperationException e) {
87-
if (pkg != null) {
88-
clearSelectedPackage();
89-
}
88+
Log.e(TAG, "setAlwaysOnVpnPackage:", e);
9089
}
9190
}
9291

0 commit comments

Comments
 (0)