Skip to content

Commit 145465c

Browse files
authored
Merge pull request #54 from nihil-2019/overlay-time-fixed
replace untouched aosp apps with google equivalents
2 parents c2ef99b + 46bde32 commit 145465c

32 files changed

+128
-3
lines changed
65.6 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
24.6 MB
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<permissions>
2+
<privapp-permissions package="com.google.android.apps.nbu.files">
3+
<permission name="android.permission.WAKE_LOCK" />
4+
<permission name="com.google.android.apps.nbu.files.permission.C2D_MESSAGE" />
5+
<permission name="com.google.android.c2dm.permission.RECEIVE" />
6+
<permission name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
7+
<permission name="android.permission.READ_EXTERNAL_STORAGE" />
8+
<permission name="android.permission.WRITE_EXTERNAL_STORAGE" />
9+
<permission name="android.permission.ACCESS_MEDIA_LOCATION" />
10+
<permission name="android.permission.RECEIVE_BOOT_COMPLETED" />
11+
<permission name="android.permission.READ_PHONE_STATE" />
12+
<permission name="android.permission.ACCESS_NETWORK_STATE" />
13+
<permission name="android.permission.ACCESS_COARSE_LOCATION" />
14+
<permission name="android.permission.ACCESS_FINE_LOCATION" />
15+
<permission name="android.permission.ACCESS_WIFI_STATE" />
16+
<permission name="android.permission.BLUETOOTH" />
17+
<permission name="android.permission.BLUETOOTH_ADMIN" />
18+
<permission name="android.permission.CHANGE_NETWORK_STATE" />
19+
<permission name="android.permission.CHANGE_WIFI_STATE" />
20+
<permission name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
21+
<permission name="android.permission.INTERNET" />
22+
<permission name="android.permission.WRITE_SETTINGS" />
23+
<permission name="android.permission.FOREGROUND_SERVICE" />
24+
<permission name="android.permission.PACKAGE_USAGE_STATS" />
25+
<permission name="android.permission.GET_PACKAGE_SIZE" />
26+
<permission name="com.android.vending.p2p.APP_INSTALL_API" />
27+
<permission name="android.permission.REQUEST_DELETE_PACKAGES" />
28+
<permission name="android.permission.GET_ACCOUNTS" />
29+
<permission name="android.permission.MANAGE_ACCOUNTS" />
30+
<permission name="android.permission.MANAGE_EXTERNAL_STORAGE" />
31+
<permission name="android.permission.QUERY_ALL_PACKAGES" />
32+
<permission name="android.permission.BLUETOOTH_ADVERTISE" />
33+
<permission name="android.permission.BLUETOOTH_CONNECT" />
34+
<permission name="android.permission.BLUETOOTH_SCAN" />
35+
<permission name="android.permission.REQUEST_INSTALL_PACKAGES" />
36+
</privapp-permissions>
37+
</permissions>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<permissions>
2+
<privapp-permissions package="com.google.android.contacts">
3+
<permission name="android.permission.READ_CONTACTS" />
4+
<permission name="android.permission.WRITE_CONTACTS" />
5+
<permission name="android.permission.GET_ACCOUNTS" />
6+
<permission name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
7+
<permission name="android.permission.MANAGE_ACCOUNTS" />
8+
<permission name="android.permission.ACCESS_NETWORK_STATE" />
9+
<permission name="android.permission.CALL_PHONE" />
10+
<permission name="android.permission.INTERNET" />
11+
<permission name="android.permission.NFC" />
12+
<permission name="android.permission.READ_PHONE_NUMBERS" />
13+
<permission name="android.permission.READ_PHONE_STATE" />
14+
<permission name="android.permission.WAKE_LOCK" />
15+
<permission name="android.permission.WRITE_SETTINGS" />
16+
<permission name="android.permission.USE_CREDENTIALS" />
17+
<permission name="android.permission.VIBRATE" />
18+
<permission name="android.permission.READ_SYNC_SETTINGS" />
19+
<permission name="android.permission.READ_EXTERNAL_STORAGE" />
20+
<permission name="com.android.launcher.permission.INSTALL_SHORTCUT" />
21+
<permission name="android.permission.WRITE_SYNC_SETTINGS" />
22+
<permission name="android.permission.READ_SYNC_STATS" />
23+
<permission name="android.permission.RECEIVE_BOOT_COMPLETED" />
24+
<permission name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
25+
<permission name="com.google.android.c2dm.permission.RECEIVE" />
26+
<permission name="android.permission.FOREGROUND_SERVICE" />
27+
<permission name="android.permission.HIDE_OVERLAY_WINDOWS" />
28+
</privapp-permissions>
29+
</permissions>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<permissions>
2+
<privapp-permissions package="com.google.android.documentsui">
3+
<permission name="android.permission.QUERY_ALL_PACKAGES" />
4+
<permission name="android.permission.MANAGE_DOCUMENTS" />
5+
<permission name="android.permission.REMOVE_TASKS" />
6+
<permission name="android.permission.FOREGROUND_SERVICE" />
7+
<permission name="android.permission.WAKE_LOCK" />
8+
<permission name="android.permission.CACHE_CONTENT" />
9+
<permission name="android.permission.RECEIVE_BOOT_COMPLETED" />
10+
<permission name="android.permission.CHANGE_OVERLAY_PACKAGES" />
11+
<permission name="android.permission.INTERACT_ACROSS_USERS" />
12+
<permission name="android.permission.MODIFY_QUIET_MODE" />
13+
<permission name="android.permission.LOG_COMPAT_CHANGE" />
14+
<permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
15+
</privapp-permissions>
16+
</permissions>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<permissions>
2+
<privapp-permissions package="com.google.android.storagemanager">
3+
<permission name="android.permission.PACKAGE_USAGE_STATS" />
4+
<permission name="android.permission.GET_PACKAGE_SIZE" />
5+
<permission name="android.permission.DELETE_PACKAGES" />
6+
<permission name="android.permission.READ_EXTERNAL_STORAGE" />
7+
<permission name="android.permission.WRITE_EXTERNAL_STORAGE" />
8+
<permission name="android.permission.MANAGE_USERS" />
9+
<permission name="android.permission.MANAGE_EXTERNAL_STORAGE" />
10+
<permission name="android.permission.WRITE_SECURE_SETTINGS" />
11+
<permission name="android.permission.INTERACT_ACROSS_USERS" />
12+
<permission name="android.permission.RECEIVE_BOOT_COMPLETED" />
13+
<permission name="android.permission.USE_RESERVED_DISK" />
14+
<permission name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
15+
<permission name="android.permission.ACCESS_NETWORK_STATE" />
16+
<permission name="android.permission.INTERNET" />
17+
<permission name="android.permission.GET_ACCOUNTS" />
18+
<permission name="android.permission.READ_PHONE_STATE" />
19+
</privapp-permissions>
20+
</permissions>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ cp *.img /mnt/path-to-extracted-msix/
9090
- Uninstall any other installed versions of WSA
9191
- Open powershell as admin and run `Add-AppxPackage -Register path-to-extracted-msix\AppxManifest.xml`
9292

