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

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

Snap for 7101549 from 22790619 to sc-v2-release 

Change-Id: I836534047eea5143c17decb216b06fc98569c486
parents ba2f3c15 22790619

res/values-te/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
    <string name="root_type_service" msgid="6521366147466512289">"నిల్వ పరికరాలు"</string>

    <string name="root_type_shortcut" msgid="6059343175525442279">"సత్వరమార్గాలు"</string>

    <string name="root_type_device" msgid="1713604128005476585">"పరికరాలు"</string>

    <string name="root_type_apps" msgid="8646073235029886342">"మరిన్ని అనువర్తనాలు"</string>

    <string name="root_type_apps" msgid="8646073235029886342">"మరిన్ని యాప్‌లు"</string>

    <string name="empty" msgid="5300254272613103004">"అంశాలు లేవు"</string>

    <string name="no_results" msgid="2371026325236359209">"%1$sలో సరిపోలినవి లేవు"</string>

    <string name="toast_no_application" msgid="7555319548595113121">"ఫైల్‌ను తెరవడం సాధ్యపడదు"</string>

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

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ class CopyJob extends ResolvedResourcesJob { 
                .setContentText(service.getString(

                        R.string.notification_touch_for_details))

                .setContentIntent(PendingIntent.getActivity(appContext, 0, navigateIntent,

                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT))

                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT

                                | PendingIntent.FLAG_IMMUTABLE))

                .setCategory(Notification.CATEGORY_ERROR)

                .setSmallIcon(R.drawable.ic_menu_copy)

                .setAutoCancel(true);

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

+6 −3
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ abstract public class Job implements Runnable { 
                        failureCount, failureCount))

                .setContentText(service.getString(R.string.notification_touch_for_details))

                .setContentIntent(PendingIntent.getActivity(appContext, 0, navigateIntent,

                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT))

                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT

                        | PendingIntent.FLAG_MUTABLE))

                .setCategory(Notification.CATEGORY_ERROR)

                .setSmallIcon(icon)

                .setAutoCancel(true);
@@ -327,7 +328,8 @@ abstract public class Job implements Runnable { 
                .setContentTitle(title)

                .setContentIntent(

                        PendingIntent.getActivity(appContext, 0,

                                buildNavigateIntent(INTENT_TAG_PROGRESS), 0))

                                buildNavigateIntent(INTENT_TAG_PROGRESS),

                                PendingIntent.FLAG_IMMUTABLE))

                .setCategory(Notification.CATEGORY_PROGRESS)

                .setSmallIcon(icon)

                .setOngoing(true);
@@ -341,7 +343,8 @@ abstract public class Job implements Runnable { 
                        service,

                        0,

                        cancelIntent,

                        PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_CANCEL_CURRENT));

                        PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_CANCEL_CURRENT

                        | PendingIntent.FLAG_MUTABLE));



        return progressBuilder;

    }

tests/common/com/android/documentsui/DemoProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ public class DemoProvider extends TestRootProvider { 
            case DIR_AUTH:

                Intent intent = new Intent("com.android.documentsui.test.action.AUTHENTICATE");

                PendingIntent pIntent = PendingIntent.getActivity(getContext(),

                        AbstractActionHandler.CODE_AUTHENTICATION, intent, 0);

                        AbstractActionHandler.CODE_AUTHENTICATION, intent,

                        PendingIntent.FLAG_IMMUTABLE);

                throw new AuthenticationRequiredException(new UnsupportedOperationException(),

                        pIntent);

tests/unit/com/android/documentsui/files/ActionHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ public class ActionHandlerTest { 
    public void testAuthentication() throws Exception {

        PendingIntent intent = PendingIntent.getActivity(

                InstrumentationRegistry.getInstrumentation().getTargetContext(), 0, new Intent(),

                0);

                PendingIntent.FLAG_IMMUTABLE);



        mHandler.startAuthentication(intent);

        assertEquals(intent.getIntentSender(), mActivity.startIntentSender.getLastValue().first);