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

Commit 89a02edc authored Jun 28, 2021 by TreeHugger Robot Committed by Automerger Merge Worker Jun 28, 2021

Merge "Improve exception logging for system backup/restore" into sc-dev am: 8f589c02

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15123973

Change-Id: I3f653984e972880d98bdcfd3ec86ec1ff2b2b047

parents 7117267f 8f589c02

core/java/com/android/server/backup/AccountManagerBackupHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}

core/java/com/android/server/backup/NotificationBackupHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}

core/java/com/android/server/backup/PermissionBackupHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}

core/java/com/android/server/backup/PreferredActivityBackupHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}

core/java/com/android/server/backup/SliceBackupHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}