From 7d7f2f804f0ac4bfd0ec0a4dcccbad17545bbbe2 Mon Sep 17 00:00:00 2001 From: prateek rawal Date: Tue, 29 Aug 2023 20:34:41 +0530 Subject: Add null checks when registering backup transport Problem: { //frameworks/base/services/backup/backuplib/java/com/android/server/backup/TransportManager.java NullPointerException is occurring as a transport with null transportDirName is attempted to register, causing subsequent fatal in system server resulting in restart. Bug : https://partnerissuetracker.corp.google.com/issues/298000577 } Solution: { Null check transportName and transportDirName added to circumvent fatal in system } Bug: 298000577 Change-Id: I865dbc14768fb9be3e557261aab05b1dc3dc5839 --- .../backuplib/java/com/android/server/backup/TransportManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java index 930f49e4d117..ff5f509fb11b 100644 --- a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java +++ b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java @@ -706,6 +706,9 @@ public class TransportManager { try { String transportName = transport.name(); String transportDirName = transport.transportDirName(); + if (transportName == null || transportDirName == null) { + return BackupManager.ERROR_TRANSPORT_INVALID; + } registerTransport(transportComponent, transport); // If registerTransport() hasn't thrown... Slog.d(TAG, "Transport " + transportString + " registered"); -- cgit v1.2.3-59-g8ed1b