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

Commit 82b41add authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6668007 from a1b6280e to rvc-release 

Change-Id: I1cf3cf27527270dd5c14aa70efd7a97ec1902dce
parents 7936df08 a1b6280e

PREUPLOAD.cfg

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               services/incremental/



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}



strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}



hidden_api_txt_checksorted_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

core/java/android/app/ApplicationExitInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ public final class ApplicationExitInfo implements Parcelable { 
     * Return the defining kernel user identifier, maybe different from {@link #getRealUid} and

     * {@link #getPackageUid}, if an external service has the

     * {@link android.R.styleable#AndroidManifestService_useAppZygote android:useAppZygote} set

     * to <code>true<code> and was bound with the flag

     * to <code>true</code> and was bound with the flag

     * {@link android.content.Context#BIND_EXTERNAL_SERVICE} - in this case, this field here will

     * be the kernel user identifier of the external service provider.

     */

core/java/android/content/IntentFilter.java

+6 −1
Original line number Diff line number Diff line
@@ -1168,8 +1168,13 @@ public class IntentFilter implements Parcelable { 
        public int match(Uri data, boolean wildcardSupported) {

            String host = data.getHost();

            if (host == null) {

                if (wildcardSupported && mWild) {

                    // special case, if no host is provided, but the Authority is wildcard, match

                    return MATCH_CATEGORY_HOST;

                } else {

                    return NO_MATCH_DATA;

                }

            }

            if (false) Log.v("IntentFilter",

                    "Match host " + host + ": " + mHost);

            if (!wildcardSupported || !WILDCARD.equals(host)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ public class ParsingPackageUtils { 


                Uri data = null;

                String dataType = null;

                String host = IntentFilter.WILDCARD;

                String host = null;

                final int numActions = intentInfo.countActions();

                final int numSchemes = intentInfo.countDataSchemes();

                final int numTypes = intentInfo.countDataTypes();

core/java/android/inputmethodservice/InputMethodService.java

+0 −3
Original line number Diff line number Diff line
@@ -605,9 +605,6 @@ public class InputMethodService extends AbstractInputMethodService { 
            if (DEBUG) Log.v(TAG, "unbindInput(): binding=" + mInputBinding

                    + " ic=" + mInputConnection);

            // Unbind input is per process per display.

            // TODO(b/150902448): free-up IME surface when target is changing.

            //  e.g. DisplayContent#setInputMethodTarget()

            removeImeSurface();

            onUnbindInput();

            mInputBinding = null;

            mInputConnection = null;