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

Commit 653e129a authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Idf40f3b0 into eclair 

* changes:
  Prevent crash in Home when using widgets whose ids collide with Home's resources.
parents b12789a8 471afca7

libs/ui/FramebufferNativeWindow.cpp

+2 −0
Original line number Original line 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",

        LOGE_IF(err, "fb buffer 1 allocation failed w=%d, h=%d, err=%s",

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

                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<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::xdpi) = fbDev->xdpi;

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

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