Revert "Fix the build"

This reverts commit 18c5fb7c2c, 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
This commit is contained in:
Adrian Roos
2015-03-05 19:28:48 +00:00
parent 037d593168
commit b9c9443703

View File

@@ -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);