PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue #2420412: API review: DeviceAdmin API changes

Browse Source
This commit is contained in:
Dianne Hackborn
2010-02-16 20:40:42 -08:00
parent c4764d2483
commit 5435511ee9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/DeviceAdminAdd.java
View File

@@ -20,7 +20,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.DeviceAdmin;
import android.app.DeviceAdminReceiver;
import android.app.DeviceAdminInfo;
import android.app.DevicePolicyManager;
import android.app.Dialog;
@@ -146,14 +146,16 @@ public class DeviceAdminAdd extends Activity {
@Override
protected void onResult(Bundle bundle) {
CharSequence msg = bundle != null
? bundle.getCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING)
? bundle.getCharSequence(
DeviceAdminReceiver.EXTRA_DISABLE_WARNING)
: null;
if (msg == null) {
mDPM.removeActiveAdmin(mDeviceAdmin.getComponent());
finish();
} else {
Bundle args = new Bundle();
args.putCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING, msg);
args.putCharSequence(
DeviceAdminReceiver.EXTRA_DISABLE_WARNING, msg);
showDialog(DIALOG_WARNING, args);
}
}
@@ -173,7 +175,7 @@ public class DeviceAdminAdd extends Activity {
protected Dialog onCreateDialog(int id, Bundle args) {
switch (id) {
case DIALOG_WARNING: {
CharSequence msg = args.getCharSequence(DeviceAdmin.EXTRA_DISABLE_WARNING);
CharSequence msg = args.getCharSequence(DeviceAdminReceiver.EXTRA_DISABLE_WARNING);
AlertDialog.Builder builder = new AlertDialog.Builder(
DeviceAdminAdd.this);
builder.setMessage(msg);

4
src/com/android/settings/DeviceAdminSettings.java
View File

@@ -20,7 +20,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.DeviceAdmin;
import android.app.DeviceAdminReceiver;
import android.app.DeviceAdminInfo;
import android.app.DevicePolicyManager;
import android.app.Dialog;
@@ -85,7 +85,7 @@ public class DeviceAdminSettings extends ListActivity {
mAvailableAdmins.clear();
List<ResolveInfo> avail = getPackageManager().queryBroadcastReceivers(
new Intent(DeviceAdmin.ACTION_DEVICE_ADMIN_ENABLED),
new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
PackageManager.GET_META_DATA);
int count = avail == null ? 0 : avail.size();
for (int i=0; i<count; i++) {