Loading services/core/java/com/android/server/power/ShutdownThread.java +12 −2 Original line number Original line Diff line number Diff line Loading @@ -26,6 +26,7 @@ import android.app.KeyguardManager; import android.app.ProgressDialog; import android.app.ProgressDialog; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter; import android.bluetooth.IBluetoothManager; import android.bluetooth.IBluetoothManager; import android.content.pm.ThemeUtils; import android.media.AudioAttributes; import android.media.AudioAttributes; import android.nfc.NfcAdapter; import android.nfc.NfcAdapter; import android.nfc.INfcAdapter; import android.nfc.INfcAdapter; Loading Loading @@ -142,7 +143,6 @@ public final class ShutdownThread extends Thread { private ProgressDialog mProgressDialog; private ProgressDialog mProgressDialog; private static AudioManager mAudioManager; private static AudioManager mAudioManager; private ShutdownThread() { private ShutdownThread() { } } Loading Loading @@ -214,12 +214,13 @@ public final class ShutdownThread extends Thread { if (confirm) { if (confirm) { final CloseDialogReceiver closer = new CloseDialogReceiver(context); final CloseDialogReceiver closer = new CloseDialogReceiver(context); final boolean advancedReboot = isAdvancedRebootPossible(context); final boolean advancedReboot = isAdvancedRebootPossible(context); final Context uiContext = getUiContext(context); if (sConfirmDialog != null) { if (sConfirmDialog != null) { sConfirmDialog.dismiss(); sConfirmDialog.dismiss(); sConfirmDialog = null; sConfirmDialog = null; } } AlertDialog.Builder confirmDialogBuilder = new AlertDialog.Builder(context) AlertDialog.Builder confirmDialogBuilder = new AlertDialog.Builder(uiContext) .setTitle(mRebootSafeMode .setTitle(mRebootSafeMode ? com.android.internal.R.string.reboot_safemode_title ? com.android.internal.R.string.reboot_safemode_title : showRebootOption : showRebootOption Loading Loading @@ -974,4 +975,13 @@ public final class ShutdownThread extends Thread { } } } } }; }; private static Context getUiContext(Context context) { Context uiContext = null; if (context != null) { uiContext = ThemeUtils.createUiContext(context); uiContext.setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar); } return uiContext != null ? uiContext : context; } } } Loading
services/core/java/com/android/server/power/ShutdownThread.java +12 −2 Original line number Original line Diff line number Diff line Loading @@ -26,6 +26,7 @@ import android.app.KeyguardManager; import android.app.ProgressDialog; import android.app.ProgressDialog; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter; import android.bluetooth.IBluetoothManager; import android.bluetooth.IBluetoothManager; import android.content.pm.ThemeUtils; import android.media.AudioAttributes; import android.media.AudioAttributes; import android.nfc.NfcAdapter; import android.nfc.NfcAdapter; import android.nfc.INfcAdapter; import android.nfc.INfcAdapter; Loading Loading @@ -142,7 +143,6 @@ public final class ShutdownThread extends Thread { private ProgressDialog mProgressDialog; private ProgressDialog mProgressDialog; private static AudioManager mAudioManager; private static AudioManager mAudioManager; private ShutdownThread() { private ShutdownThread() { } } Loading Loading @@ -214,12 +214,13 @@ public final class ShutdownThread extends Thread { if (confirm) { if (confirm) { final CloseDialogReceiver closer = new CloseDialogReceiver(context); final CloseDialogReceiver closer = new CloseDialogReceiver(context); final boolean advancedReboot = isAdvancedRebootPossible(context); final boolean advancedReboot = isAdvancedRebootPossible(context); final Context uiContext = getUiContext(context); if (sConfirmDialog != null) { if (sConfirmDialog != null) { sConfirmDialog.dismiss(); sConfirmDialog.dismiss(); sConfirmDialog = null; sConfirmDialog = null; } } AlertDialog.Builder confirmDialogBuilder = new AlertDialog.Builder(context) AlertDialog.Builder confirmDialogBuilder = new AlertDialog.Builder(uiContext) .setTitle(mRebootSafeMode .setTitle(mRebootSafeMode ? com.android.internal.R.string.reboot_safemode_title ? com.android.internal.R.string.reboot_safemode_title : showRebootOption : showRebootOption Loading Loading @@ -974,4 +975,13 @@ public final class ShutdownThread extends Thread { } } } } }; }; private static Context getUiContext(Context context) { Context uiContext = null; if (context != null) { uiContext = ThemeUtils.createUiContext(context); uiContext.setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar); } return uiContext != null ? uiContext : context; } } }