Skip to content
Snippets Groups Projects
Commit 241f4387 authored by Hyundo Moon's avatar Hyundo Moon Committed by Gerrit Code Review
Browse files

Merge "Modify ContentProfileFileName enum" into main

parents be6faef1 213db29b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
android/app/src/com/android/bluetooth/map/MmsFileProvider.java
+ 5
− 5
View file @ 241f4387
......@@ -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
View file @ 241f4387
......@@ -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
View file @ 241f4387
......@@ -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());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment