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

Commit 65c42a55 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev 

am: e7172ff9

Change-Id: I7b8e53f8394e41433ceebe4f6e477f8561e49807
parents 5c1469e5 e7172ff9

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -21085,7 +21085,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     */

    @Nullable

    public final <T extends View> T findViewById(@IdRes int id) {

        if (id < 0) {

        if (id == NO_ID) {

            return null;

        }

        return findViewTraversal(id);

libs/androidfw/ResourceTypes.cpp

+4 −0
Original line number Diff line number Diff line
@@ -6664,6 +6664,10 @@ status_t DynamicRefTable::addMapping(const String16& packageName, uint8_t packag 
    return NO_ERROR;

}



void DynamicRefTable::addMapping(uint8_t buildPackageId, uint8_t runtimePackageId) {

    mLookupTable[buildPackageId] = runtimePackageId;

}



status_t DynamicRefTable::lookupResourceId(uint32_t* resId) const {

    uint32_t res = *resId;

    size_t packageId = Res_GETPACKAGE(res) + 1;

libs/androidfw/include/androidfw/ResourceTypes.h

+2 −0
Original line number Diff line number Diff line
@@ -1610,6 +1610,8 @@ public: 
    // the given package.

    status_t addMapping(const String16& packageName, uint8_t packageId);



    void addMapping(uint8_t buildPackageId, uint8_t runtimePackageId);



    // Performs the actual conversion of build-time resource ID to run-time

    // resource ID.

    status_t lookupResourceId(uint32_t* resId) const;

tests/FeatureSplit/feature1/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    package="com.android.test.split.feature"

    featureName="feature1">

    featureSplit="feature1">



    <uses-sdk android:minSdkVersion="21" />

tests/FeatureSplit/feature1/res/layout/included.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    android:id="@+id/text"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content" />