commit bcff2eb2004f733bfc855b3b573f907801ac4b60
author arangelov <arangelov@google.com> Thu Oct 24 12:22:02 2019 +0100
committer Antoan Angelov <arangelov@google.com> Thu Oct 24 14:41:13 2019 +0000
tree 0ee5ba8124a9e217bf162ae831b2c4a0b67d97a3
parent 97a95e1af7d117ee049ed1d6219c2a1951b52fcd

Add logs for factory reset dialogs for easier troubleshooting

Test: compiled
Bug: 143270403
Change-Id: I5d149ef63c767ee8b36c575c764477d04551d85b

src/com/android/managedprovisioning/preprovisioning/PreProvisioningActivity.java

diff --git a/src/com/android/managedprovisioning/preprovisioning/PreProvisioningActivity.java b/src/com/android/managedprovisioning/preprovisioning/PreProvisioningActivity.java
index 8a22976..f1a28bd 100644
--- a/src/com/android/managedprovisioning/preprovisioning/PreProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/preprovisioning/PreProvisioningActivity.java
@@ -195,10 +195,14 @@
                     if(data != null && mController.updateProvisioningParamsFromIntent(data)) {
                         mController.showUserConsentScreen();
                     } else {
+                        ProvisionLogger.loge(
+                                "Invalid data object returned from GET_PROVISIONING_MODE.");
                         showFactoryResetDialog(R.string.cant_set_up_device,
                                 R.string.contact_your_admin_for_help);
                     }
                 } else {
+                    ProvisionLogger.loge("Invalid result code from GET_PROVISIONING_MODE. Expected "
+                            + RESULT_OK + " but got " + resultCode + ".");
                     showFactoryResetDialog(R.string.cant_set_up_device,
                             R.string.contact_your_admin_for_help);
                 }

src/com/android/managedprovisioning/preprovisioning/PreProvisioningController.java

diff --git a/src/com/android/managedprovisioning/preprovisioning/PreProvisioningController.java b/src/com/android/managedprovisioning/preprovisioning/PreProvisioningController.java
index 62d4414..55082ff 100644
--- a/src/com/android/managedprovisioning/preprovisioning/PreProvisioningController.java
+++ b/src/com/android/managedprovisioning/preprovisioning/PreProvisioningController.java
@@ -344,6 +344,8 @@
         // Check whether provisioning is allowed for the current action
         if (!checkDevicePolicyPreconditions()) {
             if (mParams.isOrganizationOwnedProvisioning) {
+                ProvisionLogger.loge(
+                        "Provisioning preconditions failed for organization-owned provisioning.");
                 mUi.showFactoryResetDialog(R.string.cant_set_up_device,
                         R.string.contact_your_admin_for_help);
             } else {

src/com/android/managedprovisioning/provisioning/ProvisioningActivity.java

diff --git a/src/com/android/managedprovisioning/provisioning/ProvisioningActivity.java b/src/com/android/managedprovisioning/provisioning/ProvisioningActivity.java
index cbfd31c..8bdbc68 100644
--- a/src/com/android/managedprovisioning/provisioning/ProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/provisioning/ProvisioningActivity.java
@@ -223,6 +223,8 @@
                         finish();
                     }
                 } else {
+                    ProvisionLogger.loge("Invalid POLICY_COMPLIANCE result code. Expected "
+                            + RESULT_OK + " but got " + resultCode + ".");
                     error(/* titleId */ R.string.cant_set_up_device,
                             /* messageId */ R.string.contact_your_admin_for_help,
                             /* resetRequired = */ true);