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

Commit 71bf5b07 authored by Bill Yi's avatar Bill Yi
Browse files

Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE 

Merged-In: I0fd447ddbf810090e19305b2dc8278acd6e0887d
I0fd447ddbf810090e19305b2dc8278acd6e0887d
Merged-In: I25634442304214598c077ed2a6fb9b5fb6813445
I25634442304214598c077ed2a6fb9b5fb6813445
Merged-In: Icdfafd0b64289c2ca759a6a72d05a710393a262d
Icdfafd0b64289c2ca759a6a72d05a710393a262d

Change-Id: Iac3e0c81480afff251a503ba82e5a46a590969e2
parents 997af74d 3169dfcf

core/java/android/app/ActivityOptions.java

+5 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIO 
import static android.Manifest.permission.START_TASKS_FROM_RECENTS;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;

import static android.view.Display.INVALID_DISPLAY;

import static android.window.DisplayAreaOrganizer.FEATURE_UNDEFINED;
@@ -1756,7 +1758,9 @@ public class ActivityOptions extends ComponentOptions { 
     * @hide

     */

    public int getPendingIntentLaunchFlags() {

        return mPendingIntentLaunchFlags;

        // b/243794108: Ignore all flags except the new task flag, to be reconsidered in b/254490217

        return mPendingIntentLaunchFlags &

                (FLAG_ACTIVITY_NEW_TASK | FLAG_RECEIVER_FOREGROUND);

    }



    /**

core/java/android/app/Notification.java

+19 −0
Original line number Diff line number Diff line
@@ -2857,6 +2857,17 @@ public class Notification implements Parcelable 
            if (person != null) {

                visitor.accept(person.getIconUri());

            }













            final RemoteInputHistoryItem[] history = (RemoteInputHistoryItem[])













                    extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS);













            if (history != null) {













                for (int i = 0; i < history.length; i++) {













                    RemoteInputHistoryItem item = history[i];













                    if (item.getUri() != null) {













                        visitor.accept(item.getUri());













                    }













                }













            }















        }





























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










@@ -2887,6 +2898,14 @@ public class Notification implements Parcelable













            }















        }



























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













            Person callPerson = extras.getParcelable(EXTRA_CALL_PERSON);













            if (callPerson != null) {













                visitor.accept(callPerson.getIconUri());













            }













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













        }



























        if (mBubbleMetadata != null) {















            visitIconUri(visitor, mBubbleMetadata.getIcon());















        }

































core/java/android/content/pm/ShortcutInfo.java



+17
−3




























Original line number
Diff line number
Diff line








@@ -285,6 +285,12 @@ public final class ShortcutInfo implements Parcelable {













     */















    public static final int DISABLED_REASON_OTHER_RESTORE_ISSUE = 103;





























    /**













     * The maximum length of Shortcut ID. IDs will be truncated at this limit.













     * @hide













     */













    public static final int MAX_ID_LENGTH = 1000;





























    /** @hide */















    @IntDef(prefix = { "DISABLED_REASON_" }, value = {















            DISABLED_REASON_NOT_DISABLED,










@@ -477,8 +483,7 @@ public final class ShortcutInfo implements Parcelable {





























    private ShortcutInfo(Builder b) {















        mUserId = b.mContext.getUserId();



























        mId = Preconditions.checkStringNotEmpty(b.mId, "Shortcut ID must be provided");













        mId = getSafeId(Preconditions.checkStringNotEmpty(b.mId, "Shortcut ID must be provided"));































        // Note we can't do other null checks here because SM.updateShortcuts() takes partial















        // information.










@@ -584,6 +589,14 @@ public final class ShortcutInfo implements Parcelable {













        return ret;















    }





























    @NonNull













    private static String getSafeId(@NonNull String id) {













        if (id.length() > MAX_ID_LENGTH) {













            return id.substring(0, MAX_ID_LENGTH);













        }













        return id;













    }





























    /**















     * Throws if any of the mandatory fields is not set.















     *










@@ -2342,7 +2355,8 @@ public final class ShortcutInfo implements Parcelable {













        final ClassLoader cl = getClass().getClassLoader();































        mUserId = source.readInt();













        mId = source.readString8();













        mId = getSafeId(Preconditions.checkStringNotEmpty(source.readString8(),













                "Shortcut ID must be provided"));















        mPackageName = source.readString8();















        mActivity = source.readParcelable(cl, android.content.ComponentName.class);















        mFlags = source.readInt();

































core/java/android/permission/IPermissionManager.aidl



+1
−2




























Original line number
Diff line number
Diff line








@@ -77,8 +77,7 @@ interface IPermissionManager {













    List<SplitPermissionInfoParcelable> getSplitPermissions();































    void startOneTimePermissionSession(String packageName, int userId, long timeout,













            long revokeAfterKilledDelay, int importanceToResetTimer,













            int importanceToKeepSessionAlive);













            long revokeAfterKilledDelay);































    void stopOneTimePermissionSession(String packageName, int userId);

















































core/java/android/permission/PermissionManager.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -1371,8 +1371,7 @@ public final class PermissionManager {













            @ActivityManager.RunningAppProcessInfo.Importance int importanceToKeepSessionAlive) {















        try {















            mPermissionManager.startOneTimePermissionSession(packageName, mContext.getUserId(),













                    timeoutMillis, revokeAfterKilledDelayMillis, importanceToResetTimer,













                    importanceToKeepSessionAlive);













                    timeoutMillis, revokeAfterKilledDelayMillis);















        } catch (RemoteException e) {















            e.rethrowFromSystemServer();















        }