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

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

Snap for 5746716 from 1051afbb to qt-c2f2-release 

Change-Id: I2bc9fcfee2d364e52cd165baecd8d3743a746e3d
parents efaedcc2 1051afbb

core/java/android/widget/RelativeLayout.java

+4 −4
Original line number Diff line number Diff line
@@ -1202,13 +1202,13 @@ public class RelativeLayout extends ViewGroup { 
     * determine where to position the view on the screen.  If the view is not contained

     * within a relative layout, these attributes are ignored.

     *

     * See the <a href="/guide/topics/ui/layout/relative.html">

     * Relative Layout</a> guide for example code demonstrating how to use relative layout’s

     * See the <a href="{@docRoot}guide/topics/ui/layout/relative.html">Relative

     * Layout</a> guide for example code demonstrating how to use relative layout's

     * layout parameters in a layout XML.

     *

     * To learn more about layout parameters and how they differ from typical view attributes,

     * see the <a href="/guide/topics/ui/declaring-layout.html#attributes">

     *     Layouts guide</a>.

     * see the <a href="{@docRoot}guide/topics/ui/declaring-layout.html#attributes">Layouts

     * guide</a>.

     *

     *

     * @attr ref android.R.styleable#RelativeLayout_Layout_layout_alignWithParentIfMissing

core/java/android/widget/TabWidget.java

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { 
     * to the next tabbed view, in this example).

     * <p>

     * To move both the focus AND the selected tab at once, please use

     * {@link #setCurrentTab}. Normally, the view logic takes care of

     * {@link #focusCurrentTab}. Normally, the view logic takes care of

     * adjusting the focus, so unless you're circumventing the UI,

     * you'll probably just focus your interest here.

     *

core/res/AndroidManifest.xml

+29 −17
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ 
      meaning that the whitelist state can be specified only at install time and

      cannot change until the app is installed. For more details see

      {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

     -->

     <p>Protection level: dangerous -->

    <permission android:name="android.permission.READ_EXTERNAL_STORAGE"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_sdcardRead"
@@ -880,8 +880,9 @@ 
         read/write files in your application-specific directories returned by

         {@link android.content.Context#getExternalFilesDir} and

         {@link android.content.Context#getExternalCacheDir}.

         <p>Is this permission is not whitelisted for an app that targets an API level before

         <p>If this permission is not whitelisted for an app that targets an API level before

         {@link android.os.Build.VERSION_CODES#Q} this permission cannot be granted to apps.</p>

         <p>Protection level: dangerous</p>

    -->

    <permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"

        android:permissionGroup="android.permission-group.UNDEFINED"
@@ -891,7 +892,8 @@ 
        android:protectionLevel="dangerous" />



    <!-- Allows an application to access any geographic locations persisted in the

         user's shared collection. -->

         user's shared collection.

         <p>Protection level: dangerous -->

    <permission android:name="android.permission.ACCESS_MEDIA_LOCATION"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_mediaLocation"
@@ -1711,7 +1713,7 @@ 


    <!-- Allows applications to pair bluetooth devices without user interaction, and to

         allow or disallow phonebook access or message access.

         This is not available to third party applications. -->

         <p>Not for use by third-party applications. -->

    <permission android:name="android.permission.BLUETOOTH_PRIVILEGED"

        android:protectionLevel="signature|privileged" />
@@ -2561,7 +2563,8 @@ 
        android:protectionLevel="signature" />



    <!-- Allows an application to modify the current configuration, such

         as locale. -->

         as locale.

         <p>Protection level: signature|privileged|development -->

    <permission android:name="android.permission.CHANGE_CONFIGURATION"

        android:protectionLevel="signature|privileged|development" />
@@ -2860,7 +2863,8 @@ 
    <!-- ==================================== -->

    <eat-comment />



    <!-- Allows access to the list of accounts in the Accounts Service. -->

    <!-- Allows access to the list of accounts in the Accounts Service.

         <p>Protection level: signature|privileged -->

    <permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED"

        android:protectionLevel="signature|privileged" />
@@ -3439,7 +3443,8 @@ 
        android:protectionLevel="signature" />



    <!-- Old permission for deleting an app's cache files, no longer used,

         but signals for us to quietly ignore calls instead of throwing an exception. -->

         but signals for us to quietly ignore calls instead of throwing an exception.

         <p>Protection level: signature|privileged -->

    <permission android:name="android.permission.DELETE_CACHE_FILES"

        android:protectionLevel="signature|privileged" />
@@ -3797,7 +3802,8 @@ 
    <!-- Allows an application to collect component usage

         statistics

         <p>Declaring the permission implies intention to use the API and the user of the

         device can grant permission through the Settings application. -->

         device can grant permission through the Settings application.

         <p>Protection level: signature|privileged|development|appop -->

    <permission android:name="android.permission.PACKAGE_USAGE_STATS"

        android:protectionLevel="signature|privileged|development|appop" />

    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
@@ -3820,14 +3826,14 @@ 


    <!-- Permission an application must hold in order to use

         {@link android.provider.Settings#ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS}.

         This is a normal permission: an app requesting it will always be granted the

         permission, without the user needing to approve or see it. -->

         <p>Protection level: normal -->

    <permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"

        android:label="@string/permlab_requestIgnoreBatteryOptimizations"

        android:description="@string/permdesc_requestIgnoreBatteryOptimizations"

        android:protectionLevel="normal" />



    <!-- Allows an application to collect battery statistics -->

    <!-- Allows an application to collect battery statistics

         <p>Protection level: signature|privileged|development -->

    <permission android:name="android.permission.BATTERY_STATS"

        android:protectionLevel="signature|privileged|development" />
@@ -3857,7 +3863,8 @@ 
        android:protectionLevel="signature" />



    <!-- Must be required by a {@link android.widget.RemoteViewsService},

         to ensure that only the system can bind to it. -->

         to ensure that only the system can bind to it.

         <p>Protection level: signature|privileged -->

    <permission android:name="android.permission.BIND_REMOTEVIEWS"

        android:protectionLevel="signature|privileged" />
@@ -3899,7 +3906,8 @@ 
         to the path in the provider where global search queries are

         performed.  This permission can not be held by regular applications;

         it is used by applications to protect themselves from everyone else

         besides global search. -->

         besides global search.

         <p>Protection level: signature|privileged -->

    <permission android:name="android.permission.GLOBAL_SEARCH"

        android:protectionLevel="signature|privileged" />
@@ -4438,7 +4446,8 @@ 
    <permission android:name="android.permission.MODIFY_THEME_OVERLAY"

                android:protectionLevel="signature" />



    <!-- Allows an instant app to create foreground services. -->

    <!-- Allows an instant app to create foreground services.

         <p>Protection level: signature|development|instant|appop -->

    <permission android:name="android.permission.INSTANT_APP_FOREGROUND_SERVICE"

        android:protectionLevel="signature|development|instant|appop" />
@@ -4508,7 +4517,8 @@ 
    <permission android:name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE"

        android:protectionLevel="signature|privileged" />



    <!-- A subclass of {@link android.service.carrier.CarrierMessagingClientService} must be protected with this permission. -->

    <!-- A subclass of {@link android.service.carrier.CarrierMessagingClientService} must be protected with this permission.

           <p>Protection level: signature -->

    <permission android:name="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE"

        android:protectionLevel="signature" />
@@ -4540,13 +4550,15 @@ 
    <permission android:name="android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS"

        android:protectionLevel="signature" />



    <!-- Allows financial apps to read filtered sms messages. -->

    <!-- Allows financial apps to read filtered sms messages.

         Protection level: signature|appop  -->

    <permission android:name="android.permission.SMS_FINANCIAL_TRANSACTIONS"

        android:protectionLevel="signature|appop" />



    <!-- Required for apps targeting {@link android.os.Build.VERSION_CODES#Q} that want to use

         {@link android.app.Notification.Builder#setFullScreenIntent notification full screen

         intents}.  -->

         intents}.

         <p>Protection level: normal -->

    <permission android:name="android.permission.USE_FULL_SCREEN_INTENT"

                android:protectionLevel="normal" />

core/res/res/values-zh-rCN/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ 
    <string name="permgrouplab_microphone" msgid="171539900250043464">"麦克风"</string>

    <string name="permgroupdesc_microphone" msgid="4988812113943554584">"录制音频"</string>

    <string name="permgrouprequest_microphone" msgid="9167492350681916038">"允许&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;录音吗？"</string>

    <string name="permgrouplab_activityRecognition" msgid="1565108047054378642">"健身运动"</string>

    <string name="permgrouplab_activityRecognition" msgid="1565108047054378642">"身体活动"</string>

    <string name="permgroupdesc_activityRecognition" msgid="6949472038320473478">"访问您的健身运动"</string>

    <string name="permgrouprequest_activityRecognition" msgid="7626438016904799383">"允许&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;访问您的健身运动吗？"</string>

    <string name="permgrouplab_camera" msgid="4820372495894586615">"相机"</string>

libs/hwui/renderthread/CanvasContext.cpp

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ void CanvasContext::setSurface(sp<Surface>&& surface) { 


    if (surface) {

        mNativeSurface = new ReliableSurface{std::move(surface)};

        mNativeSurface->setDequeueTimeout(500_ms);

        // TODO: Fix error handling & re-shorten timeout

        mNativeSurface->setDequeueTimeout(4000_ms);

    } else {

        mNativeSurface = nullptr;

    }