Merge "Revert "Fix the build""

This commit is contained in:
Adrian Roos
2015-03-11 16:05:39 +00:00
committed by Android (Google) Code Review

View File

@@ -406,8 +406,7 @@ public class DeviceAdminSample extends PreferenceActivity {
if (featureString != null) { if (featureString != null) {
PersistableBundle bundle = new PersistableBundle(); PersistableBundle bundle = new PersistableBundle();
bundle.putStringArray("features", featureString.split(",")); bundle.putStringArray("features", featureString.split(","));
Log.w(TAG, "setTrustAgentConfigurat() is disabled"); mDPM.setTrustAgentConfiguration(mDeviceAdminSample, agent, bundle);
// mDPM.setTrustAgentConfiguration(mDeviceAdminSample, agent, bundle);
} }
} else { } else {
Log.w(TAG, "Invalid component: " + component); Log.w(TAG, "Invalid component: " + component);