Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve exception logging for system backup/restore" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-28 19:17:45 +00:00
committed by Android (Google) Code Review
parent 96294a8a63 385424f431
commit 8f589c02c6
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/server/backup/AccountManagerBackupHelper.java
View File

@@ -56,7 +56,7 @@ public class AccountManagerBackupHelper extends BlobBackupHelper {
} }
} }
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "Unable to store payload " + key); Slog.e(TAG, "Unable to store payload " + key, e);
} }
return new byte[0]; return new byte[0];
@@ -79,7 +79,7 @@ public class AccountManagerBackupHelper extends BlobBackupHelper {
} }
} }
} catch (Exception e) { } catch (Exception e) {
Slog.w(TAG, "Unable to restore key " + key); Slog.e(TAG, "Unable to restore key " + key, e);
} }
} }
} }

4
core/java/com/android/server/backup/NotificationBackupHelper.java
View File

@@ -49,7 +49,7 @@ public class NotificationBackupHelper extends BlobBackupHelper {
newPayload = nm.getBackupPayload(mUserId); newPayload = nm.getBackupPayload(mUserId);
} catch (Exception e) { } catch (Exception e) {
// Treat as no data // 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; newPayload = null;
} }
} }
@@ -68,7 +68,7 @@ public class NotificationBackupHelper extends BlobBackupHelper {
ServiceManager.getService("notification")); ServiceManager.getService("notification"));
nm.applyRestore(payload, mUserId); nm.applyRestore(payload, mUserId);
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "Couldn't communicate with notification manager"); Slog.e(TAG, "Couldn't communicate with notification manager", e);
} }
} }
} }

4
core/java/com/android/server/backup/PermissionBackupHelper.java
View File

@@ -59,7 +59,7 @@ public class PermissionBackupHelper extends BlobBackupHelper {
Slog.w(TAG, "Unexpected backup key " + key); Slog.w(TAG, "Unexpected backup key " + key);
} }
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "Unable to store payload " + key); Slog.e(TAG, "Unable to store payload " + key, e);
} }
return null; return null;
} }
@@ -79,7 +79,7 @@ public class PermissionBackupHelper extends BlobBackupHelper {
Slog.w(TAG, "Unexpected restore key " + key); Slog.w(TAG, "Unexpected restore key " + key);
} }
} catch (Exception e) { } catch (Exception e) {
Slog.w(TAG, "Unable to restore key " + key); Slog.e(TAG, "Unable to restore key " + key, e);
} }
} }
} }

4
core/java/com/android/server/backup/PreferredActivityBackupHelper.java
View File

@@ -95,7 +95,7 @@ public class PreferredActivityBackupHelper extends BlobBackupHelper {
Slog.w(TAG, "Unexpected backup key " + key); Slog.w(TAG, "Unexpected backup key " + key);
} }
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "Unable to store payload " + key); Slog.e(TAG, "Unable to store payload " + key, e);
} }
return null; return null;
} }
@@ -124,7 +124,7 @@ public class PreferredActivityBackupHelper extends BlobBackupHelper {
Slog.w(TAG, "Unexpected restore key " + key); Slog.w(TAG, "Unexpected restore key " + key);
} }
} catch (Exception e) { } catch (Exception e) {
Slog.w(TAG, "Unable to restore key " + key); Slog.e(TAG, "Unable to restore key " + key, e);
} }
} }
} }

4
core/java/com/android/server/backup/SliceBackupHelper.java
View File

@@ -48,7 +48,7 @@ public class SliceBackupHelper extends BlobBackupHelper {
newPayload = sm.getBackupPayload(UserHandle.USER_SYSTEM); newPayload = sm.getBackupPayload(UserHandle.USER_SYSTEM);
} catch (Exception e) { } catch (Exception e) {
// Treat as no data // 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; newPayload = null;
} }
} }
@@ -66,7 +66,7 @@ public class SliceBackupHelper extends BlobBackupHelper {
// TODO: http://b/22388012 // TODO: http://b/22388012
sm.applyRestore(payload, UserHandle.USER_SYSTEM); sm.applyRestore(payload, UserHandle.USER_SYSTEM);
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "Couldn't communicate with slice manager"); Slog.e(TAG, "Couldn't communicate with slice manager", e);
} }
} }
} }