commit ca24281df88030a6fb3e1c2b3fd104a78c8506b8
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 07 03:35:54 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 07 03:35:54 2016 +0000
tree e648c48e042af554c0ac3f4fd28be01b8784e337
parent e145cca1d0ad7856220b2bcab7a7d6771439b536
parent 937c29d240dd19bf835b73c655f73c39d3638b41

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

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

diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index fa43129..170b128 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -25,6 +25,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.ConnectivityManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -158,7 +159,7 @@
     }
 
     private boolean onForgetVpnClick() {
-        updateRestrictions();
+        updateRestrictedViews();
         if (!mPreferenceForget.isEnabled()) {
             return false;
         }
@@ -178,7 +179,7 @@
     }
 
     private boolean setAlwaysOnVpnByUI(boolean isEnabled) {
-        updateRestrictions();
+        updateRestrictedViews();
         if (!mPreferenceAlwaysOn.isEnabled()) {
             return false;
         }
@@ -194,19 +195,38 @@
         return success;
     }
 
+    private boolean checkTargetVersion() {
+        if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {
+            return true;
+        }
+        final int targetSdk = mPackageInfo.applicationInfo.targetSdkVersion;
+        if (targetSdk >= Build.VERSION_CODES.N) {
+            return true;
+        }
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "Package " + mPackageName + " targets SDK version " + targetSdk + "; must"
+                    + " target at least " + Build.VERSION_CODES.N + " to use always-on.");
+        }
+        return false;
+    }
+
     private void updateUI() {
         if (isAdded()) {
             mPreferenceAlwaysOn.setChecked(isVpnAlwaysOn());
-            updateRestrictions();
+            updateRestrictedViews();
         }
     }
 
-    private void updateRestrictions() {
+    private void updateRestrictedViews() {
         if (isAdded()) {
             mPreferenceAlwaysOn.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_VPN,
                     mUserId);
             mPreferenceForget.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_VPN,
                     mUserId);
+
+            if (!checkTargetVersion()) {
+                mPreferenceAlwaysOn.setEnabled(false);
+            }
         }
     }