Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57339e75 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am e9e04673: merge from open-source master 

Merge commit 'e9e04673'

* commit 'e9e04673':
  replaced deprecated setButton Methods
parents 8dc9b86f e9e04673

services/java/com/android/server/am/ActivityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

services/java/com/android/server/am/AppWaitingForDebuggerDialog.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.am;



import android.content.Context;

import android.content.DialogInterface;

import android.os.Handler;

import android.os.Message;
@@ -49,7 +50,7 @@ class AppWaitingForDebuggerDialog extends BaseErrorDialog { 
        text.append(" is waiting for the debugger to attach.");



        setMessage(text.toString());

        setButton("Force Close", mHandler.obtainMessage(1, app));

        setButton(DialogInterface.BUTTON_POSITIVE, "Force Close", mHandler.obtainMessage(1, app));

        setTitle("Waiting For Debugger");

        getWindow().setTitle("Waiting For Debugger: " + app.info.processName);

    }

services/java/com/android/server/am/FactoryErrorDialog.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.am;



import android.content.Context;

import android.content.DialogInterface;

import android.os.Handler;

import android.os.Message;
@@ -26,7 +27,8 @@ class FactoryErrorDialog extends BaseErrorDialog { 
        setCancelable(false);

        setTitle(context.getText(com.android.internal.R.string.factorytest_failed));

        setMessage(msg);

        setButton(context.getText(com.android.internal.R.string.factorytest_reboot),

        setButton(DialogInterface.BUTTON_POSITIVE,

                context.getText(com.android.internal.R.string.factorytest_reboot),

                mHandler.obtainMessage(0));

        getWindow().setTitle("Factory Error");

    }