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

Commit 723c0eb9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10302109 from e12e7292 to udc-release 

Change-Id: Ib742a3245f5d76d48b8fd5629cf8b9c679c094af
parents 305d3931 e12e7292

core/java/android/view/autofill/AutofillManager.java

+9 −8
Original line number Diff line number Diff line
@@ -2065,7 +2065,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get enabled autofill services status.");

            throw new RuntimeException("Fail to get enabled autofill services status. " + e);

        }

    }
@@ -2084,7 +2084,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get autofill services component name.");

            throw new RuntimeException("Fail to get autofill services component name. " + e);

        }

    }
@@ -2111,7 +2111,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get user data id for field classification.");

            throw new RuntimeException("Fail to get user data id for field classification. " + e);

        }

    }
@@ -2134,7 +2134,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get user data for field classification.");

            throw new RuntimeException("Fail to get user data for field classification. " + e);

        }

    }
@@ -2174,7 +2174,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get field classification enabled status.");

            throw new RuntimeException("Fail to get field classification enabled status. " + e);

        }

    }
@@ -2198,7 +2198,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get default field classification algorithm.");

            throw new RuntimeException("Fail to get default field classification algorithm. " + e);

        }

    }
@@ -2220,7 +2220,8 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get available field classification algorithms.");

            throw new

                RuntimeException("Fail to get available field classification algorithms. " + e);

        }

    }
@@ -2244,7 +2245,7 @@ public final class AutofillManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (SyncResultReceiver.TimeoutException e) {

            throw new RuntimeException("Fail to get autofill supported status.");

            throw new RuntimeException("Fail to get autofill supported status. " + e);

        }

    }

core/java/com/android/internal/app/PlatLogoActivity.java

+307 −287

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/drawable-nodpi/platlogo.xml

