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

Perform master clear via Intent broadcast, rather than using ICheckinService.

Browse Source
This commit is contained in:
Dan Egnor
2010-02-10 19:29:47 -08:00
parent 438ba554b7
commit 3352d10f07
2 changed files with 5 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/MasterClear.java
View File

@@ -60,35 +60,12 @@ public class MasterClear extends Activity {
*/
private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
public void onClick(View v) {
if (Utils.isMonkeyRunning()) {
return;
}
ICheckinService service =
ICheckinService.Stub.asInterface(ServiceManager.getService("checkin"));
if (service != null) {
try {
// This RPC should never return
service.masterClear();
} catch (android.os.RemoteException e) {
// Intentionally blank - there's nothing we can do here
Log.w("MasterClear", "Unable to invoke ICheckinService.masterClear()");
}
} else {
Log.w("MasterClear", "Unable to locate ICheckinService");
}
/* If we reach this point, the master clear didn't happen -- the
* service might have been unregistered with the ServiceManager,
* the RPC might have thrown an exception, or for some reason
* the implementation of masterClear() may have returned instead
* of resetting the device.
*/
new AlertDialog.Builder(MasterClear.this)
.setMessage(getText(R.string.master_clear_failed))
.setPositiveButton(getText(android.R.string.ok), null)
.show();
sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR"));
// Intent handling is asynchronous -- assume it will happen soon.
}
};

25
src/com/android/settings/SecuritySettings.java
View File

@@ -32,8 +32,6 @@ import android.content.Intent;
import android.database.Cursor;
import android.location.LocationManager;
import android.os.Bundle;
import android.os.ICheckinService;
import android.os.ServiceManager;
import android.os.SystemProperties;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
@@ -444,26 +442,9 @@ public class SecuritySettings extends PreferenceActivity {
}
} else {
if (button == DialogInterface.BUTTON_POSITIVE) {
// Perform action
// Reboot and toggle Encrypted File Systems
ICheckinService service =
ICheckinService.Stub.asInterface(ServiceManager.getService("checkin"));
if (service != null) {
try {
// This RPC should never return
if (mWillEnableEncryptedFS) {
service.masterClearAndToggleEFS(true);
} else {
service.masterClearAndToggleEFS(false);
}
} catch (android.os.RemoteException e) {
// Intentionally blank - there's nothing we can do here
Log.w("SecuritySettings",
"Unable to invoke ICheckinService.masterClearAndToggleEFS()");
}
} else {
Log.w("SecuritySettings", "Unable to locate ICheckinService");
}
Intent intent = new Intent("android.intent.action.MASTER_CLEAR");
intent.putExtra("enableEFS", mWillEnableEncryptedFS);
sendBroadcast(intent);
updatePreferences(mState);
} else if (button == DialogInterface.BUTTON_NEGATIVE) {
// Cancel action