Projects >> platform_frameworks_base >>e5eb6a9e019e4fc161b24ba18fc21aaf00e91505

Chunk
Conflicting content 
     * display dimensions.
     */
    public void setInitialDisplaySize(int width, int height);
<<<<<<< HEAD

=======
    
>>>>>>> 63446167b9d6d9ed3410320d17e8fe816caf6c42
    /**
     * Check permissions when adding a window.
     *
Solution content 
     * display dimensions.
     */
    public void setInitialDisplaySize(int width, int height);

    /**
     * Check permissions when adding a window.
     *
File
WindowManagerPolicy.java
Developer's decision
Version 1
Kind of conflict
Blank