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

Commit 4dffd5e7 authored by Simon Wingrove's avatar Simon Wingrove Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b253394518-back-button" 

* changes:
  [automerge] Allow ActivityEmbedding in APEX modules. 2p: a4156b6f
  Allow ActivityEmbedding in APEX modules.
parents 5468b686 c54ac3e6

packages/SettingsLib/ActivityEmbedding/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -26,4 +26,9 @@ android_library { 
        "androidx.window.extensions",

        "androidx.window.sidecar",

    ],



    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

    ],

}

packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    <uses-sdk android:minSdkVersion="21" />



    <application>

        <uses-library android:name="org.apache.http.legacy" android:required="false" />

        <uses-library android:name="androidx.window.extensions" android:required="false" />

        <uses-library android:name="androidx.window.sidecar" android:required="false" />

    </application>