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

Unverified Commit 35e8db7c authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-11.0.0_r62' of... 

Merge tag 'android-security-11.0.0_r62' of https://android.googlesource.com/platform/frameworks/base into staging/lineage-18.1_merge_android-security-11.0.0_r62

Android Security 11.0.0 Release 62 (9269287)

* tag 'android-security-11.0.0_r62' of https://android.googlesource.com/platform/frameworks/base:
  [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"
  [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"
  Validate package name passed to setApplicationRestrictions.
  Add safety checks on KEY_INTENT mismatch.
  [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting
  [Do Not Merge] Ignore malformed shortcuts
  [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing
  [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied
  Fix a security issue in app widget service.
  Fix NPE
  [pm] forbid deletion of protected packages
  Include all enabled services when FEEDBACK_ALL_MASK.
  Prevent non-admin users from deleting system apps.
  Limit the size of NotificationChannel and NotificationChannelGroup
  Revert "Prevent non-admin users from deleting system apps."
  Drop input for toast and child surfaces
  SurfaceControl: Add setDropInputMode api
  DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y"
  Add mechanism for a task's windows to be trusted overlays
  Change InputWindowInfo::isTrustedOverlay() to be permission and flag based

Conflicts:
	core/java/android/view/WindowManager.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowController.java

Change-Id: Iaf5f611012175df784718939776975e3c78d7180
parents 78585e8e 28243a5f

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ filegroup { 
        ":framework_native_aidl",

        ":gatekeeper_aidl",

        ":gsiservice_aidl",

        ":guiconstants_aidl",

        ":incidentcompanion_aidl",

        ":installd_aidl",

        ":keystore_aidl",

core/java/android/app/NotificationChannel.java

+16 −7
Original line number Diff line number Diff line
@@ -78,8 +78,13 @@ public final class NotificationChannel implements Parcelable { 
    /**

     * The maximum length for text fields in a NotificationChannel. Fields will be truncated at this

     * limit.

     * @hide

     */

    private static final int MAX_TEXT_LENGTH = 1000;

    public static final int MAX_TEXT_LENGTH = 1000;

    /**

     * @hide

     */

    public static final int MAX_VIBRATION_LENGTH = 1000;



    private static final String TAG_CHANNEL = "channel";

    private static final String ATT_NAME = "name";
@@ -236,17 +241,17 @@ public final class NotificationChannel implements Parcelable { 
     */

    protected NotificationChannel(Parcel in) {

        if (in.readByte() != 0) {

            mId = in.readString();

            mId = getTrimmedString(in.readString());

        } else {

            mId = null;

        }

        if (in.readByte() != 0) {

            mName = in.readString();

            mName = getTrimmedString(in.readString());

        } else {

            mName = null;

        }

        if (in.readByte() != 0) {

            mDesc = in.readString();

            mDesc = getTrimmedString(in.readString());

        } else {

            mDesc = null;

        }
@@ -255,18 +260,22 @@ public final class NotificationChannel implements Parcelable { 
        mLockscreenVisibility = in.readInt();

        if (in.readByte() != 0) {

            mSound = Uri.CREATOR.createFromParcel(in);

            mSound = Uri.parse(getTrimmedString(mSound.toString()));

        } else {

            mSound = null;

        }

        mLights = in.readByte() != 0;

        mVibration = in.createLongArray();

        if (mVibration != null && mVibration.length > MAX_VIBRATION_LENGTH) {

            mVibration = Arrays.copyOf(mVibration, MAX_VIBRATION_LENGTH);

        }

        mUserLockedFields = in.readInt();

        mFgServiceShown = in.readByte() != 0;

        mVibrationEnabled = in.readByte() != 0;

        mShowBadge = in.readByte() != 0;

        mDeleted = in.readByte() != 0;

        if (in.readByte() != 0) {

            mGroup = in.readString();

            mGroup = getTrimmedString(in.readString());

        } else {

            mGroup = null;

        }
@@ -276,8 +285,8 @@ public final class NotificationChannel implements Parcelable { 
        mAllowBubbles = in.readInt();

        mImportanceLockedByOEM = in.readBoolean();

        mOriginalImportance = in.readInt();

        mParentId = in.readString();

        mConversationId = in.readString();

        mParentId = getTrimmedString(in.readString());

        mConversationId = getTrimmedString(in.readString());

        mDemoted = in.readBoolean();

        mImportantConvo = in.readBoolean();

    }

core/java/android/app/NotificationChannelGroup.java

+15 −5
Original line number Diff line number Diff line
@@ -42,8 +42,9 @@ public final class NotificationChannelGroup implements Parcelable { 
    /**

     * The maximum length for text fields in a NotificationChannelGroup. Fields will be truncated at

     * this limit.

     * @hide

     */

    private static final int MAX_TEXT_LENGTH = 1000;

    public static final int MAX_TEXT_LENGTH = 1000;



    private static final String TAG_GROUP = "channelGroup";

    private static final String ATT_NAME = "name";
@@ -89,13 +90,17 @@ public final class NotificationChannelGroup implements Parcelable { 
     */

    protected NotificationChannelGroup(Parcel in) {

        if (in.readByte() != 0) {

            mId = in.readString();

            mId = getTrimmedString(in.readString());

        } else {

            mId = null;

        }

        mName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);

        if (in.readByte() != 0) {

            mDescription = in.readString();

            mName = getTrimmedString(in.readString());

        } else {

            mName = "";

        }

        if (in.readByte() != 0) {

            mDescription = getTrimmedString(in.readString());

        } else {

            mDescription = null;

        }
@@ -119,7 +124,12 @@ public final class NotificationChannelGroup implements Parcelable { 
        } else {

            dest.writeByte((byte) 0);

        }

        TextUtils.writeToParcel(mName, dest, flags);

        if (mName != null) {

            dest.writeByte((byte) 1);

            dest.writeString(mName.toString());

        } else {

            dest.writeByte((byte) 0);

        }

        if (mDescription != null) {

            dest.writeByte((byte) 1);

            dest.writeString(mDescription);

core/java/android/appwidget/AppWidgetManager.java

+3 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,9 @@ public class AppWidgetManager { 
     * @param intent        The intent of the service which will be providing the data to the

     *                      RemoteViewsAdapter.

     * @param connection    The callback interface to be notified when a connection is made or lost.

     * @param flags         Flags used for binding to the service

     * @param flags         Flags used for binding to the service. Currently only

     *                     {@link Context#BIND_AUTO_CREATE} and

     *                     {@link Context#BIND_FOREGROUND_SERVICE_WHILE_AWAKE} are supported.

     *

     * @see Context#getServiceDispatcher(ServiceConnection, Handler, int)

     * @hide

core/java/android/view/IWindowSession.aidl

+3 −2
Original line number Diff line number Diff line
@@ -336,11 +336,12 @@ interface IWindowSession { 
    * an input channel where the client can receive input.

    */

    void grantInputChannel(int displayId, in SurfaceControl surface, in IWindow window,

            in IBinder hostInputToken, int flags, int type, out InputChannel outInputChannel);

            in IBinder hostInputToken, int flags, int privateFlags, int type,

            out InputChannel outInputChannel);



    /**

     * Update the flags on an input channel associated with a particular surface.

     */

    void updateInputChannel(in IBinder channelToken, int displayId, in SurfaceControl surface,

            int flags, in Region region);

            int flags, int privateFlags, in Region region);

}