93-
WSA will install with gapps
93+
WSA will install with gapps, make sure to install android system webview from the play store after signing in.
9494

9595
## Root access
9696

apply.sh

+23
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ cp "$PropRoot/build_vendor.prop" /mnt/vendor/build.prop
1111
cp "$PropRoot/build_vendor_odm.prop" /mnt/vendor/odm/etc/vendor.prop
1212

1313
printf 'removing duplicate apps from system\n'
14+
rm -Rf $InstallDir/apex/com.android.extservices/
15+
rm -Rf $InstallDir/app/DocumentsUI/
16+
rm -Rf $InstallDir/app/ExtShared/
1417
rm -Rf $InstallDir/priv-app/PackageInstaller/
18+
rm -Rf $InstallDir/priv-app/SoundPicker/
19+
rm -Rf $MountPointProduct/app/Gallery2/
20+
rm -Rf $MountPointProduct/app/Music/
21+
rm -Rf $MountPointProduct/app/talkback/
22+
rm -Rf $MountPointProduct/priv-app/Contacts/
1523

1624
echo "Copying GApps files to system..."
1725
cp -f -a $GAppsOutputFolder/app/* $InstallDir/app
@@ -27,7 +35,10 @@ find $InstallDir/priv-app -exec chown root:root {} &>/dev/null \;
2735
find $InstallDir/framework -exec chown root:root {} &>/dev/null \;
2836
find $InstallDir/lib -exec chown root:root {} &>/dev/null \;
2937
find $InstallDir/lib64 -exec chown root:root {} &>/dev/null \;
38+
find $MountPointProduct/app -exec chown root:root {} &>/dev/null \;
39+
find $MountPointProduct/etc -exec chown root:root {} &>/dev/null \;
3040
find $MountPointProduct/overlay -exec chown root:root {} &>/dev/null \;
41+
find $MountPointProduct/priv-app -exec chown root:root {} &>/dev/null \;
3142

3243
echo "Setting directory permissions"
3344
find $InstallDir/app -type d -exec chmod 755 {} \;
@@ -36,7 +47,10 @@ find $InstallDir/priv-app -type d -exec chmod 755 {} \;
3647
find $InstallDir/framework -type d -exec chmod 755 {} \;
3748
find $InstallDir/lib -type d -exec chmod 755 {} \;
3849
find $InstallDir/lib64 -type d -exec chmod 755 {} \;
50+
find $MountPointProduct/app -type d -exec chmod 755 {} \;
51+
find $MountPointProduct/etc -type d -exec chmod 755 {} \;
3952
find $MountPointProduct/overlay -type d -exec chmod 755 {} \;
53+
find $MountPointProduct/priv-app -type d -exec chmod 755 {} \;
4054

4155
echo "Setting file permissions"
4256
find $InstallDir/app -type f -exec chmod 644 {} \;
@@ -48,7 +62,10 @@ find $InstallDir/etc/permissions -type f -exec chmod 644 {} \;
4862
find $InstallDir/etc/default-permissions -type f -exec chmod 644 {} \;
4963
find $InstallDir/etc/preferred-apps -type f -exec chmod 644 {} \;
5064
find $InstallDir/etc/sysconfig -type f -exec chmod 644 {} \;
65+
find $MountPointProduct/app -type f -exec chmod 644 {} \;
66+
find $MountPointProduct/etc -type f -exec chmod 644 {} \;
5167
find $MountPointProduct/overlay -type f -exec chmod 644 {} \;
68+
find $MountPointProduct/priv-app -type f -exec chmod 644 {} \;
5269

5370
echo "Applying SELinux security contexts to directories"
5471
find $InstallDir/app -type d -exec chcon --reference=$InstallDir/app {} \;
@@ -60,7 +77,10 @@ find $InstallDir/etc/permissions -type d -exec chcon --reference=$InstallDir/etc
6077
find $InstallDir/etc/default-permissions -type d -exec chcon --reference=$InstallDir/etc/permissions {} \;
6178
find $InstallDir/etc/preferred-apps -type d -exec chcon --reference=$InstallDir/etc/permissions {} \;
6279
find $InstallDir/etc/sysconfig -type d -exec chcon --reference=$InstallDir/etc/sysconfig {} \;
80+
find $MountPointProduct/app -type d -exec chcon --reference=$MountPointProduct/app {} \;
81+
find $MountPointProduct/etc/permissions -type d -exec chcon --reference=$MountPointProduct/etc/permissions {} \;
6382
find $MountPointProduct/overlay -type d -exec chcon --reference=$MountPointVendor/overlay {} \;
83+
find $MountPointProduct/priv-app -type d -exec chcon --reference=$MountPointProduct/priv-app {} \;
6484

6585
echo "Applying SELinux security contexts to files"
6686
find $InstallDir/framework -type f -exec chcon --reference=$InstallDir/framework/ext.jar {} \;
@@ -72,7 +92,10 @@ find $InstallDir/etc/permissions -type f -exec chcon --reference=$InstallDir/etc
7292
find $InstallDir/etc/default-permissions -type f -exec chcon --reference=$InstallDir/etc/fs_config_dirs {} \;
7393
find $InstallDir/etc/preferred-apps -type f -exec chcon --reference=$InstallDir/etc/fs_config_dirs {} \;
7494
find $InstallDir/etc/sysconfig -type f -exec chcon --reference=$InstallDir/etc/fs_config_dirs {} \;
95+
find $MountPointProduct/app -type f -exec chcon --reference=$MountPointProduct/app/ModuleMetadata/ModuleMetadata.apk {} \;
96+
find $MountPointProduct/etc/permissions -type f -exec chcon --reference=$MountPointProduct/etc/permissions/privapp-permissions-venezia.xml {} \;
7597
find $MountPointProduct/overlay -type f -exec chcon --reference=$MountPointVendor/overlay/framework-res__auto_generated_rro_vendor.apk {} \;
98+
find $MountPointProduct/priv-app -type f -exec chcon --reference=$MountPointProduct/priv-app/amazon-adm-release/amazon-adm-release.apk {} \;
7699

77100
echo "Applying SELinux policy"
78101
# Sed will remove the SELinux policy for plat_sepolicy.cil, preserve policy using cp

extend_and_mount_images.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo "chk product.img"
1212
e2fsck -f $ImagesRoot/product.img
1313

1414
echo "Resizing product.img"
15-
resize2fs $ImagesRoot/product.img 240M
15+
resize2fs $ImagesRoot/product.img 1024M
1616

1717
echo "chk system.img"
1818
e2fsck -f $ImagesRoot/system.img

extract_gapps_pico.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ echo "Merging subfolders"
2929
for D in $GAppsOutputFolder/*; do [ -d "${D}" ] && cp -r ${D}/* $GAppsOutputFolder && rm -rf ${D}; done
3030

3131
echo "Post merge operation"
32-
mv -i $GAppsOutputFolder/product/ $GAppsRoot/product_output/
32+
cp -ra $GAppsOutputFolder/product/* $GAppsRoot/product_output/
3333

3434
echo "Deleting temporary files"
3535
rm -rf $GAppsTmpFolder

0 commit comments

Comments
 (0)