diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-03-27 01:42:58 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-03-27 01:42:58 -0700 |
| commit | 95a1fdb546710880b0561ba661867d3919b6b13d (patch) | |
| tree | bd833f1e7422124146eb54f571d53a3f2d9abf47 | |
| parent | 5b88c4465a219b5df4a7498a35d4862e7f2ab6e6 (diff) | |
| parent | fcc638d58a3f9e21ba51dcdd5d0838d3dfdfae95 (diff) | |
| download | android_development-95a1fdb546710880b0561ba661867d3919b6b13d.tar.gz android_development-95a1fdb546710880b0561ba661867d3919b6b13d.tar.bz2 android_development-95a1fdb546710880b0561ba661867d3919b6b13d.zip | |
Merge tag 'android-5.1.0_r3' of https://android.googlesource.com/platform/development into HEADstaging/cm-12.1
Android 5.1.0 release 3
| -rw-r--r-- | samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java | 3 |
1 files changed, 2 insertions, 1 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 71badcdf7..15fbdc12e 100644 --- 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 class DeviceAdminSample extends PreferenceActivity { 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); |