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

Commit 768797c3 authored by László Dávid's avatar László Dávid Committed by Steve Kondik
Browse files

Accidentally removed bugfix in BluetoothMasObexServer 

This is the original change-set:
https://github.com/CyanogenMod/android_packages_apps_Bluetooth/commit/18e2a650606243619fde236fc773ecdc596183c3

This is the merge change-set which removes the bugfix:
https://github.com/CyanogenMod/android_packages_apps_Bluetooth/commit/cc1d9b002d0319aacf771f270bfe4b6b23aea5d9

Change-Id: Ie4dc42417787235aa6c6d0c70af540c7fee13f6a
parent 3fd97fc7

src/com/android/bluetooth/map/BluetoothMasObexServer.java

+6 −4
Original line number Diff line number Diff line
@@ -185,15 +185,17 @@ public class BluetoothMasObexServer extends ServerRequestHandler { 


        private final int getUint16BigEndian(byte b1, byte b2) {

            int retVal;

            retVal = (int) ((0x0000FF00 & (int) (b1 << 0x8)) | (0x000000FF & (int) b2));

            retVal = (((int) b1 & 0xFF) << 8) |

                     ((int) b2 & 0xFF);

            return retVal;

        }



        private final long getUint32BigEndian(byte b1, byte b2, byte b3, byte b4) {

            long retVal;

            retVal = (long) ((0xFF000000 & (long) (b1 << 0x24))

                    | (0x00FF0000 & (long) (b2 << 0x16))

                    | (0x0000FF00 & (long) (b3 << 0x8)) | (0x000000FF & (long) b4));

            retVal = (((long) b1 & 0xFF) << 24) |

                     (((long) b2 & 0xFF) << 16) |

                     (((long) b3 & 0xFF) << 8) |

                      ((long) b4 & 0xFF);

            return retVal;

        }