No public description

PiperOrigin-RevId: 619500419

Author: pfmaggi

README.md

@@ -5,54 +5,41 @@ 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.
 
-### AFW# code provisioning (Device Owner M+)
+#### QR code provisioning (Device Owner N+ only) ####
 1. Factory reset your device and tap the welcome screen in setup wizard 6 times.
-2. When prompted to sign in, enter **afw#testdpc**
-3. Follow onscreen instructions
+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
 
-### 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](https://github.com/googlesamples/android-testdpc/assets/188886/a54b809f-cf58-433b-8cbe-f14cf3f00612)
-1. Scan the QR code and follow onscreen instructions
-
-### ADB command
-
-#### Device Owner (DO)
+#### ADB command ####
+
+**Device Owner**
 
 *   Run the `adb` command:
 
     ```console
     adb shell dpm set-device-owner com.afwsamples.testdpc/.DeviceAdminReceiver
     ```
 
-#### Profile Owner - Personal device (PO - BYOD)
+**Profile Owner**
 
 *   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)
 *   Skip adding an account at the end of the flow
 
-#### Profile Owner - Corporate-owned device (PO - COPE)
+**COPE Profile Owner**
 
 *   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)
@@ -63,7 +50,7 @@ You can find various kinds of provisioning methods [here](https://developers.goo
     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.
 
@@ -75,9 +62,11 @@ 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.
+    marked as role holder again if the device reboots or if a work profile is
+    added to the device.
 
-## 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)
@@ -95,32 +84,29 @@ 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.
 
-### `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
+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.

src/main/AndroidManifest.xml

@@ -19,8 +19,8 @@
     xmlns:tools="http://schemas.android.com/tools"
           package="com.afwsamples.testdpc"
           tools:ignore="MissingClass"
-           android:versionCode="9006"
-           android:versionName="9.0.6">
+           android:versionCode="9007"
+           android:versionName="9.0.7">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34"/>
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -74,8 +74,7 @@
             android:icon="@drawable/ic_launcher"
             android:banner="@drawable/ic_launcher"
             android:theme="@style/AppTheme"
-            android:label="@string/app_name"
-            tools:remove="android:appComponentFactory" >
+            android:label="@string/app_name">
 
       <activity
             android:name=".PolicyManagementActivity"

src/main/java/com/afwsamples/testdpc/ShellCommand.java

@@ -65,7 +65,7 @@
 /**
  * Provides a CLI (command-line interface) to TestDPC through {@code dumpsys}.
  *
- * <p>Usage: {@code adb shell dumpsys activity --user USER_ID service com.afwsamples.testdpc CMD}.
+ * <p>Usage: {@code adb shell dumpsys activity service --user USER_ID com.afwsamples.testdpc CMD}.
  */
 final class ShellCommand {
   private static final String TAG = "TestDPCShellCommand";

src/main/res/layout/activity_add_account.xml

@@ -20,8 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_enterprise_blue"
-    app:sucHeaderText="@string/add_account"
-    app:sucUsePartnerResource="true">
+    app:sucHeaderText="@string/add_account">
 
     <LinearLayout
         style="@style/SudItemContainer"

src/main/res/layout/finalize_activity.xml

@@ -21,8 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_enterprise_blue"
-    app:sucHeaderText="@string/finish_setup"
-    app:sucUsePartnerResource="true">
+    app:sucHeaderText="@string/finish_setup">
 
     <LinearLayout
         style="@style/SudContentFrame"

src/main/res/layout/setup_management_fragment.xml

@@ -21,8 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_enterprise_blue"
-    app:sucHeaderText="@string/set_up_management_header"
-    app:sucUsePartnerResource="true">
+    app:sucHeaderText="@string/set_up_management_header">
 
     <LinearLayout
         style="@style/SudContentFrame"