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

Commit bd6c0bce authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am f20e9a88: Merge change Idf40f3b0 into eclair 

Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2

* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
  Prevent crash in Home when using widgets whose ids collide with Home's
parents 190d6c6b 653e129a

libs/ui/FramebufferNativeWindow.cpp

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ FramebufferNativeWindow::FramebufferNativeWindow() 
        LOGE_IF(err, "fb buffer 1 allocation failed w=%d, h=%d, err=%s",

                fbDev->width, fbDev->height, strerror(-err));



        LOGE("xDpi %d", fbDev->xdpi);

        LOGE("yDpi %d", fbDev->ydpi);

        const_cast<uint32_t&>(android_native_window_t::flags) = fbDev->flags; 

        const_cast<float&>(android_native_window_t::xdpi) = fbDev->xdpi;

        const_cast<float&>(android_native_window_t::ydpi) = fbDev->ydpi;