+182 −29
Original line number Diff line number Diff line
@@ -13,33 +13,186 @@ Copyright (C) 2021 The Android Open Source Project 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector android:height="128dp"

    android:width="128dp"

    android:viewportHeight="24"

    android:viewportWidth="24"

    xmlns:android="http://schemas.android.com/apk/res/android">

    <path

        android:fillColor="@android:color/system_accent1_400"

        android:pathData="M11,0.3c0.6,-0.3 1.4,-0.3 2,0l0.6,0.4c0.7,0.4 1.4,0.6 2.2,0.6l0.7,-0.1c0.7,0 1.4,0.3 1.8,0.9l0.3,0.6c0.4,0.7 1,1.2 1.7,1.5L21,4.5c0.7,0.3 1.1,0.9 1.2,1.7v0.7C22.2,7.7 22.5,8.4 23,9l0.4,0.5c0.4,0.6 0.5,1.3 0.2,2l-0.3,0.6c-0.3,0.7 -0.4,1.5 -0.3,2.3l0.1,0.7c0.1,0.7 -0.2,1.4 -0.7,1.9L22,17.5c-0.6,0.5 -1.1,1.1 -1.3,1.9L20.5,20c-0.2,0.7 -0.8,1.2 -1.5,1.4l-0.7,0.1c-0.8,0.2 -1.4,0.5 -2,1.1l-0.5,0.5c-0.5,0.5 -1.3,0.7 -2,0.5l-0.6,-0.2c-0.8,-0.2 -1.5,-0.2 -2.3,0l-0.6,0.2c-0.7,0.2 -1.5,0 -2,-0.5l-0.5,-0.5c-0.5,-0.5 -1.2,-0.9 -2,-1.1L5,21.4c-0.7,-0.2 -1.3,-0.7 -1.5,-1.4l-0.2,-0.7C3.1,18.6 2.6,18 2,17.5l-0.6,-0.4c-0.6,-0.5 -0.8,-1.2 -0.7,-1.9l0.1,-0.7c0.1,-0.8 0,-1.6 -0.3,-2.3l-0.3,-0.6c-0.3,-0.7 -0.2,-1.4 0.2,-2L1,9c0.5,-0.6 0.7,-1.4 0.8,-2.2V6.2C1.9,5.5 2.3,4.8 3,4.5l0.6,-0.3c0.7,-0.3 1.3,-0.9 1.7,-1.5l0.3,-0.6c0.4,-0.6 1.1,-1 1.8,-0.9l0.7,0.1c0.8,0 1.6,-0.2 2.2,-0.6L11,0.3z"

        />

    <path

        android:pathData="M6.3,6.5l3,0l0,12.2"

        android:strokeWidth="2.22"

        android:strokeColor="@android:color/system_accent3_800"

        />

    <path

        android:pathData="M12.3,6.5h4l-2,4c2.2,0.3 3.6,2.4 3.3,4.5c-0.3,1.9 -1.9,3.3 -3.8,3.3c-0.5,0 -1,-0.1 -1.4,-0.3"

        android:strokeWidth="2.22"

        android:strokeColor="@android:color/system_accent3_800"

        />

    <path

        android:pathData="M6.3,6.5l3,0l0,12.2"

        android:strokeWidth="0.56"

        android:strokeColor="@android:color/system_neutral1_100"

        />

    <path

        android:pathData="M12.3,6.5h4l-2,4c2.2,0.3 3.6,2.4 3.3,4.5c-0.3,1.9 -1.9,3.3 -3.8,3.3c-0.5,0 -1,-0.1 -1.4,-0.3"

        android:strokeWidth="0.56"

        android:strokeColor="@android:color/system_neutral1_100"

        />

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:aapt="http://schemas.android.com/aapt"

    android:width="512dp"

    android:height="512dp"

    android:viewportWidth="512"

    android:viewportHeight="512">

  <path

      android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0">

    <aapt:attr name="android:fillColor">

      <gradient 

          android:startX="256"

          android:startY="21.81"

          android:endX="256"

          android:endY="350.42"

          android:type="linear">

        <item android:offset="0" android:color="#FF073042"/>

        <item android:offset="1" android:color="#FF073042"/>

      </gradient>

    </aapt:attr>

  </path>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="m195.27,187.64l2.25,-6.69c13.91,78.13 50.84,284.39 50.84,50.33 0,-0.97 0.72,-1.81 1.62,-1.81h12.69c0.9,0 1.62,0.83 1.62,1.8 -0.2,409.91 -69.03,-43.64 -69.03,-43.64Z"

        android:fillColor="#3ddc84"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="m158.77,180.68l-33.17,57.45c-1.9,3.3 -0.77,7.52 2.53,9.42 3.3,1.9 7.52,0.77 9.42,-2.53l33.59,-58.17c54.27,24.33 116.34,24.33 170.61,0l33.59,58.17c1.97,3.26 6.21,4.3 9.47,2.33 3.17,-1.91 4.26,-5.99 2.47,-9.23l-33.16,-57.45c56.95,-30.97 95.91,-88.64 101.61,-156.76H57.17c5.7,68.12 44.65,125.79 101.61,156.76Z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M250.26,187.66L262.17,187.66A2.13,2.13 0,0 1,264.3 189.78L264.3,217.85A2.13,2.13 0,0 1,262.17 219.98L250.26,219.98A2.13,2.13 0,0 1,248.14 217.85L248.14,189.78A2.13,2.13 0,0 1,250.26 187.66z"

        android:fillColor="#3ddc84"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M250.12,170.29L262.32,170.29A1.98,1.98 0,0 1,264.3 172.26L264.3,176.39A1.98,1.98 0,0 1,262.32 178.37L250.12,178.37A1.98,1.98 0,0 1,248.14 176.39L248.14,172.26A1.98,1.98 0,0 1,250.12 170.29z"

        android:fillColor="#3ddc84"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M171.92,216.82h4.04v4.04h-4.04z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M188.8,275.73h4.04v4.04h-4.04z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M369.04,337.63h4.04v4.04h-4.04z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M285.93,252.22h4.04v4.04h-4.04z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M318.96,218.84h4.04v4.04h-4.04z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M294.05,288.55h4.04v4.04h-4.04z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M330.82,273.31h8.08v8.08h-8.08z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M188.8,298.95h4.04v4.04h-4.04z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M220.14,238.94h8.08v8.08h-8.08z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M272.1,318.9h8.08v8.08h-8.08z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M293.34,349.25h8.08v8.08h-8.08z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M161.05,254.24h8.08v8.08h-8.08z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M378.92,192h8.08v8.08h-8.08z"

        android:fillColor="#fff"/>

  </group>

  <group>

    <clip-path

        android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"/>

    <path

        android:pathData="M137.87,323.7h8.08v8.08h-8.08z"

        android:fillColor="#fff"/>

  </group>

  <path

      android:pathData="M256,256m-200,0a200,200 0,1 1,400 0a200,200 0,1 1,-400 0"

      android:strokeWidth="56.561"

      android:fillColor="#00000000"

      android:strokeColor="#f86734"/>

  <path

      android:pathData="m256.22,126.57c-6.69,0 -12.12,5.27 -12.12,11.77v14.52c0,1.25 1.02,2.27 2.27,2.27h0c1.25,0 2.27,-1.02 2.27,-2.27v-3.91c0,-2.51 2.04,-4.55 4.55,-4.55h6.06c2.51,0 4.55,2.04 4.55,4.55v3.91c0,1.25 1.02,2.27 2.27,2.27s2.27,-1.02 2.27,-2.27v-14.52c0,-6.5 -5.43,-11.77 -12.12,-11.77Z"

      android:fillColor="#3ddc84"/>

  <path

      android:pathData="m93.34,116.36l3.85,-4.36 29.64,9.76 -4.44,5.03 -6.23,-2.1 -7.86,8.91 2.86,5.92 -4.43,5.03 -13.39,-28.18ZM110.43,122.76l-8.86,-3.02 4.11,8.41 4.76,-5.39Z"

      android:fillColor="#fff"/>

  <path

      android:pathData="m153.62,100.85l-21.71,-6.2 10.38,14.38 -5.21,3.76 -16.78,-23.26 4.49,-3.24 21.65,6.19 -10.35,-14.35 5.24,-3.78 16.78,23.26 -4.49,3.24Z"

      android:fillColor="#fff"/>

  <path

      android:pathData="m161.46,63.15l8.99,-3.84c7.43,-3.18 15.96,0.12 19.09,7.44 3.13,7.32 -0.38,15.76 -7.81,18.94l-8.99,3.84 -11.28,-26.38ZM179.41,80.26c4.46,-1.91 5.96,-6.72 4.15,-10.96 -1.81,-4.24 -6.33,-6.48 -10.79,-4.57l-3.08,1.32 6.64,15.53 3.08,-1.32Z"

      android:fillColor="#fff"/>

  <path

      android:pathData="m204.23,47.57l11.1,-2.2c5.31,-1.05 9.47,2.08 10.4,6.76 0.72,3.65 -0.76,6.37 -4.07,8.34l12.4,10.44 -7.57,1.5 -11.65,-9.76 -1.03,0.2 2.3,11.61 -6.3,1.25 -5.57,-28.14ZM216.78,56.7c1.86,-0.37 3,-1.71 2.68,-3.33 -0.34,-1.7 -1.88,-2.43 -3.74,-2.06l-4.04,0.8 1.07,5.39 4.04,-0.8Z"

      android:fillColor="#fff"/>

  <path

      android:pathData="m244.29,55.6c0.13,-8.16 6.86,-14.72 15.06,-14.58 8.16,0.13 14.72,6.9 14.58,15.06s-6.91,14.72 -15.06,14.58c-8.2,-0.13 -14.71,-6.9 -14.58,-15.06ZM267.44,55.98c0.08,-4.64 -3.54,-8.66 -8.18,-8.74 -4.68,-0.08 -8.42,3.82 -8.5,8.47 -0.08,4.65 3.54,8.66 8.22,8.74 4.64,0.08 8.39,-3.82 8.46,-8.47Z"

      android:fillColor="#fff"/>

  <path

      android:pathData="m294.39,44.84l6.31,1.23 -5.49,28.16 -6.31,-1.23 5.49,-28.16Z"

      android:fillColor="#fff"/>

  <path

      android:pathData="m321.94,51.41l9.14,3.48c7.55,2.88 11.39,11.17 8.56,18.61 -2.83,7.44 -11.22,11.07 -18.77,8.19l-9.14,-3.48 10.22,-26.8ZM322.96,76.19c4.53,1.73 8.95,-0.69 10.6,-5 1.64,-4.3 -0.05,-9.06 -4.58,-10.78l-3.13,-1.19 -6.01,15.78 3.13,1.19Z"

      android:fillColor="#fff"/>

  <path

      android:pathData="m381.41,89.24l-4.21,-3.21 3.65,-4.78 9.06,6.91 -17.4,22.81 -4.85,-3.7 13.75,-18.02Z"

      android:fillColor="#fff"/>

  <path

      android:pathData="m397.96,126.37l-9.56,-10.26 3.61,-3.36 22.8,-1.25 3.74,4.02 -12.35,11.51 2.51,2.69 -4.08,3.8 -2.51,-2.69 -4.55,4.24 -4.16,-4.46 4.55,-4.24ZM407.83,117.17l-10.28,0.58 4.49,4.82 5.79,-5.4Z"

      android:fillColor="#fff"/>

