Merge branch 'master' into 'master'
Goes with corresponding UI PR - Give apkd and rpm usage expandedPath values that will allow them to be subtracted from the correct parent. Fixes JB#34897. - Drop the -x flag to 'du'. It prevented the android_storage subdir from being included in the /home/nemo total. - Automatically chop off '/home/.android' prefix on Jolla1. - Drop the automatic substitution of '/data/media' for '/home/nemo/android_storage' to ensure expandedPath is correct. Contributes to JB#31444. See merge request !13
Showing with 25 additions and 16 deletions