commit 7e02403a546aa18c46b9058ec4a6b9f299fc01a8
author Rubin Xu <rubinxu@google.com> Thu Jan 22 10:50:55 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 22 10:50:57 2015 +0000
tree 8f6d6e214e2894b3973f49a600dc38d0dbb08422
parent 10d412aaeb489fa0b2c73a968ee5abe7be2bc665
parent 1ffff473282b9d7d8b2e424ee42b942224db4fb8

Merge "Re-enable profile owner provisioning in cts-verifier." into lmp-sprout-dev

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 5835980..5d37386 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1364,8 +1364,7 @@
         </activity>
 
 
-        <!-- TODO: enable when the test can be executed without leaving marks -->
-        <!-- activity android:name=".managedprovisioning.ByodFlowTestActivity"
+        <activity android:name=".managedprovisioning.ByodFlowTestActivity"
                 android:launchMode="singleTask"
                 android:label="@string/provisioning_byod">
             <intent-filter>
@@ -1378,7 +1377,7 @@
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_managed_provisioning" />
             <meta-data android:name="test_required_features" android:value="android.software.managed_users:android.software.device_admin" />
-        </activity-->
+        </activity>
 
         <activity android:name=".managedprovisioning.ByodHelperActivity">
             <intent-filter>