commit d5afb5a60c255ef5e8b8f2da101e4d8b57d7834b
author Robin Lee <rgl@google.com> Fri Dec 23 12:16:19 2016 +0000
committer Robin Lee <rgl@google.com> Fri Dec 23 12:16:19 2016 +0000
tree 138c5183cbed06540c962f0fa5e0da10030f7f34
parent 8a005f90cedf9bc0f06444720251db2c04e6a659
parent 6446d2f0d8365dfee398d3ec9f0de746e3dfeb40

resolve merge conflicts of 6446d2f to master

Change-Id: Ibf37d7fed8f8fbb32a601944f504494101c21a3e

src/com/android/settings/vpn2/VpnSettings.java

diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 3aac639..708b6c4 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -170,6 +170,7 @@
     public void onResume() {
         super.onResume();
 
+        mUnavailable = mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN);
         if (mUnavailable) {
             // Show a message to explain that VPN settings have been disabled
             if (!isUiRestrictedByOnlyAdmin()) {
@@ -178,6 +179,7 @@
             getPreferenceScreen().removeAll();
             return;
         } else {
+            setEmptyView(getEmptyTextView());
             getEmptyTextView().setText(R.string.vpn_no_vpns_added);
         }