Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow ActivityEmbedding in APEX modules." into tm-mainline-prod

Browse Source
This commit is contained in:
Simon Wingrove
2022-10-20 08:49:22 +00:00
committed by Android (Google) Code Review
parent 0f022bbf1d a4156b6f4d
commit b58553432a
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/ActivityEmbedding/Android.bp
View File

@@ -26,4 +26,9 @@ android_library {
"androidx.window.extensions", "androidx.window.extensions",
"androidx.window.sidecar", "androidx.window.sidecar",
], ],
apex_available: [
"//apex_available:platform",
"com.android.permission",
],
} }

1
packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml
View File

@@ -21,6 +21,7 @@
<uses-sdk android:minSdkVersion="21" /> <uses-sdk android:minSdkVersion="21" />
<application> <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.extensions" android:required="false" />
<uses-library android:name="androidx.window.sidecar" android:required="false" /> <uses-library android:name="androidx.window.sidecar" android:required="false" />
</application> </application>