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

Commit e31b98f8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker Committed by Jeff Wright
Browse files

Merge cherrypicks of [18083515, 18492305, 19101007, 19119301, 19139356] into... 

Merge cherrypicks of [18083515, 18492305, 19101007, 19119301, 19139356] into security-aosp-rvc-release.

Change-Id: Ia3bd118152ef68e027f20de700f5b1e8a8765555
parents 4d8dfca9 9b1951d0

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; 
import static android.content.pm.PackageManager.FEATURE_WATCH;

import static android.content.pm.PackageManager.FEATURE_WATCH;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_ONLY_COREAPP_ALLOWED;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_ONLY_COREAPP_ALLOWED;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_RESOURCES_ARSC_COMPRESSED;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_RESOURCES_ARSC_COMPRESSED;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION;
@@ -778,6 +779,13 @@ public class ParsingPackageUtils { 
            );

            );

        }

        }





        if (ParsedPermissionUtils.declareDuplicatePermission(pkg)) {

            return input.error(

                    INSTALL_PARSE_FAILED_MANIFEST_MALFORMED,

                    "Found duplicate permission with a different attribute value."

            );

        }



        convertNewPermissions(pkg);

        convertNewPermissions(pkg);





        convertSplitPermissions(pkg);

        convertSplitPermissions(pkg);

core/java/android/content/pm/parsing/component/ParsedPermissionUtils.java

+48 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,8 @@ import android.content.pm.parsing.ParsingPackage; 
import android.content.res.Resources;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.content.res.XmlResourceParser;

import android.content.res.XmlResourceParser;

import android.util.ArrayMap;

import android.util.EventLog;

import android.util.Slog;

import android.util.Slog;





import com.android.internal.R;

import com.android.internal.R;
@@ -32,6 +34,8 @@ import android.content.pm.parsing.result.ParseResult; 
import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlPullParserException;





import java.io.IOException;

import java.io.IOException;

import java.util.List;

import java.util.Objects;





/** @hide */

/** @hide */

public class ParsedPermissionUtils {

public class ParsedPermissionUtils {
@@ -207,4 +211,48 @@ public class ParsedPermissionUtils { 
        return ComponentParseUtils.parseAllMetaData(pkg, res, parser, tag, permissionGroup,

        return ComponentParseUtils.parseAllMetaData(pkg, res, parser, tag, permissionGroup,

                input);

                input);

    }

    }



    /**

     * Determines if a duplicate permission is malformed .i.e. defines different protection level

     * or group.

     */

    private static boolean isMalformedDuplicate(ParsedPermission p1, ParsedPermission p2) {

        // Since a permission tree is also added as a permission with normal protection

        // level, we need to skip if the parsedPermission is a permission tree.

        if (p1 == null || p2 == null || p1.isTree() || p2.isTree()) {

            return false;

        }



        if (p1.getProtectionLevel() != p2.getProtectionLevel()) {

            return true;

        }

        if (!Objects.equals(p1.getGroup(), p2.getGroup())) {

            return true;

        }



        return false;

    }



    /**

     * @return {@code true} if the package declares malformed duplicate permissions.

     */

    public static boolean declareDuplicatePermission(@NonNull ParsingPackage pkg) {

        final List<ParsedPermission> permissions = pkg.getPermissions();

        final int size = permissions.size();

        if (size > 0) {

            final ArrayMap<String, ParsedPermission> checkDuplicatePerm = new ArrayMap<>(size);

            for (int i = 0; i < size; i++) {

                final ParsedPermission parsedPermission = permissions.get(i);

                final String name = parsedPermission.getName();

                final ParsedPermission perm = checkDuplicatePerm.get(name);

                if (isMalformedDuplicate(parsedPermission, perm)) {

                    // Fix for b/213323615

                    EventLog.writeEvent(0x534e4554, "213323615");

                    return true;

                }

                checkDuplicatePerm.put(name, parsedPermission);

            }

        }

        return false;

    }

}
 
}

core/java/android/os/Parcel.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -443,6 +443,7 @@ public final class Parcel { 
     */

     */

    public final void recycle() {

    public final void recycle() {

        if (DEBUG_RECYCLE) mStack = null;

        if (DEBUG_RECYCLE) mStack = null;

        mClassCookies = null;

        freeBuffer();

        freeBuffer();





        final Parcel[] pool;

        final Parcel[] pool;

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -1700,7 +1700,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 




        Intent intent = new Intent(ACTION_SHOW_INPUT_METHOD_PICKER)

        Intent intent = new Intent(ACTION_SHOW_INPUT_METHOD_PICKER)

                .setPackage(mContext.getPackageName());

                .setPackage(mContext.getPackageName());

        mImeSwitchPendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);

        mImeSwitchPendingIntent = PendingIntent.getBroadcast(mContext, 0, intent,

                PendingIntent.FLAG_IMMUTABLE);





        mShowOngoingImeSwitcherForPhones = false;

        mShowOngoingImeSwitcherForPhones = false;
@@ -2529,7 +2530,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        mCurIntent.putExtra(Intent.EXTRA_CLIENT_LABEL,

        mCurIntent.putExtra(Intent.EXTRA_CLIENT_LABEL,

                com.android.internal.R.string.input_method_binding_label);

                com.android.internal.R.string.input_method_binding_label);

        mCurIntent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(

        mCurIntent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(

                mContext, 0, new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS), 0));

                mContext, 0, new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS),

                PendingIntent.FLAG_IMMUTABLE));





        if (bindCurrentInputMethodServiceLocked(mCurIntent, this, IME_CONNECTION_BIND_FLAGS)) {

        if (bindCurrentInputMethodServiceLocked(mCurIntent, this, IME_CONNECTION_BIND_FLAGS)) {

            mLastBindTime = SystemClock.uptimeMillis();

            mLastBindTime = SystemClock.uptimeMillis();