From 385424f431dffa3acfa1fc1679a549868cc3a299 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 28 Jun 2021 09:23:52 +0000 Subject: [PATCH] Improve exception logging for system backup/restore Make sure to log stack traces of unexpected exceptions to allow us to better diagnose issues such as b/190023280 Change-Id: I29a32329f52b8346570148ed5abc34f3149aa0f9 Test: make Bug: 190023280 Change-Id: Idd4e4968fe4c642b463149f98a7669a8733b37d7 --- .../com/android/server/backup/AccountManagerBackupHelper.java | 4 ++-- .../com/android/server/backup/NotificationBackupHelper.java | 4 ++-- .../com/android/server/backup/PermissionBackupHelper.java | 4 ++-- .../android/server/backup/PreferredActivityBackupHelper.java | 4 ++-- core/java/com/android/server/backup/SliceBackupHelper.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/java/com/android/server/backup/AccountManagerBackupHelper.java b/core/java/com/android/server/backup/AccountManagerBackupHelper.java index 39b18c0f2c16e..f76dd095de291 100644 --- a/core/java/com/android/server/backup/AccountManagerBackupHelper.java +++ b/core/java/com/android/server/backup/AccountManagerBackupHelper.java @@ -56,7 +56,7 @@ public class AccountManagerBackupHelper extends BlobBackupHelper { } } } catch (Exception e) { - Slog.e(TAG, "Unable to store payload " + key); + Slog.e(TAG, "Unable to store payload " + key, e); } return new byte[0]; @@ -79,7 +79,7 @@ public class AccountManagerBackupHelper extends BlobBackupHelper { } } } catch (Exception e) { - Slog.w(TAG, "Unable to restore key " + key); + Slog.e(TAG, "Unable to restore key " + key, e); } } } diff --git a/core/java/com/android/server/backup/NotificationBackupHelper.java b/core/java/com/android/server/backup/NotificationBackupHelper.java index 7d4f8f79aa639..faa0509086fc1 100644 --- a/core/java/com/android/server/backup/NotificationBackupHelper.java +++ b/core/java/com/android/server/backup/NotificationBackupHelper.java @@ -49,7 +49,7 @@ public class NotificationBackupHelper extends BlobBackupHelper { newPayload = nm.getBackupPayload(mUserId); } catch (Exception e) { // Treat as no data - Slog.e(TAG, "Couldn't communicate with notification manager"); + Slog.e(TAG, "Couldn't communicate with notification manager", e); newPayload = null; } } @@ -68,7 +68,7 @@ public class NotificationBackupHelper extends BlobBackupHelper { ServiceManager.getService("notification")); nm.applyRestore(payload, mUserId); } catch (Exception e) { - Slog.e(TAG, "Couldn't communicate with notification manager"); + Slog.e(TAG, "Couldn't communicate with notification manager", e); } } } diff --git a/core/java/com/android/server/backup/PermissionBackupHelper.java b/core/java/com/android/server/backup/PermissionBackupHelper.java index 4d1949e3e3d7b..ec5e25189d644 100644 --- a/core/java/com/android/server/backup/PermissionBackupHelper.java +++ b/core/java/com/android/server/backup/PermissionBackupHelper.java @@ -59,7 +59,7 @@ public class PermissionBackupHelper extends BlobBackupHelper { Slog.w(TAG, "Unexpected backup key " + key); } } catch (Exception e) { - Slog.e(TAG, "Unable to store payload " + key); + Slog.e(TAG, "Unable to store payload " + key, e); } return null; } @@ -79,7 +79,7 @@ public class PermissionBackupHelper extends BlobBackupHelper { Slog.w(TAG, "Unexpected restore key " + key); } } catch (Exception e) { - Slog.w(TAG, "Unable to restore key " + key); + Slog.e(TAG, "Unable to restore key " + key, e); } } } diff --git a/core/java/com/android/server/backup/PreferredActivityBackupHelper.java b/core/java/com/android/server/backup/PreferredActivityBackupHelper.java index 503c71990adb3..47e0c079a9f1e 100644 --- a/core/java/com/android/server/backup/PreferredActivityBackupHelper.java +++ b/core/java/com/android/server/backup/PreferredActivityBackupHelper.java @@ -95,7 +95,7 @@ public class PreferredActivityBackupHelper extends BlobBackupHelper { Slog.w(TAG, "Unexpected backup key " + key); } } catch (Exception e) { - Slog.e(TAG, "Unable to store payload " + key); + Slog.e(TAG, "Unable to store payload " + key, e); } return null; } @@ -124,7 +124,7 @@ public class PreferredActivityBackupHelper extends BlobBackupHelper { Slog.w(TAG, "Unexpected restore key " + key); } } catch (Exception e) { - Slog.w(TAG, "Unable to restore key " + key); + Slog.e(TAG, "Unable to restore key " + key, e); } } } diff --git a/core/java/com/android/server/backup/SliceBackupHelper.java b/core/java/com/android/server/backup/SliceBackupHelper.java index 8e5a5eecec89e..77517b334aff1 100644 --- a/core/java/com/android/server/backup/SliceBackupHelper.java +++ b/core/java/com/android/server/backup/SliceBackupHelper.java @@ -48,7 +48,7 @@ public class SliceBackupHelper extends BlobBackupHelper { newPayload = sm.getBackupPayload(UserHandle.USER_SYSTEM); } catch (Exception e) { // Treat as no data - Slog.e(TAG, "Couldn't communicate with slice manager"); + Slog.e(TAG, "Couldn't communicate with slice manager", e); newPayload = null; } } @@ -66,7 +66,7 @@ public class SliceBackupHelper extends BlobBackupHelper { // TODO: http://b/22388012 sm.applyRestore(payload, UserHandle.USER_SYSTEM); } catch (Exception e) { - Slog.e(TAG, "Couldn't communicate with slice manager"); + Slog.e(TAG, "Couldn't communicate with slice manager", e); } } }