merge from open-source master

Change-Id: I5d220f16c319e95547f133ee9bcbd0b5caabc597
This commit is contained in:
The Android Open Source Project
2010-07-21 08:05:45 -07:00
3 changed files with 7 additions and 3 deletions

View File

@@ -58,6 +58,7 @@ import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.IIntentReceiver;
@@ -1077,7 +1078,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
d.setCancelable(false);
d.setTitle("System UIDs Inconsistent");
d.setMessage("UIDs on the system are inconsistent, you need to wipe your data partition or your device will be unstable.");
d.setButton("I'm Feeling Lucky",
d.setButton(DialogInterface.BUTTON_POSITIVE, "I'm Feeling Lucky",
mHandler.obtainMessage(IM_FEELING_LUCKY_MSG));
mUidAlert = d;
d.show();