Release final R version.

Author: jscott1989

app/build.gradle

@@ -7,7 +7,7 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 02
+    versionBuild = 03
 }
 
 android {
@@ -121,15 +121,19 @@ private void stripTestOnlyForBuild(flavor, buildType) {
     def manifestPath =
             "${buildDir}/intermediates/manifests/full/${flavor}/${buildType}/AndroidManifest.xml"
     if (file(manifestPath).exists()) {
-        def xml = new XmlParser().parse(manifestPath)
-        def attributeNames = xml.application[0].attributes().collect { it.key }
-        attributeNames.each {
-            if (it.getLocalPart() == 'testOnly') {
-                xml.application[0].attributes().remove(it)
-                println "Removed testOnly attribute successfully!"
+        if (System.getenv('TESTDPC_ALLOW_TEST_ONLY') == 'true') {
+            println "NOT stripping testOnly from manifest because of TESTDPC_ALLOW_TEST_ONLY"
+        } else {
+            def xml = new XmlParser().parse(manifestPath)
+            def attributeNames = xml.application[0].attributes().collect { it.key }
+            attributeNames.each {
+                if (it.getLocalPart() == 'testOnly') {
+                    xml.application[0].attributes().remove(it)
+                    println "Removed testOnly attribute successfully!"
+                }
             }
+            new XmlNodePrinter(new PrintWriter(new FileWriter(manifestPath))).print(xml)
         }
-        new XmlNodePrinter(new PrintWriter(new FileWriter(manifestPath))).print(xml)
     }
 }
 

app/src/main/AndroidManifest.xml

@@ -33,7 +33,9 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
+    <!--  NOTE: android:testOnly will be stripped by build.fradle (stripTestOnlyForBuild()) -->
     <application
+            android:testOnly="true"
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"
             android:banner="@drawable/ic_launcher"
@@ -184,6 +186,13 @@
                     android:resource="@xml/filepaths" />
         </provider>
 
+        <provider
+                android:authorities="com.afwsamples.testdpc.usericoncontentprovider"
+                android:name="com.afwsamples.testdpc.UserIconContentProvider"
+                android:grantUriPermissions="true"
+                android:exported="true">
+        </provider>
+
         <service android:name=".profilepolicy.apprestrictions.AppRestrictionsProxy">
             <intent-filter>
                 <action android:name="com.android.vending.dpc.APPLICATION_RESTRICTIONS_PROXY" />

app/src/main/java/com/afwsamples/testdpc/DeviceAdminService.java

@@ -1,5 +1,23 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.afwsamples.testdpc;
 
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+
 import android.content.BroadcastReceiver;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -43,4 +61,9 @@ private void unregisterPackageChangesReceiver() {
             mPackageChangedReceiver = null;
         }
     }
+
+    @Override
+    protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+        new ShellCommand(getApplicationContext(), writer, args).run();
+    }
 }