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

Commit 3b9f0a33 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Recover a handful of commits that were reverted earlier

parent 05dd626a

core/java/android/app/SearchDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        try {

            // If the intent was created from a suggestion, it will always have an explicit

            // component here.

            Log.i(LOG_TAG, "Starting (as ourselves) " + intent.toURI());

            Log.i(LOG_TAG, "Starting (as ourselves) " + intent.toUri(0));

            getContext().startActivity(intent);

            // If the search switches to a different activity,

            // SearchDialogWrapper#performActivityResuming

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -3588,7 +3588,7 @@ public final class Settings { 
            ContentValues values = new ContentValues();

            if (title != null) values.put(TITLE, title);

            if (folder != null) values.put(FOLDER, folder);

            values.put(INTENT, intent.toURI());

            values.put(INTENT, intent.toUri(0));

            if (shortcut != 0) values.put(SHORTCUT, (int) shortcut);

            values.put(ORDERING, ordering);

            return cr.insert(CONTENT_URI, values);

opengl/libagl/egl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -485,13 +485,13 @@ void egl_window_surface_v2_t::copyBlt( 
    copybit_device_t* const copybit = blitengine;

    if (copybit)  {

        copybit_image_t simg;

        simg.w = src->width;

        simg.w = src->stride;

        simg.h = src->height;

        simg.format = src->format;

        simg.handle = const_cast<native_handle_t*>(src->handle);



        copybit_image_t dimg;

        dimg.w = dst->width;

        dimg.w = dst->stride;

        dimg.h = dst->height;

        dimg.format = dst->format;

        dimg.handle = const_cast<native_handle_t*>(dst->handle);

services/java/com/android/server/ProcessStats.java

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ public class ProcessStats { 
                        break;

                    }

                }

                return new String(mBuffer, 0, 0, i);

                return new String(mBuffer, 0, i);

            }

        } catch (java.io.FileNotFoundException e) {

        } catch (java.io.IOException e) {

telephony/java/com/android/internal/telephony/IccUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ public class IccUtils { 
            ret.append((char)('0' + v));



            v = (data[i] >> 4) & 0xf;

            // Some PLMNs have 'f' as high nibble, ignore it

            if (v == 0xf) continue;

            if (v > 9)  break;

            ret.append((char)('0' + v));

        }