diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-02-26 17:26:55 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-02-26 23:33:35 -0800 |
| commit | 4037c7f27c849a1ada0980ad881636fc940a0b85 (patch) | |
| tree | 2c8c5a2fe073b1c75922e7a25b82f7b73dd8ed60 | |
| parent | a15d03fcccf3ed7470634e55e9507093f9d017e9 (diff) | |
| download | packages_apps_settings-4037c7f27c849a1ada0980ad881636fc940a0b85.zip packages_apps_settings-4037c7f27c849a1ada0980ad881636fc940a0b85.tar.gz packages_apps_settings-4037c7f27c849a1ada0980ad881636fc940a0b85.tar.bz2 | |
Move DeviceAdmin APIs to android.app.admin.
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/DeviceAdminAdd.java | 6 | ||||
| -rw-r--r-- | src/com/android/settings/DeviceAdminSettings.java | 10 | ||||
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index b244a75..83ef952 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -19,7 +19,7 @@ package com.android.settings; import com.android.internal.widget.LockPatternUtils; import android.app.Activity; -import android.app.DevicePolicyManager; +import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java index 26ad70c..d953409 100644 --- a/src/com/android/settings/DeviceAdminAdd.java +++ b/src/com/android/settings/DeviceAdminAdd.java @@ -20,10 +20,10 @@ import org.xmlpull.v1.XmlPullParserException; import android.app.Activity; import android.app.AlertDialog; -import android.app.DeviceAdminReceiver; -import android.app.DeviceAdminInfo; -import android.app.DevicePolicyManager; import android.app.Dialog; +import android.app.admin.DeviceAdminInfo; +import android.app.admin.DeviceAdminReceiver; +import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java index d866966..c3c74b6 100644 --- a/src/com/android/settings/DeviceAdminSettings.java +++ b/src/com/android/settings/DeviceAdminSettings.java @@ -20,11 +20,11 @@ import org.xmlpull.v1.XmlPullParserException; import android.app.Activity; import android.app.AlertDialog; -import android.app.DeviceAdminReceiver; -import android.app.DeviceAdminInfo; -import android.app.DevicePolicyManager; import android.app.Dialog; import android.app.ListActivity; +import android.app.admin.DeviceAdminInfo; +import android.app.admin.DeviceAdminReceiver; +import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -92,7 +92,9 @@ public class DeviceAdminSettings extends ListActivity { ResolveInfo ri = avail.get(i); try { DeviceAdminInfo dpi = new DeviceAdminInfo(this, ri); - mAvailableAdmins.add(dpi); + if (dpi.isVisible() || mActiveAdmins.contains(dpi.getComponent())) { + mAvailableAdmins.add(dpi); + } } catch (XmlPullParserException e) { Log.w(TAG, "Skipping " + ri.activityInfo, e); } catch (IOException e) { diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 9f99824..c36ef38 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -22,8 +22,8 @@ import java.util.Observer; import android.app.Activity; import android.app.AlertDialog; -import android.app.DevicePolicyManager; import android.app.Dialog; +import android.app.admin.DevicePolicyManager; import android.content.ContentQueryMap; import android.content.ContentResolver; import android.content.Context; |