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

Commit 50d5d35b authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge changes Ibba269bc,I399d34e1 into udc-qpr-dev 

* changes:
  Check more URIs in notifications
  Init some time Process stats with very negative numbers
parents b9cbc94c 7e51f607

core/java/android/app/Person.java

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ public final class Person implements Parcelable { 
     */

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

        visitor.accept(getIconUri());

        if (mUri != null && !mUri.isEmpty()) {

            visitor.accept(Uri.parse(mUri));

        }

    }



    /** Builder for the immutable {@link Person} class. */

core/java/android/widget/RemoteViews.java

+24 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,13 @@ public class RemoteViews implements Parcelable, Filter { 
            return (SET_REMOTE_ADAPTER_TAG + "_" + viewId);

        }



        @Override

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

            for (RemoteViews remoteViews : list) {

                remoteViews.visitUris(visitor);

            }

        }



        int viewTypeCount;

        ArrayList<RemoteViews> list;

    }
@@ -1291,6 +1298,14 @@ public class RemoteViews implements Parcelable, Filter { 
        public String getUniqueKey() {

            return (SET_REMOTE_ADAPTER_TAG + "_" + viewId);

        }



        @Override

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

            RemoteCollectionItems items = getCollectionItemsFromFuture(mItemsFuture);

            if (items != null) {

              items.visitUris(visitor);

            }

        }

    }



    private class SetRemoteViewsAdapterIntent extends Action {
@@ -7275,6 +7290,15 @@ public class RemoteViews implements Parcelable, Filter { 
                        Math.max(mViewTypeCount, 1));

            }

        }



        /**

         * See {@link RemoteViews#visitUris(Consumer)}.

         */

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

            for (RemoteViews view : mViews) {

                view.visitUris(visitor);

            }

        }

    }



    /**

services/core/java/com/android/server/am/OomAdjuster.java

+1 −2
Original line number Diff line number Diff line
@@ -2721,8 +2721,7 @@ public class OomAdjuster { 
            }

        }



        if (ppr.getLastProviderTime() > 0

                && (ppr.getLastProviderTime() + mConstants.CONTENT_PROVIDER_RETAIN_TIME) > now) {

        if ((ppr.getLastProviderTime() + mConstants.CONTENT_PROVIDER_RETAIN_TIME) > now) {

            if (adj > PREVIOUS_APP_ADJ) {

                adj = PREVIOUS_APP_ADJ;

                schedGroup = SCHED_GROUP_BACKGROUND;

services/core/java/com/android/server/am/ProcessProviderRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ final class ProcessProviderRecord { 
    /**

     * The last time someone else was using a provider in this process.

     */

    private long mLastProviderTime;

    private long mLastProviderTime = Long.MIN_VALUE;



    /**

     * class (String) -> ContentProviderRecord.

services/core/java/com/android/server/am/ProcessStateRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ final class ProcessStateRecord { 
     * The last time the process was in the TOP state or greater.

     */

    @GuardedBy("mService")

    private long mLastTopTime;

    private long mLastTopTime = Long.MIN_VALUE;



    /**

     * Is this an empty background process?