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

Commit bcb10a22 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12428866 from f4ee32c0 to 25Q2-release 

Change-Id: I29930f521028fdc2f0e54aa9ec3c1b9e0e2a78a7
parents ff7704a2 f4ee32c0

res/values-fa/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    <string name="title_save" msgid="4384490653102710025">"ذخیره در"</string>

    <string name="menu_create_dir" msgid="2413624798689091042">"پوشهٔ جدید"</string>

    <string name="menu_grid" msgid="1453636521731880680">"نمای جدولی"</string>

    <string name="menu_list" msgid="6714267452146410402">"نمای فهرست"</string>

    <string name="menu_list" msgid="6714267452146410402">"نمای فهرستی"</string>

    <string name="menu_search" msgid="1876699106790719849">"جستجو"</string>

    <string name="menu_settings" msgid="6520844520117939047">"تنظیمات فضای ذخیره‌سازی"</string>

    <string name="menu_open" msgid="9092138100049759315">"باز"</string>

res/values-sv/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
    <string name="query_error" msgid="6625421453613879336">"Det går inte att läsa in innehållet just nu"</string>

    <string name="quiet_mode_error_title" msgid="554319751414657910">"Jobbappar har pausats"</string>

    <string name="quiet_mode_button" msgid="8051436551926677305">"Aktivera jobbappar"</string>

    <string name="profile_quiet_mode_error_title" msgid="7126962749634841843">"<xliff:g id="PROFILE">%1$s</xliff:g>appar har pausats"</string>

    <string name="profile_quiet_mode_error_title" msgid="7126962749634841843">"Appar för profilen <xliff:g id="PROFILE">%1$s</xliff:g> har pausats"</string>

    <string name="profile_quiet_mode_button" msgid="6791235010992920102">"Slå på <xliff:g id="PROFILE">%1$s</xliff:g>appar"</string>

    <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Det går inte att välja jobbfiler"</string>

    <string name="cant_select_work_files_error_message" msgid="683480676150690641">"IT-administratören tillåter inte att du öppnar jobbfiler i en privat app"</string>

src/com/android/documentsui/roots/ProvidersCache.java

+4 −4
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import com.android.modules.utils.build.SdkLevel; 


import com.google.common.collect.ArrayListMultimap;

import com.google.common.collect.Multimap;

import com.google.common.util.concurrent.MoreExecutors;



import java.util.ArrayList;

import java.util.Collection;
@@ -76,7 +75,6 @@ import java.util.concurrent.CountDownLatch; 
import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.concurrent.Semaphore;

import java.util.concurrent.ThreadPoolExecutor;

import java.util.concurrent.TimeUnit;

import java.util.function.Function;
@@ -95,6 +93,9 @@ public class ProvidersCache implements ProvidersAccess, LookupApplicationName { 
            // ArchivesProvider doesn't support any roots.

            ArchivesProvider.AUTHORITY);

    private static final int FIRST_LOAD_TIMEOUT_MS = 5000;

    private static final int NUM_THREADS = 10;

    private static final ExecutorService ASYNC_TASKS_THREAD_POOL =

            Executors.newFixedThreadPool(NUM_THREADS);



    private final Context mContext;
@@ -562,8 +563,7 @@ public class ProvidersCache implements ProvidersAccess, LookupApplicationName { 


            if (!taskInfos.isEmpty()) {

                CountDownLatch updateTaskInternalCountDown = new CountDownLatch(taskInfos.size());

                ExecutorService executor = MoreExecutors.getExitingExecutorService(

                        (ThreadPoolExecutor) Executors.newCachedThreadPool());

                ExecutorService executor = ASYNC_TASKS_THREAD_POOL;

                for (SingleProviderUpdateTaskInfo taskInfo : taskInfos) {

                    executor.submit(() ->

                            startSingleProviderUpdateTask(