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

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

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010620', 'googleplex-android-review.googlesource.com/29639631', 'googleplex-android-review.googlesource.com/33963810', 'googleplex-android-review.googlesource.com/33983853', 'googleplex-android-review.googlesource.com/34557698', 'googleplex-android-review.googlesource.com/34407884', 'googleplex-android-review.googlesource.com/34401530', 'googleplex-android-review.googlesource.com/34599997', 'googleplex-android-review.googlesource.com/34432296', 'googleplex-android-review.googlesource.com/34635189', 'googleplex-android-review.googlesource.com/34390777', 'googleplex-android-review.googlesource.com/34442276', 'googleplex-android-review.googlesource.com/34940820', 'googleplex-android-review.googlesource.com/34824072', 'googleplex-android-review.googlesource.com/34992604', 'googleplex-android-review.googlesource.com/34959854', 'googleplex-android-review.googlesource.com/35158808', 'googleplex-android-review.googlesource.com/35442984', 'googleplex-android-review.googlesource.com/35459072', 'googleplex-android-review.googlesource.com/35085331', 'googleplex-android-review.googlesource.com/35367820', 'googleplex-android-review.googlesource.com/35504219', 'googleplex-android-review.googlesource.com/35602272', 'googleplex-android-review.googlesource.com/35742655', 'googleplex-android-review.googlesource.com/35501090', 'googleplex-android-review.googlesource.com/35742121', 'googleplex-android-review.googlesource.com/35479489', 'googleplex-android-review.googlesource.com/35775317', 'googleplex-android-review.googlesource.com/35805116', 'googleplex-android-review.googlesource.com/35236046', 'googleplex-android-review.googlesource.com/35902148', 'googleplex-android-review.googlesource.com/36074611', 'googleplex-android-review.googlesource.com/35609893', 'googleplex-android-review.googlesource.com/35930591', 'googleplex-android-review.googlesource.com/36021323', 'googleplex-android-review.googlesource.com/35478331', 'googleplex-android-review.googlesource.com/35602683', 'googleplex-android-review.googlesource.com/36102305'] into security-aosp-udc-release.

Change-Id: I05621efcb5281b43a0f198eea486d72c2f696d8f
parents ece21a00 a100e23a

core/java/android/app/ApplicationPackageManager.java

+21 −7
Original line number Diff line number Diff line
@@ -1414,22 +1414,36 @@ public class ApplicationPackageManager extends PackageManager { 


    @Override

    public ResolveInfo resolveActivity(Intent intent, ResolveInfoFlags flags) {

        return resolveActivityAsUser(intent, flags, getUserId());

        return resolveActivityAsUser(intent, /* resolvedType= */ null, flags, getUserId());

    }



    @Override

    public ResolveInfo resolveActivityAsUser(Intent intent, int flags, int userId) {

        return resolveActivityAsUser(intent, ResolveInfoFlags.of(flags), userId);

        return resolveActivityAsUser(intent, /* resolvedType= */ null, ResolveInfoFlags.of(flags),

                userId);

    }



    @Override

    public ResolveInfo resolveActivityAsUser(Intent intent, ResolveInfoFlags flags, int userId) {

        return resolveActivityAsUser(intent, /* resolvedType= */ null, flags, userId);

    }



    @Override

    public ResolveInfo resolveActivityAsUser(Intent intent, String resolvedType,

            int flags, int userId) {

        return resolveActivityAsUser(intent, resolvedType,

                ResolveInfoFlags.of(flags), userId);

    }



    @Override

    public ResolveInfo resolveActivityAsUser(Intent intent, String resolvedType,

            ResolveInfoFlags flags, int userId) {

        try {

            return mPM.resolveIntent(

                intent,

                intent.resolveTypeIfNeeded(mContext.getContentResolver()),

                updateFlagsForComponent(flags.getValue(), userId, intent),

                userId);

            return mPM.resolveIntent(intent,

                    resolvedType == null

                        ? intent.resolveTypeIfNeeded(mContext.getContentResolver())

                        : resolvedType,

                    updateFlagsForComponent(flags.getValue(), userId, intent), userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/app/INotificationManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ interface INotificationManager 
    void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);

    void setInterruptionFilter(String pkg, int interruptionFilter);



    void updateNotificationChannelGroupFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannelGroup group);

    void updateNotificationChannelFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannel channel);

    ParceledListSlice getNotificationChannelsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);

    ParceledListSlice getNotificationChannelGroupsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);

