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

Merge changes from topic "b253394518-back-button"

Browse Source 
* changes:
  [automerge] Allow ActivityEmbedding in APEX modules. 2p: a4156b6f4d
  Allow ActivityEmbedding in APEX modules.
This commit is contained in:
Simon Wingrove
2022-10-20 08:49:21 +00:00
committed by Android (Google) Code Review
parent 5468b68694 c54ac3e6d3
commit 4dffd5e723
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.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" />
<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>