</vector>

services/autofill/java/com/android/server/autofill/AutofillManagerService.java

+284 −134

File changed.

Preview size limit exceeded, changes collapsed.

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

+44 −9
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.LOG_WRITER_INFO; 
import static com.android.server.am.BroadcastProcessQueue.insertIntoRunnableList;

import static com.android.server.am.BroadcastProcessQueue.reasonToString;

import static com.android.server.am.BroadcastProcessQueue.removeFromRunnableList;

import static com.android.server.am.BroadcastRecord.DELIVERY_DEFERRED;

import static com.android.server.am.BroadcastRecord.deliveryStateToString;

import static com.android.server.am.BroadcastRecord.getReceiverClassName;

import static com.android.server.am.BroadcastRecord.getReceiverPackageName;
@@ -68,6 +69,7 @@ import android.os.RemoteException; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.text.format.DateUtils;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.IndentingPrintWriter;

import android.util.MathUtils;
@@ -212,6 +214,13 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
    private final AtomicReference<ArraySet<BroadcastRecord>> mReplacedBroadcastsCache =

            new AtomicReference<>();



    /**

     * Container for holding the set of broadcast records that satisfied a certain criteria.

     */

    @GuardedBy("mService")

    private final AtomicReference<ArrayMap<BroadcastRecord, Boolean>> mRecordsLookupCache =

            new AtomicReference<>();



    /**

     * Map from UID to its last known "foreground" state. A UID is considered to be in

     * "foreground" state when it's procState is {@link ActivityManager#PROCESS_STATE_TOP}.
@@ -742,13 +751,16 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
                broadcastConsumer = mBroadcastConsumerSkipAndCanceled;

                break;

            case BroadcastOptions.DELIVERY_GROUP_POLICY_MERGED:

                // TODO: Allow applying MERGED policy for broadcasts with more than one receiver.

                if (r.receivers.size() > 1) {

                    return;

                }

                final BundleMerger extrasMerger = r.options.getDeliveryGroupExtrasMerger();

                if (extrasMerger == null) {

                    // Extras merger is required to be able to merge the extras. So, if it's not

                    // supplied, then ignore the delivery group policy.

                    return;

                }

                // TODO: Don't merge with the same BroadcastRecord more than once.

                broadcastConsumer = (record, recordIndex) -> {

                    r.intent.mergeExtras(record.intent, extrasMerger);

                    mBroadcastConsumerSkipAndCanceled.accept(record, recordIndex);
@@ -758,6 +770,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
                logw("Unknown delivery group policy: " + policy);

                return;

        }

        final ArrayMap<BroadcastRecord, Boolean> recordsLookupCache = getRecordsLookupCache();

        forEachMatchingBroadcast(QUEUE_PREDICATE_ANY, (testRecord, testIndex) -> {

            // If the receiver is already in a terminal state, then ignore it.

            if (isDeliveryStateTerminal(testRecord.getDeliveryState(testIndex))) {
@@ -769,22 +782,44 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
                    || !r.matchesDeliveryGroup(testRecord)) {

                return false;

            }

            // TODO: If a process is in a deferred state, we can always apply the policy as long

            // as it is one of the receivers for the new broadcast.



            // For ordered broadcast, check if the receivers for the new broadcast is a superset

            // of those for the previous one as skipping and removing only one of them could result

            // in an inconsistent state.

            if (testRecord.ordered || testRecord.resultTo != null) {

                // TODO: Cache this result in some way so that we don't have to perform the

                // same check for all the broadcast receivers.

                return r.containsAllReceivers(testRecord.receivers);

            } else if (testRecord.prioritized) {

                return r.containsAllReceivers(testRecord.receivers);

            if (testRecord.ordered || testRecord.prioritized) {

                return containsAllReceivers(r, testRecord, recordsLookupCache);

            } else if (testRecord.resultTo != null) {

                return testRecord.getDeliveryState(testIndex) == DELIVERY_DEFERRED

                        ? r.containsReceiver(testRecord.receivers.get(testIndex))

                        : containsAllReceivers(r, testRecord, recordsLookupCache);

            } else {

                return r.containsReceiver(testRecord.receivers.get(testIndex));

            }

        }, broadcastConsumer, true);

        recordsLookupCache.clear();

        mRecordsLookupCache.compareAndSet(null, recordsLookupCache);

    }



    @NonNull

    private ArrayMap<BroadcastRecord, Boolean> getRecordsLookupCache() {

        ArrayMap<BroadcastRecord, Boolean> recordsLookupCache =

                mRecordsLookupCache.getAndSet(null);

        if (recordsLookupCache == null) {

            recordsLookupCache = new ArrayMap<>();

        }

        return recordsLookupCache;

    }



    private boolean containsAllReceivers(@NonNull BroadcastRecord record,

            @NonNull BroadcastRecord testRecord,

            @NonNull ArrayMap<BroadcastRecord, Boolean> recordsLookupCache) {

        final int idx = recordsLookupCache.indexOfKey(testRecord);

        if (idx > 0) {

            return recordsLookupCache.valueAt(idx);

        }

        final boolean containsAll = record.containsAllReceivers(testRecord.receivers);

        recordsLookupCache.put(testRecord, containsAll);

        return containsAll;

    }



    /**