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

Commit 60b5f920 authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "Modify ContentProfileFileName enum" into main

parents db8e162e 8c86c62b

android/app/src/com/android/bluetooth/map/MmsFileProvider.java

+5 −5
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class MmsFileProvider extends ContentProvider { 
        } catch (NumberFormatException e) {

            ContentProfileErrorReportUtils.report(

                    BluetoothProfile.MAP,

                    BluetoothProtoEnums.MMS_FILE_PROVIDER,

                    BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER,

                    BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION,

                    0);

            Log.w(TAG, e);
@@ -135,7 +135,7 @@ public class MmsFileProvider extends ContentProvider { 
            } catch (IOException e) {

                ContentProfileErrorReportUtils.report(

                        BluetoothProfile.MAP,

                        BluetoothProtoEnums.MMS_FILE_PROVIDER,

                        BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER,

                        BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION,

                        1);

                Log.w(TAG, e);
@@ -145,7 +145,7 @@ public class MmsFileProvider extends ContentProvider { 
            } catch (MmsException e) {

                ContentProfileErrorReportUtils.report(

                        BluetoothProfile.MAP,

                        BluetoothProtoEnums.MMS_FILE_PROVIDER,

                        BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER,

                        BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION,

                        2);

                Log.w(TAG, e);
@@ -161,7 +161,7 @@ public class MmsFileProvider extends ContentProvider { 
                } catch (IOException e) {

                    ContentProfileErrorReportUtils.report(

                            BluetoothProfile.MAP,

                            BluetoothProtoEnums.MMS_FILE_PROVIDER,

                            BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER,

                            BluetoothStatsLog

                                    .BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION,

                            3);
@@ -172,7 +172,7 @@ public class MmsFileProvider extends ContentProvider { 
                } catch (IOException e) {

                    ContentProfileErrorReportUtils.report(

                            BluetoothProfile.MAP,

                            BluetoothProtoEnums.MMS_FILE_PROVIDER,

                            BluetoothProtoEnums.BLUETOOTH_MMS_FILE_PROVIDER,

                            BluetoothStatsLog

                                    .BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION,

                            4);

android/app/src/com/android/bluetooth/map/SmsMmsContacts.java

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class SmsMmsContacts { 
            Log.e(TAG, "query failed");

            ContentProfileErrorReportUtils.report(

                    BluetoothProfile.MAP,

                    BluetoothProtoEnums.SMS_MMS_CONTACTS,

                    BluetoothProtoEnums.BLUETOOTH_SMS_MMS_CONTACTS,

                    BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__LOG_ERROR,

                    0);

        } finally {
@@ -153,7 +153,7 @@ public class SmsMmsContacts { 
                Log.e(TAG, "query failed");

                ContentProfileErrorReportUtils.report(

                        BluetoothProfile.MAP,

                        BluetoothProtoEnums.SMS_MMS_CONTACTS,

                        BluetoothProtoEnums.BLUETOOTH_SMS_MMS_CONTACTS,

                        BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__LOG_ERROR,

                        1);

            }

android/app/src/com/android/bluetooth/pbap/PbapStateMachine.java

+3 −3
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ public class PbapStateMachine extends StateMachine { 
            } catch (IOException ex) {

                ContentProfileErrorReportUtils.report(

                        BluetoothProfile.PBAP,

                        BluetoothProtoEnums.PBAP_STATE_MACHINE,

                        BluetoothProtoEnums.BLUETOOTH_PBAP_STATE_MACHINE,

                        BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION,

                        0);

                Log.e(TAG, "Caught exception starting OBEX reject server session" + ex.toString());
@@ -301,7 +301,7 @@ public class PbapStateMachine extends StateMachine { 
            } catch (IOException e) {

                ContentProfileErrorReportUtils.report(

                        BluetoothProfile.PBAP,

                        BluetoothProtoEnums.PBAP_STATE_MACHINE,

                        BluetoothProtoEnums.BLUETOOTH_PBAP_STATE_MACHINE,

                        BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION,

                        1);

                Log.e(TAG, "Close Connection Socket error: " + e.toString());
@@ -326,7 +326,7 @@ public class PbapStateMachine extends StateMachine { 
            } catch (IOException ex) {

                ContentProfileErrorReportUtils.report(

                        BluetoothProfile.PBAP,

                        BluetoothProtoEnums.PBAP_STATE_MACHINE,

                        BluetoothProtoEnums.BLUETOOTH_PBAP_STATE_MACHINE,

                        BluetoothStatsLog.BLUETOOTH_CONTENT_PROFILE_ERROR_REPORTED__TYPE__EXCEPTION,

                        2);

                Log.e(TAG, "Caught exception starting OBEX server session" + ex.toString());