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

Unverified Commit 92835458 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r67' into staging/lineage-20.0_merge-android-13.0.0_r67 

Android 13.0.0 Release 67 (TQ3A.230805.001)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZNFRNgAKCRDorT+BmrEO
# eOq4AJ9PNjJhjB7dbB+950mx/+4gGuYxFgCeLbEeRfbsGhRtKGOWHf5qNmaoWvw=
# =Qy8/
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Aug  7 23:16:54 2023 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1805 signatures in the past
#      21 months.  Encrypted 4 messages in the past 19 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Ioana Alexandru (5) and others
# Via Android Build Coastguard Worker
* tag 'android-13.0.0_r67':
  Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b301
  Remove unnecessary padding code
  Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used
  DO NOT MERGE Verify URI permissions in MediaMetadata
  Visit URIs in themed remoteviews icons.
  Check URIs in sized remote views.
  Fix PrivacyChip not visible issue
  Update Pip launches to not enter pinned task if in background.
  Validate ComponentName for MediaButtonBroadcastReceiver
  Implement visitUris for RemoteViews ViewGroupActionAdd.
  Check URIs in notification public version.
  Preserve flags for non-runtime permissions upon package update.
  On device lockdown, always show the keyguard
  Ensure policy has no absurdly long strings
  Verify URI permissions for notification shortcutIcon.
  Do not load drawable for wallet card if the card image icon iscreated with content URI.
  ActivityManagerService: Allow openContentUri from vendor/system/product.

Change-Id: Ia8401a601c1e63d833b0900f623d748b3a793020
parents 2cf6a5a9 7c8d5d55

core/java/android/app/Notification.java

+6 −0
Original line number Diff line number Diff line
@@ -2807,6 +2807,10 @@ public class Notification implements Parcelable 
     * @hide

     */

    public void visitUris(@NonNull Consumer<Uri> visitor) {

        if (publicVersion != null) {

            publicVersion.visitUris(visitor);

        }















        visitor.accept(sound);





























        if (tickerView != null) tickerView.visitUris(visitor);










@@ -2892,6 +2896,8 @@ public class Notification implements Parcelable













                    }















                }















            }

























            visitIconUri(visitor, extras.getParcelable(EXTRA_CONVERSATION_ICON));















        }





























        if (isStyle(CallStyle.class) & extras != null) {

































core/java/android/app/admin/DevicePolicyManager.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -12402,7 +12402,8 @@ public class DevicePolicyManager {



























    /**















     * Called by a device admin to set the long support message. This will be displayed to the user













     * in the device administators settings screen.













     * in the device administrators settings screen. If the message is longer than 20000 characters













     * it may be truncated.















     * <p>















     * If the long support message needs to be localized, it is the responsibility of the















     * {@link DeviceAdminReceiver} to listen to the {@link Intent#ACTION_LOCALE_CHANGED} broadcast

























core/java/android/widget/RemoteViews.java



+19
−1




























Original line number
Diff line number
Diff line








@@ -726,6 +726,11 @@ public class RemoteViews implements Parcelable, Filter {













                mActions.get(i).visitUris(visitor);















            }















        }













        if (mSizedRemoteViews != null) {













            for (int i = 0; i < mSizedRemoteViews.size(); i++) {













                mSizedRemoteViews.get(i).visitUris(visitor);













            }













        }















        if (mLandscape != null) {















            mLandscape.visitUris(visitor);















        }










@@ -1830,7 +1835,7 @@ public class RemoteViews implements Parcelable, Filter {













        }































        @Override













        public final void visitUris(@NonNull Consumer<Uri> visitor) {













        public void visitUris(@NonNull Consumer<Uri> visitor) {















            switch (this.type) {















                case URI:















                    final Uri uri = (Uri) getParameterValue(null);










@@ -2293,6 +2298,14 @@ public class RemoteViews implements Parcelable, Filter {













        public int getActionTag() {















            return NIGHT_MODE_REFLECTION_ACTION_TAG;















        }



























        @Override













        public void visitUris(@NonNull Consumer<Uri> visitor) {













            if (this.type == ICON) {













                visitIconUri((Icon) mDarkValue, visitor);













                visitIconUri((Icon) mLightValue, visitor);













            }













        }















    }































    /**










@@ -2583,6 +2596,11 @@ public class RemoteViews implements Parcelable, Filter {













        public int getActionTag() {















            return VIEW_GROUP_ACTION_ADD_TAG;















        }



























        @Override













        public final void visitUris(@NonNull Consumer<Uri> visitor) {













            mNestedViews.visitUris(visitor);













        }















    }































    /**

































core/res/res/values/config.xml



+0
−3




























Original line number
Diff line number
Diff line








@@ -572,9 +572,6 @@













         docked if the dock is configured to enable the accelerometer. -->















    <bool name="config_supportAutoRotation">true</bool>





























    <!-- If true, allows rotation resolver service to help resolve screen rotation. -->













    <bool name="config_allowRotationResolver">true</bool>





























    <!-- If true, the screen can be rotated via the accelerometer in all 4















         rotations as the default behavior. -->















    <bool name="config_allowAllRotations">false</bool>

































core/res/res/values/symbols.xml



+0
−1




























Original line number
Diff line number
Diff line








@@ -1755,7 +1755,6 @@













  <java-symbol type="bool" name="config_perDisplayFocusEnabled" />















  <java-symbol type="bool" name="config_showNavigationBar" />















  <java-symbol type="bool" name="config_supportAutoRotation" />













  <java-symbol type="bool" name="config_allowRotationResolver" />















  <java-symbol type="bool" name="config_dockedStackDividerFreeSnapMode" />















  <java-symbol type="dimen" name="docked_stack_divider_thickness" />















  <java-symbol type="dimen" name="docked_stack_divider_insets" />