From b9c944370397b55e1ea1ba9e75f41c699ade05d3 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Thu, 5 Mar 2015 19:28:48 +0000
Subject: [PATCH] Revert "Fix the build"

This reverts commit 18c5fb7c2cb649b355eff5fc33022516e5af150c, which
disabled the trust agent whitelisting in the sample device admin. Now
that the API is re-enabled, that code should be too.

Bug: 19461292
Change-Id: I85e3b4dcaab500ea9dd4b7e75490ca840ff396be
---
 .../src/com/example/android/apis/app/DeviceAdminSample.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
index 15fbdc12e..71badcdf7 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
@@ -406,8 +406,7 @@ public class DeviceAdminSample extends PreferenceActivity {
                             if (featureString != null) {
                                 PersistableBundle bundle = new PersistableBundle();
                                 bundle.putStringArray("features", featureString.split(","));
-                                Log.w(TAG, "setTrustAgentConfigurat() is disabled");
-                                // mDPM.setTrustAgentConfiguration(mDeviceAdminSample, agent, bundle);
+                                mDPM.setTrustAgentConfiguration(mDeviceAdminSample, agent, bundle);
                             }
                         } else {
                             Log.w(TAG, "Invalid component: " + component);