No public description

PiperOrigin-RevId: 647333692

Author: pfmaggi

README.md

@@ -5,52 +5,63 @@ Test DPC is an app designed to help EMMs, ISVs, and OEMs to test their applicati
 
 See the [documentation](https://developer.android.com/work/index.html) to learn more about Android in the enterprise.
 
-Getting Started
----------------
+## Getting Started
 
 This sample uses the Bazel build system. To build this project, use the "bazel build testdpc" command.
 
 This app can also be found [on the Play store](https://play.google.com/store/apps/details?id=com.afwsamples.testdpc).
 
-Provisioning
-------------
+## Provisioning
 
 You can find various kinds of provisioning methods [here](https://developers.google.com/android/work/prov-devices#Key_provisioning_differences_across_android_releases). Let's take a few of them as an example.
 
-#### QR code provisioning (Device Owner N+ only) ####
+### AFW# code provisioning (Device Owner M+)
 1. Factory reset your device and tap the welcome screen in setup wizard 6 times.
-2. The setup wizard prompts the user to connect to the Internet so the setup wizard can download a QR code reader.
-3. Modify (if needed) and scan [this QR code] (http://down-box.appspot.com/qr/nQB0tw7b).
-4. Follow onscreen instructions
+2. When prompted to sign in, enter **afw#testdpc**
+3. Follow onscreen instructions
 
-#### ADB command ####
-
-**Device Owner**
+### QR code provisioning (Device Owner N+ only)
+1. Factory reset your device and tap the welcome screen in setup wizard 6 times.
+1. On Android O or older, the setup wizard prompts the user to connect to the Internet so the setup wizard can download a QR code reader.
+   Android P and newer devices already have the QR code reader available.
+1. Generate a QR code with the content:
+   ```
+    {
+    	"android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME": "com.afwsamples.testdpc/com.afwsamples.testdpc.DeviceAdminReceiver",
+    	"android.app.extra.PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM": "gJD2YwtOiWJHkSMkkIfLRlj-quNqG1fb6v100QmzM9w=",
+    	"android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION": "https://testdpc-latest-apk.appspot.com"
+    }
+   ```
+   or use this pre-made QR code:  
+   ![testdpc_provisioning](qrcode.png)
+1. Scan the QR code and follow onscreen instructions
+
+### ADB command
+
+#### Device Owner (DO)
 
 *   Run the `adb` command:
 
     ```console
     adb shell dpm set-device-owner com.afwsamples.testdpc/.DeviceAdminReceiver
     ```
 
-**Profile Owner**
+#### Profile Owner - Personal device (PO - BYOD)
 
-*   Create a managed profile by launching the “Set up TestDPC” app (if this app
-    seems broken and you are in dark mode, switch to light mode)
+*   Create a managed profile by launching the “Set up TestDPC” app
 *   Skip adding an account at the end of the flow
 
-**COPE Profile Owner**
+#### Profile Owner - Corporate-owned device (PO - COPE)
 
-*   Create a managed profile by launching the “Set up TestDPC” app (if this app
-    seems broken and you are in dark mode, switch to light mode)
+*   Create a managed profile by launching the “Set up TestDPC” app
 *   Skip adding an account at the end of the flow
 *   Run the `adb` command:
 
     ```console
     adb shell dpm mark-profile-owner-on-organization-owned-device --user 10 com.afwsamples.testdpc/.DeviceAdminReceiver`
     ```
 
-## TestDPC as DM role holder
+#### TestDPC as DM role holder
 
 TestDPC v9.0.5+ can be setup as Device Management Role Holder.
 
@@ -62,11 +73,9 @@ TestDPC v9.0.5+ can be setup as Device Management Role Holder.
     ```
 
     Note: unlike DO/PO, this change is not persisted so TestDPC needs to be
-    marked as role holder again if the device reboots or if a work profile is
-    added to the device.
+    marked as role holder again if the device reboots.
 
-Android Studio import
----------------------
+## Android Studio import
 
 To import this repository in Android Studio, you need to use the 
 [Bazel for Android Studio](https://plugins.jetbrains.com/plugin/9185-bazel-for-android-studio)
@@ -84,29 +93,32 @@ Select "Bazel Command" as Configuration type and add `//:testdpc` as
 
 You can now run the project from inside Android Studio.
 
-
-Building with Bazel
--------------------
+## Building with Bazel
 
 The repository includes a `build.sh` script to build the application. The required
 [setupdesign library](https://android.googlesource.com/platform/external/setupdesign/+/refs/heads/main)
 is now imported and patched dynamically using the command line utility `ed`. This needs to be
 available on the path to successfully build the project.
 
-Support
--------
+### `ANDROID_HOME` environment setup
+
+Bazel requires that you set the `ANDROID_HOME` environment variable to the path of your Android SDK.
+As an example, you can add to your `.bashrc` on linux:
+```
+export ANDROID_HOME=<Path to the Android SDK>
+```
+
+## Support
 
 If you've found an error in this sample, please file an issue:
 https://github.com/googlesamples/android-testdpc/issues
 
 Patches are encouraged, and may be submitted by forking this project and submitting a pull request through GitHub.
 
-License
--------
+## License
 
 Licensed under the Apache 2.0 license. See the LICENSE file for details.
 
-How to make contributions?
---------------------------
+## How to make contributions?
 
-Please read and follow the steps in the CONTRIB file.
+Please read and follow the steps in the CONTRIB file.

qrcode.png

@@ -19,8 +19,8 @@
     xmlns:tools="http://schemas.android.com/tools"
           package="com.afwsamples.testdpc"
           tools:ignore="MissingClass"
-           android:versionCode="9009"
-           android:versionName="9.0.9">
+           android:versionCode="9010"
+           android:versionName="9.0.10">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34"/>
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />

src/main/AndroidManifest.xml

@@ -34,8 +34,7 @@
             <enum name="S_V2" value="32" />
             <enum name="T" value="33" />
             <enum name="U" value="34" />
-            <!-- Change to V API level once released. -->
-            <enum name="V" value="10000" />
+            <enum name="V" value="35" />
         </attr>
 
         <!-- Constrain a preference to DO or PO admins. -->