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

Commit 73ad07fe authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33684829',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33684829', 'googleplex-android-review.googlesource.com/35065635', 'googleplex-android-review.googlesource.com/36141672', 'googleplex-android-review.googlesource.com/36472673', 'googleplex-android-review.googlesource.com/36497579', 'googleplex-android-review.googlesource.com/36645551', 'googleplex-android-review.googlesource.com/36656658', 'googleplex-android-review.googlesource.com/36815307', 'googleplex-android-review.googlesource.com/36589107', 'googleplex-android-review.googlesource.com/36768578', 'googleplex-android-review.googlesource.com/37078980', 'googleplex-android-review.googlesource.com/37149896', 'googleplex-android-review.googlesource.com/36460846', 'googleplex-android-review.googlesource.com/37000532', 'googleplex-android-review.googlesource.com/37000533', 'googleplex-android-review.googlesource.com/37180818', 'googleplex-android-review.googlesource.com/37295835', 'googleplex-android-review.googlesource.com/37284355', 'googleplex-android-review.googlesource.com/35233210', 'googleplex-android-review.googlesource.com/37078487', 'googleplex-android-review.googlesource.com/37183875', 'googleplex-android-review.googlesource.com/37183638', 'googleplex-android-review.googlesource.com/37250763', 'googleplex-android-review.googlesource.com/37254946', 'googleplex-android-review.googlesource.com/37605643', 'googleplex-android-review.googlesource.com/37289262', 'googleplex-android-review.googlesource.com/37269844', 'googleplex-android-review.googlesource.com/37285533'] into 25Q2-release.

Change-Id: I7b5a18879a9119a25f6be3b493ba4f1855093fcc
parents 2eb771c8 e363f821

core/java/android/app/ActivityManager.java

+18 −3
Original line number Diff line number Diff line
@@ -3533,9 +3533,24 @@ public class ActivityManager { 
            Manifest.permission.ACCESS_INSTANT_APPS})

    @UnsupportedAppUsage

    public boolean clearApplicationUserData(String packageName, IPackageDataObserver observer) {

        return clearApplicationUserData(packageName, observer, true);

    }



    /**

     * @hide

     */

    @RequiresPermission(anyOf = {Manifest.permission.CLEAR_APP_USER_DATA,

            Manifest.permission.ACCESS_INSTANT_APPS})

    private boolean clearApplicationUserData(String packageName, IPackageDataObserver observer,

            boolean restorePregrantedPermissions) {

        try {

            if (restorePregrantedPermissions) {

                return getService().clearApplicationUserData(packageName, false,

                        observer, mContext.getUserId());

            } else {

                return getService().clearApplicationUserDataWithoutPermissionReset(packageName,

                        false, observer, mContext.getUserId());

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -3553,7 +3568,7 @@ public class ActivityManager { 
     *     data be erased; {@code false} otherwise.

     */

    public boolean clearApplicationUserData() {

        return clearApplicationUserData(mContext.getPackageName(), null);

        return clearApplicationUserData(mContext.getPackageName(), null, false);

    }



    /**

core/java/android/app/ApplicationPackageManager.java

+2 −1
Original line number Diff line number Diff line
@@ -2947,7 +2947,8 @@ public class ApplicationPackageManager extends PackageManager { 
    public void clearApplicationUserData(String packageName,

                                         IPackageDataObserver observer) {

        try {

            mPM.clearApplicationUserData(packageName, observer, getUserId());

            mPM.clearApplicationUserData(packageName, observer, getUserId(),

                    /* restorePregrantedPermissions */ true);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/app/IActivityManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -334,6 +334,8 @@ interface IActivityManager { 
    List<ActivityManager.ProcessErrorStateInfo> getProcessesInErrorState();

    boolean clearApplicationUserData(in String packageName, boolean keepState,

            in IPackageDataObserver observer, int userId);

    boolean clearApplicationUserDataWithoutPermissionReset(in String packageName, boolean keepState,

            in IPackageDataObserver observer, int userId);

    void stopAppForUser(in String packageName, int userId);

    /** Returns {@code false} if the callback could not be registered, {@true} otherwise. */

    boolean registerForegroundServiceObserver(in IForegroundServiceObserver callback);

core/java/android/app/IActivityTaskManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ interface IActivityTaskManager { 
    List<IBinder> getAppTasks(in String callingPackage);

    void startSystemLockTaskMode(int taskId);

    void stopSystemLockTaskMode();

    void rebuildSystemLockTaskPinnedMode();

    void finishVoiceTask(in IVoiceInteractionSession session);

    int addAppTask(in IBinder activityToken, in Intent intent,

            in ActivityManager.TaskDescription description, in Bitmap thumbnail);

core/java/android/app/Notification.java

+9 −9
Original line number Diff line number Diff line
@@ -3152,8 +3152,8 @@ public class Notification implements Parcelable 
                person.visitUris(visitor);

            }













            final Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES,













                    Parcelable.class);













            final Bundle[] messages =













                    getParcelableArrayFromBundle(extras, EXTRA_MESSAGES, Bundle.class);















            if (!ArrayUtils.isEmpty(messages)) {















                for (MessagingStyle.Message message : MessagingStyle.Message















                        .getMessagesFromBundleArray(messages)) {









@@ -3161,8 +3161,8 @@ public class Notification implements Parcelable













                }















            }



























            final Parcelable[] historic = extras.getParcelableArray(EXTRA_HISTORIC_MESSAGES,













                    Parcelable.class);













            final Parcelable[] historic =













                    getParcelableArrayFromBundle(extras, EXTRA_HISTORIC_MESSAGES, Bundle.class);















            if (!ArrayUtils.isEmpty(historic)) {















                for (MessagingStyle.Message message : MessagingStyle.Message















                        .getMessagesFromBundleArray(historic)) {










@@ -8203,8 +8203,8 @@ public class Notification implements Parcelable













     */















    public boolean hasImage() {















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













            final Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES,













                    Parcelable.class);













            final Bundle[] messages =













                    getParcelableArrayFromBundle(extras, EXTRA_MESSAGES, Bundle.class);















            if (!ArrayUtils.isEmpty(messages)) {















                for (MessagingStyle.Message m : MessagingStyle.Message















                        .getMessagesFromBundleArray(messages)) {










@@ -9485,10 +9485,10 @@ public class Notification implements Parcelable













                mUser = user;















            }















            mConversationTitle = extras.getCharSequence(EXTRA_CONVERSATION_TITLE);













            Parcelable[] messages = extras.getParcelableArray(EXTRA_MESSAGES, Parcelable.class);













            Bundle[] messages = getParcelableArrayFromBundle(extras, EXTRA_MESSAGES, Bundle.class);















            mMessages = Message.getMessagesFromBundleArray(messages);













            Parcelable[] histMessages = extras.getParcelableArray(EXTRA_HISTORIC_MESSAGES,













                    Parcelable.class);













            Bundle[] histMessages = getParcelableArrayFromBundle(













                    extras, EXTRA_HISTORIC_MESSAGES, Bundle.class);















            mHistoricMessages = Message.getMessagesFromBundleArray(histMessages);















            mIsGroupConversation = extras.getBoolean(EXTRA_IS_GROUP_CONVERSATION);















            mUnreadMessageCount = extras.getInt(EXTRA_CONVERSATION_UNREAD_MESSAGE_COUNT);