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

Commit 4371a49c authored by Garfield Tan's avatar Garfield Tan Committed by android-build-merger
Browse files

Merge "Don't tear down notification channels." into oc-dev 

am: 3799fb50

Change-Id: I19fa5a538e634b195aa96975b63c5a5044f92082
parents f411a2c7 3799fb50

src/com/android/documentsui/services/FileOperationService.java

+0 −8
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ public class FileOperationService extends Service implements Job.Listener { 
            Log.w(TAG, "Shutting down, but executor reports running jobs: " + unfinished);

        }



        tearDownNotificationChannel();



        executor = null;

        deletionExecutor = null;

        handler = null;
@@ -189,12 +187,6 @@ public class FileOperationService extends Service implements Job.Listener { 
        if (DEBUG) Log.d(TAG, "Destroyed.");

    }



    private void tearDownNotificationChannel() {

        if (features.isNotificationChannelEnabled()) {

            notificationManager.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);

        }

    }



    @Override

    public int onStartCommand(Intent intent, int flags, int serviceId) {

        // TODO: Ensure we're not being called with retry or redeliver.