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

Commit 7dea3e6c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Catch security exception during socket creation." am: 97e313df am: 796526a8 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1535063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24632736e4f16e0d91d77dcb8ad880dae5c80e12
parents ab8662aa 796526a8

android/app/src/com/android/bluetooth/ObexServerSockets.java

+4 −0
Original line number Diff line number Diff line
@@ -143,6 +143,10 @@ public class ObexServerSockets { 
            } catch (IOException e) {

                Log.e(STAG, "Error create ServerSockets ", e);

                initSocketOK = false;

            } catch (SecurityException e) {

                Log.e(STAG, "Error create ServerSockets ", e);

                initSocketOK = false;

                break;

            }

            if (!initSocketOK) {

                // Need to break out of this loop if BT is being turned off.