release-request-c5216b17-dc50-4b24-831c-dc696ed657cc-for-git_oc-dr1-release-41... (89278879) · Commits · e / os / android_packages_apps_DocumentsUI

AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,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" >

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		<resources xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="files_label" msgid="771781190045103748">"Файлы"</string>
		<string name="downloads_label" msgid="5462789470049501103">"Сохраненные файлы"</string>
		<string name="downloads_label" msgid="5462789470049501103">"Загрузки"</string>
		<!-- no translation found for app_label (8089292432455111409) -->
		<skip />
		<!-- no translation found for launcher_label (799410258349837668) -->

+0 −8

Original line number	Diff line number	Diff line
		@@ -189,8 +189,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;
		@@ -198,12 +196,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.