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

Unverified Commit 0c885311 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-10.0.0_r61' into staging/lineage-17.1_merge-android-security-10.0.0_r61 

Android security 10.0.0 release 61

* tag 'android-security-10.0.0_r61':
  Disallow overlays for ResolverActivity
  Do not show the notification footer until the user is set up.
  Fix NPE on getTitle()
  Fix serialization bug in GpsNavigationMessage
  Import translations. DO NOT MERGE ANYWHERE

Change-Id: Ica1589e9f3d6cf0862268b6f1b1bbda32d68894d
parents 10e300d4 71f97682

core/java/com/android/internal/app/ResolverActivity.java

+16 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.app;



import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.annotation.Nullable;

import android.annotation.StringRes;
@@ -68,7 +69,9 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup.LayoutParams;

import android.view.Window;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.widget.AbsListView;

import android.widget.AdapterView;

import android.widget.BaseAdapter;
@@ -789,9 +792,22 @@ public class ResolverActivity extends Activity { 
        bindProfileView();

    }



    @Override

    protected void onStart() {

        super.onStart();



        this.getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

    }



    @Override

    protected void onStop() {

        super.onStop();



        final Window window = this.getWindow();

        final WindowManager.LayoutParams attrs = window.getAttributes();

        attrs.privateFlags &= ~SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

        window.setAttributes(attrs);



        if (mRegistered) {

            mPackageMonitor.unregister();

            mRegistered = false;

core/res/res/values-af/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -2050,4 +2050,5 @@ 
    </plurals>

    <string name="chooser_no_direct_share_targets" msgid="492542066060841139">"Regstreekse deling is nie beskikbaar nie"</string>

    <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"Programmelys"</string>

    <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"Toestemming versoek deur <xliff:g id="APP">%1$s</xliff:g>\nvir rekening <xliff:g id="ACCOUNT">%2$s</xliff:g>"</string>

</resources>

core/res/res/values-am/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -2050,4 +2050,5 @@ 
    </plurals>

    <string name="chooser_no_direct_share_targets" msgid="492542066060841139">"ቀጥታ ማጋራት አይገኝም"</string>

    <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"የመተግበሪያዎች ዝርዝር"</string>

    <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"ለመለያ <xliff:g id="ACCOUNT">%2$s</xliff:g>\nበ<xliff:g id="APP">%1$s</xliff:g> የተጠየቀ ፈቃድ።"</string>

</resources>

core/res/res/values-ar/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -2194,4 +2194,5 @@ 
    </plurals>

    <string name="chooser_no_direct_share_targets" msgid="492542066060841139">"لا تتوفّر إمكانية المشاركة المباشرة."</string>

    <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"قائمة التطبيقات"</string>

    <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"طلب تطبيق <xliff:g id="APP">%1$s</xliff:g> الإذن بالدخول\nإلى حساب <xliff:g id="ACCOUNT">%2$s</xliff:g>."</string>

</resources>

core/res/res/values-as/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -2050,4 +2050,5 @@ 
    </plurals>

    <string name="chooser_no_direct_share_targets" msgid="492542066060841139">"পোনপটীয়া শ্বেয়াৰৰ সুবিধা নাই"</string>

    <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"এপ্‌সমূহৰ সূচী"</string>

    <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"<xliff:g id="APP">%1$s</xliff:g>এ <xliff:g id="ACCOUNT">%2$s</xliff:g> একাউণ্টটো এক্সেছৰ \nঅনুমতি বিচাৰি অনুৰোধ জনাইছে।"</string>

</resources>