Merge tag 'android-5.1.0_r3' of https://android.googlesource.com/plat…

…form/development into HEAD Android 5.1.0 release 3
StelixROM · Mar 27, 2015 · 95a1fdb · 95a1fdb
2 parents 5b88c44 + fcc638d
commit 95a1fdb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
@@ -406,7 +406,8 @@ public void run() {
                             if (featureString != null) {
                                 PersistableBundle bundle = new PersistableBundle();
                                 bundle.putStringArray("features", featureString.split(","));
-                                mDPM.setTrustAgentConfiguration(mDeviceAdminSample, agent, bundle);
+                                Log.w(TAG, "setTrustAgentConfigurat() is disabled");
+                                // mDPM.setTrustAgentConfiguration(mDeviceAdminSample, agent, bundle);
                             }
                         } else {
                             Log.w(TAG, "Invalid component: " + component);