Merge "Fallback to default display if initial one is detached" into udc-dev

import android.hardware.display.DisplayManager;

import android.os.Bundle;

import android.os.IBinder;

import android.util.Log;

import android.view.Display;

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams.WindowType;

@UiContext

public abstract class WindowProviderService extends Service implements WindowProvider {

    private static final String TAG = WindowProviderService.class.getSimpleName();

    private final Bundle mOptions;

    private final WindowTokenClient mWindowToken = new WindowTokenClient();

    private final WindowContextController mController = new WindowContextController(mWindowToken);

    public final Context createServiceBaseContext(ActivityThread mainThread,

            LoadedApk packageInfo) {

        final Context context = super.createServiceBaseContext(mainThread, packageInfo);

        final Display display = context.getSystemService(DisplayManager.class)

                .getDisplay(getInitialDisplayId());

        final DisplayManager displayManager = context.getSystemService(DisplayManager.class);

        final int initialDisplayId = getInitialDisplayId();

        Display display = displayManager.getDisplay(initialDisplayId);

        // Fallback to use the default display if the initial display to start WindowProviderService

        // is detached.

        if (display == null) {

            Log.e(TAG, "Display with id " + initialDisplayId + " not found, falling back to "

                    + "DEFAULT_DISPLAY");

            display = displayManager.getDisplay(DEFAULT_DISPLAY);

        }

        return context.createTokenContext(mWindowToken, display);

    }