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

Commit 7d7f2f80 authored by prateek rawal's avatar prateek rawal Committed by Sarp Misoglu
Browse files

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
parent c6ee0d1f

services/backup/backuplib/java/com/android/server/backup/TransportManager.java

+3 −0
Original line number Diff line number Diff line
@@ -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");