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

Commit f4d892a7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-160c4b31-7fa0-4e2b-aabe-85380836a1ce-for-git_oc-release-412908... 

release-request-160c4b31-7fa0-4e2b-aabe-85380836a1ce-for-git_oc-release-4129081 snap-temp-L15300000077039010

Change-Id: I05e4fccc38c7affdb48f30007762aaf20adea04d
parents 00736137 3799fb50

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


        <!--  Preserve original launcher activity from Nougat. -->

        <activity-alias

            android:name=".Launcher"

            android:name=".LauncherActivity"

            android:targetActivity=".files.LauncherActivity"

            android:label="@string/launcher_label"

            android:icon="@drawable/launcher_icon" >

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.