core/java/android/app/KeyguardManager.java

+9 −0
Original line number Diff line number Diff line
@@ -181,6 +181,15 @@ public class KeyguardManager { 
     */

    public static final String EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS = "check_dpm";



    /**

     * When switching to a secure user, system server will expect a callback when the UI has

     * completed the switch.

     *

     * @hide

     */

    public static final String LOCK_ON_USER_SWITCH_CALLBACK = "onSwitchCallback";





    /**

     *

     * Password lock type, see {@link #setLock}

core/java/android/companion/AssociationRequest.java

+10 −4
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ public final class AssociationRequest implements Parcelable { 
            @Nullable CharSequence displayName,

            boolean selfManaged,

            boolean forceConfirmation) {

        validateDisplayName(displayName);

        mSingleDevice = singleDevice;

        mDeviceFilters = requireNonNull(deviceFilters);

        mDeviceProfile = deviceProfile;
@@ -342,6 +343,7 @@ public final class AssociationRequest implements Parcelable { 


    /** @hide */

    public void setDisplayName(CharSequence displayName) {

        validateDisplayName(displayName);

        mDisplayName = displayName;

    }
@@ -421,10 +423,7 @@ public final class AssociationRequest implements Parcelable { 
        public Builder setDisplayName(@NonNull CharSequence displayName) {

            checkNotUsed();

            mDisplayName = requireNonNull(displayName);

            if (displayName.length() > DISPLAY_NAME_LENGTH_LIMIT) {

                throw new IllegalArgumentException("Length of the display name must be at most "

                        + DISPLAY_NAME_LENGTH_LIMIT + " characters");

            }

            validateDisplayName(displayName);



            return this;

        }
@@ -672,4 +671,11 @@ public final class AssociationRequest implements Parcelable { 
            return new AssociationRequest(in);

        }

    };



    private static void validateDisplayName(@Nullable CharSequence displayName) {

        if (displayName != null && displayName.length() > DISPLAY_NAME_LENGTH_LIMIT) {

            throw new IllegalArgumentException("Length of the display name must be at most "

                    + DISPLAY_NAME_LENGTH_LIMIT + " characters");

        }

    }

}

core/java/android/content/ContentProvider.java

+25 −4
Original line number Diff line number Diff line
@@ -580,13 +580,14 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                throws FileNotFoundException {

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            enforceFilePermission(attributionSource, uri, mode);

            final String updatedMode = validateFileMode(mode);

            enforceFilePermission(attributionSource, uri, updatedMode);

            traceBegin(TRACE_TAG_DATABASE, "openFile: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {

                return mInterface.openFile(

                        uri, mode, CancellationSignal.fromTransport(cancellationSignal));

                        uri, updatedMode, CancellationSignal.fromTransport(cancellationSignal));

            } catch (RemoteException e) {

                throw e.rethrowAsRuntimeException();

            } finally {
@@ -601,13 +602,14 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
                throws FileNotFoundException {

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            enforceFilePermission(attributionSource, uri, mode);

            final String updatedMode = validateFileMode(mode);

            enforceFilePermission(attributionSource, uri, updatedMode);

            traceBegin(TRACE_TAG_DATABASE, "openAssetFile: ", uri.getAuthority());

            final AttributionSource original = setCallingAttributionSource(

                    attributionSource);

            try {

                return mInterface.openAssetFile(

                        uri, mode, CancellationSignal.fromTransport(cancellationSignal));

                        uri, updatedMode, CancellationSignal.fromTransport(cancellationSignal));

            } catch (RemoteException e) {

                throw e.rethrowAsRuntimeException();

            } finally {
@@ -772,6 +774,25 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
            }

        }



        private String validateFileMode(String mode) {

            // We currently only support the following modes: r, w, wt, wa, rw, rwt

            // Note: ideally, we should check against the allowed modes and throw a

            // SecurityException if the mode doesn't match any of them but to avoid app compat

            // issues, we're silently dropping bits which allow modifying files when the write bit

            // is not specified.

            if (mode != null && mode.indexOf('w') == -1) {

                // Don't allow truncation without write

                if (mode.indexOf('t') != -1) {

                    mode = mode.replace("t", "");

                }

                // Don't allow appending without write

                if (mode.indexOf('a') != -1) {

                    mode = mode.replace("a", "");

                }

            }

            return mode;

        }



        @Override

        public int checkUriPermission(@NonNull AttributionSource attributionSource, Uri uri,

                int uid, int modeFlags) {