Merge /media/tonymak/SSD/testdpc-release/vendor/unbundled_google/packages/TestDPC

Author: tony-mak

app/build.gradle

@@ -7,7 +7,7 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 0
+    versionBuild = 1
 }
 
 android {
@@ -29,6 +29,14 @@ android {
         }
     }
 
+    lintOptions {
+        check 'NewApi'
+        abortOnError true
+        xmlReport false
+        textReport true
+        textOutput "stdout"
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -52,11 +60,11 @@ android {
         }
     }
 
-    /* TODO: remove once release version of N sdk is released */
+    /* TODO: Remove once release version of N SDK is released. */
        applicationVariants.all { variant ->
            variant.outputs.each { output ->
                output.processManifest.doLast {
-                   // minSdkVersion and targetSdkVersion are overridden if we build against preview
+                   // minSdkVersion and targetSdkVersion are overrided if we build against preview
                    // SDK, let us override them again here.
                    minSdkVersion = variant.getMergedFlavor().minSdkVersion.getApiString();
                    targetSdkVersion = variant.getMergedFlavor().targetSdkVersion.getApiString();
@@ -71,6 +79,14 @@ android {
                }
            }
        }
+
+    // Enable lint checking in all build variants.
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            def lintTask = tasks["lint${variant.name.capitalize()}"]
+            output.assemble.dependsOn lintTask
+        }
+    }
 }
 
 dependencies {

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

@@ -16,6 +16,7 @@
 
 package com.afwsamples.testdpc.common;
 
+import android.annotation.TargetApi;
 import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
@@ -42,7 +43,10 @@
  *
  * If there is no parent user (for example, if the managed user is controlled by a Device Owner),
  * the fragment will be shown directly.
+ *
+ * Please notice that all subclasses of this fragment only support N or above.
  */
+@TargetApi(VERSION_CODES.N)
 public abstract class ProfileOrParentFragment extends PreferenceFragment {
     private static final String LOG_TAG = "ProfileOrParentFragment";
 
@@ -141,11 +145,6 @@ protected final boolean isManagedProfileInstance() {
         return mProfileOwner && !isParentProfileInstance();
     }
 
-    @Override
-    public Context getContext() {
-        return (Context) getActivity();
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -16,6 +16,7 @@
 
 package com.afwsamples.testdpc.common;
 
+import android.annotation.TargetApi;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -90,6 +91,7 @@ public static boolean isManaged(Context context) {
      * @param context Calling activity's context
      * @return true, if provisioning is allowed for corresponding action
      */
+    @TargetApi(Build.VERSION_CODES.N)
     public static boolean isProvisioningAllowed(Context context, String action) {
         /* TODO: Remove CODENAME check once SDK_INT on device is bumped for N */
         if (!versionIsAtLeastN()) {