|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea.spec
|
|
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/audio.conf
^
|
| @@ -1,63 +0,0 @@
-# Configuration file for the audio service
-
-# This section contains options which are not specific to any
-# particular interface
-[General]
-#Enable=Gateway
-# Switch to master role for incoming connections (defaults to true)
-#Master=true
-
-# If we want to disable support for specific services
-# Defaults to supporting all implemented services
-#Disable=Gateway,Source,Socket
-
-# SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
-# Defaults to HCI
-#SCORouting=PCM
-
-# Automatically connect both A2DP and HFP/HSP profiles for incoming
-# connections. Some headsets that support both profiles will only connect the
-# other one automatically so the default setting of true is usually a good
-# idea.
-#AutoConnect=true
-
-# Headset interface specific options (i.e. options which affect how the audio
-# service interacts with remote headset devices)
-[Headset]
-
-# Set to true to support HFP, false means only HSP is supported
-# Defaults to true
-HFP=true
-
-# Maximum number of connected HSP/HFP devices per adapter. Defaults to 1
-MaxConnected=1
-
-# Set to true to enable use of fast connectable mode (faster page scanning)
-# for HFP when incoming call starts. Default settings are restored after
-# call is answered or rejected. Page scan interval is much shorter and page
-# scan type changed to interlaced. Such allows faster connection initiated
-# by a headset.
-FastConnectable=false
-
-# Just an example of potential config options for the other interfaces
-#[A2DP]
-#SBCSources=1
-#MPEG12Sources=0
-
-# Limit features advertised to headsets
-[Telephony]
-Disable=ConferenceCalling,InBandRingtone,EnhancedCallControl
-
-# Where to retrieve battery charge info from
-BatteryInfo=Statefs
-
-# Where to retrieve last dialed number from
-LastDialedNumber=/home/nemo/.cache/last-dialed
-
-# Configure AVRCP features: TG category 1, CT disabled
-[AVRCP]
-EnableTarget=true
-TargetVersion=0x0100
-DisableTargetFeatures=Category2,Category3,Category4,PlayerSettings
-
-EnableControl=false
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/input.conf
^
|
| @@ -1,9 +0,0 @@
-# Configuration file for the input service
-
-# This section contains options which are not specific to any
-# particular interface
-[General]
-
-# Set idle timeout (in minutes) before the connection will
-# be disconnect (defaults to 0 for no timeout)
-#IdleTimeout=30
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/jolla.conf
^
|
| @@ -1,5 +0,0 @@
-[General]
-Wakelocks=true
-
-[Security]
-DBusAuthorizedGroups=root,privileged
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/main.conf
^
|
| @@ -1,65 +0,0 @@
-[General]
-
-# List of plugins that should not be loaded on bluetoothd startup
-#DisablePlugins = network,input
-
-# Default adaper name
-# %h - substituted for hostname
-# %d - substituted for adapter id
-Name=
-
-# Default device class. Only the major and minor device class bits are
-# considered.
-# Phone, smart-phone
-Class = 0x00020c
-
-# How long to stay in discoverable mode before going back to non-discoverable
-# The value is in seconds. Default is 180, i.e. 3 minutes.
-# 0 = disable timer, i.e. stay discoverable forever
-DiscoverableTimeout = 0
-
-# How long to stay in pairable mode before going back to non-discoverable
-# The value is in seconds. Default is 0.
-# 0 = disable timer, i.e. stay pairable forever
-PairableTimeout = 0
-
-# Use some other page timeout than the controller default one
-# which is 16384 (10 seconds).
-PageTimeout = 8192
-
-# Automatic connection for bonded devices driven by platform/user events.
-# If a platform plugin uses this mechanism, automatic connections will be
-# enabled during the interval defined below. Initially, this feature
-# intends to be used to establish connections to ATT channels.
-AutoConnectTimeout = 60
-
-# What value should be assumed for the adapter Powered property when
-# SetProperty(Powered, ...) hasn't been called yet. Defaults to true
-InitiallyPowered = true
-
-# Remember the previously stored Powered state when initializing adapters
-RememberPowered = true
-
-# Use vendor id source (assigner), vendor, product and version information for
-# DID profile support. The values are separated by ":" and assigner, VID, PID
-# and version.
-# Possible vendor id source values: bluetooth, usb (defaults to usb)
-#DeviceID = bluetooth:1234:5678:abcd
-
-# Do reverse service discovery for previously unknown devices that connect to
-# us. This option is really only needed for qualification since the BITE tester
-# doesn't like us doing reverse SDP for some test cases (though there could in
-# theory be other useful purposes for this too). Defaults to true.
-ReverseServiceDiscovery = true
-
-# Enable name resolving after inquiry. Set it to 'false' if you don't need
-# remote devices name and want shorter discovery cycle. Defaults to 'true'.
-NameResolving = true
-
-# Enable runtime persistency of debug link keys. Default is false which
-# makes debug link keys valid only for the duration of the connection
-# that they were created for.
-DebugKeys = false
-
-# Enable the GATT functionality. Default is false
-EnableGatt = false
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/network.conf
^
|
| @@ -1,6 +0,0 @@
-# Configuration file for the network service
-
-[General]
-
-# Disable link encryption: default=false
-#DisableSecurity=true
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/rfcomm.conf
^
|
| @@ -1,17 +0,0 @@
-#
-# RFCOMM configuration file.
-#
-
-#rfcomm0 {
-# # Automatically bind the device at startup
-# bind no;
-#
-# # Bluetooth address of the device
-# device 11:22:33:44:55:66;
-#
-# # RFCOMM channel for the connection
-# channel 1;
-#
-# # Description of the connection
-# comment "Example Bluetooth device";
-#}
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/serial.conf
^
|
| @@ -1,10 +0,0 @@
-# Configuration file for serial
-
-# There could be multiple proxy sections, the format is [Proxy <user chosen name>]
-#[Proxy DUN]
-
-# UUID for DUN proxy service
-#UUID=00001103-0000-1000-8000-00805F9B34FB
-
-# Address for device node
-#Address=/dev/ttyx
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/pulse/bluez4_stream_restore.pa
^
|
| @@ -1,2 +0,0 @@
-### Bluez4 specific module arguments
-load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false sink_volume_table=/etc/pulse/x-maemo-sink-volume.table
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/pulse/bluez5_stream_restore.pa
^
|
| @@ -1,2 +0,0 @@
-### Bluez5 specific module arguments
-load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
| @@ -1,185 +0,0 @@
-# -------- Card section ------------------------------------------------------
-
-[card]
-type = ihfandheadset
-name = equals:$droid_card
-profile = ringtone
-
-[card]
-type = ihfandheadphone
-name = equals:$droid_card
-profile = ringtone
-
-[card]
-type = ihfandlineout
-name = equals:$droid_card
-profile = ringtone
-
-[card]
-type = headset
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = headsetforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = headsetforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
-type = headphone
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = headphoneforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = headphoneforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
-type = lineout
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = lineoutforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = lineoutforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
-type = ihfandtvout
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = ihfforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = ihf
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = ihfforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
-type = bthsp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = voicecall
-
-[card]
-type = bthspforcall
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = voicecall
-
-[card]
-type = bthspforalien
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = communication
-
-[card]
-type = bthfp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = voicecall
-
-[card]
-type = bthfpforcall
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = voicecall
-
-[card]
-type = bthfpforalien
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = communication
-
-[card]
-type = tvoutandbta2dp
-name = startswith:"bluez_card"
-profile = a2dp
-flags = disable_notify
-
-[card]
-type = bta2dp
-name0 = startswith:"bluez_card"
-profile0 = a2dp
-name1 = equals:$droid_card
-profile1 = $droid_card_profile
-
-[card]
-type = bta2dpforalien
-name0 = startswith:"bluez_card"
-profile0 = a2dp
-name1 = equals:$droid_card
-profile1 = communication
-
-# -------- Context rule section ------------------------------------------------
-
-[context-rule]
-variable = bluetooth_override
-value = equals:active
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"false"
-
-[context-rule]
-variable = bluetooth_override
-value = equals:inactive
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
-
-[context-rule]
-variable = call
-value = equals:inactive
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"false"
-
-[context-rule]
-variable = call
-value = equals:incoming
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"true"
-
-[context-rule]
-variable = call
-value = equals:outgoing
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"true"
-
-[context-rule]
-variable = call
-value = equals:inactive
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"false"
-
-[context-rule]
-variable = call
-value = equals:incoming
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
-
-[context-rule]
-variable = call
-value = equals:outgoing
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4_earpiece.conf
^
|
| @@ -1,14 +0,0 @@
-[card]
-type = earpiece
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = earpieceforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = earpieceforalien
-name = equals:$droid_card
-profile = communication
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20211105155739.42e7ed2.tar.bz2/patterns/jolla-configuration-thea.yaml
^
|
| @@ -1,10 +0,0 @@
-# Feel free to disable non-critical HA parts during devel by commenting lines out
-# Generated in hadk by executing: rpm/dhd/helpers/add_new_device.sh
-
-Description: Pattern with packages for thea configurations
-Name: jolla-configuration-thea
-Requires:
-- patterns-sailfish-device-configuration-thea
-
-Summary: Jolla Configuration thea
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -24,6 +24,10 @@
# Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25)
# packages_own_system: adaptation gets /system from rpm instead of device partition
+# Image configuration:
+# remove_sailfish_applications: set this if you do not want sailfish applications pattern
+# remove_sailfish_ui: set this if you do not want sailfish ui pattern
+
# Overwriting other configs:
# If your droid-config-$DEVICE needs to provide one or more device-specific
# configuration files, do the following:
@@ -218,36 +222,6 @@
################################################################
%if 0%{?have_bluetooth:1}
-%package bluez4
-Summary: %{rpm_device} packages for BlueZ 4
-Conflicts: droid-config-%{rpm_device}-bluez5
-Provides: %{rpm_device}-bluez-configs
-
-Requires: bluez
-Conflicts: bluez5
-
-Requires: bluez-libs
-Conflicts: bluez5-libs
-
-Requires: obexd
-Conflicts: bluez5-obexd
-
-Requires: obexd-server
-# no obexd-server equivalent in BlueZ 5, so no conflict
-
-Requires: kf5bluezqt-bluez4
-Conflicts: kf5bluezqt-bluez5
-
-Provides: bluez-configs
-Conflicts: bluez5-configs
-Obsoletes: bluez-configs-sailfish
-Obsoletes: bluez-configs-mer
-
-Requires: pulseaudio-modules-bluez4
-
-%description bluez4
-%{summary}.
-
%package bluez5
Summary: %{rpm_device} packages for BlueZ 5
Conflicts: droid-config-%{rpm_device}-bluez4
@@ -309,9 +283,12 @@
do_not_move_to_lib64=(
"firmware"
"modules"
+ "oneshot.d"
"startup"
+ "sysctl.d"
"systemd/system"
"systemd/user"
+ "sysusers.d"
"tmpfiles.d"
"udev"
)
@@ -353,7 +330,7 @@
local files=$1
local file=$2
local dorm=$3
- [ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file
+ [ "x$dorm" == "x1" ] && rm -f $RPM_BUILD_ROOT/$file
grep -vE "$file" $files > tmp/$$.files
mv tmp/$$.files $files
}
@@ -447,8 +424,6 @@
# We want to keep some files in separate subpackages.
# NOTE: some files might get to wrong place with this because of string assumption.
%if 0%{?have_bluetooth:1}
-grep bluez4 tmp/droid-config.files > tmp/bluez4.files || true
-sed --in-place '/bluez4/d' tmp/droid-config.files
grep bluez5 tmp/droid-config.files > tmp/bluez5.files || true
sed --in-place '/bluez5/d' tmp/droid-config.files
%endif
@@ -683,17 +658,10 @@
%endif
%if 0%{?have_bluetooth:1}
-%posttrans bluez4
-rm -rf /etc/bluetooth || :
-ln -s bluez4/bluetooth /etc/bluetooth || :
-
%posttrans bluez5
rm -rf /etc/bluetooth || :
ln -s bluez5/bluetooth /etc/bluetooth || :
-%files bluez4 -f tmp/bluez4.files
-%defattr(644,root,root,-)
-
%files bluez5 -f tmp/bluez5.files
%defattr(644,root,root,-)
%endif
@@ -701,8 +669,12 @@
%package -n patterns-sailfish-device-configuration-common-%{rpm_device}
Summary: Jolla Configuration common
+%if 0%{!?remove_sailfish_applications:1}
Requires: patterns-sailfish-applications
+%endif
+%if 0%{!?remove_sailfish_ui:1}
Requires: patterns-sailfish-ui
+%endif
# Sailfish OS CSD tool for hardware testing
# needs some configuration to get all features working
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse-10/usr/libexec/droid-hybris/system/etc/init/disabled_services.rc
^
|
| @@ -27,3 +27,7 @@
service vendor.usb-hal-1-0 /vendor/bin/hw/android.hardware.usb@1.0-service_HYBRIS_DISABLED
service vendor.vibrator-1-0 /vendor/bin/hw/android.hardware.vibrator@1.0-service_HYBRIS_DISABLED
+
+service update_verifier_nonencrypted /system/bin/update_verifier_HYBRIS_DISABLED nonencrypted
+
+service update_verifier /system/bin/update_verifier_HYBRIS_DISABLED ${vold.decrypt}
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse-11/usr/libexec/droid-hybris/system/etc/init/disabled_services.rc
^
|
| @@ -27,3 +27,7 @@
service vendor.usb-hal-1-2 /vendor/bin/hw/android.hardware.usb@1.2-service_HYBRIS_DISABLED
service vendor.vibrator-1-0 /vendor/bin/hw/android.hardware.vibrator@1.0-service_HYBRIS_DISABLED
+
+service update_verifier_nonencrypted /system/bin/update_verifier_HYBRIS_DISABLED nonencrypted
+
+service update_verifier /system/bin/update_verifier_HYBRIS_DISABLED ${vold.decrypt}
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/etc/ofono/binder.conf
^
|
| @@ -0,0 +1,6 @@
+[Settings]
+ExpectSlots = slot1
+
+[slot1]
+path = /ril_0
+slot = 0
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/etc/ofono/binder.d/dual-sim.conf
^
|
| @@ -0,0 +1,6 @@
+[Settings]
+ExpectSlots+=slot2
+
+[slot2]
+path = /ril_1
+slot = 1
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -55,15 +55,7 @@
load-module module-meego-mainvolume virtual_stream=true unmute_delay=600
### Automatically restore the volume of streams
-# load configuration based on bluez version
-.ifexists /etc/pulse/bluez5_stream_restore.pa
- .include /etc/pulse/bluez5_stream_restore.pa
-.else
- .include /etc/pulse/bluez4_stream_restore.pa
- # fake sco sink and source are needed only by bluez4 device
- load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
- load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
-.endif
+load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false
load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -74,7 +66,7 @@
load-module module-null-sink sink_name=sink.null rate=48000
load-module module-null-source source_name=source.null rate=48000
-load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
+load-module module-bluetooth-discover headset=droid
load-module module-policy-enforcement
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -32,6 +32,7 @@
droid_source_input_backmicrophone = input-back_mic
droid_source_input_fmradio = input-fm_tuner
droid_sink_port_change_delay = delayed_port_change
+sink_class_voip = droid.output.media_latency
delay_time = 150
# cards and profiles
droid_card = droid_card.primary
@@ -251,7 +252,7 @@
[device]
type = bthspforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->$droid_sco_output
flags = disable_notify, refresh_always, delayed_port_change
@@ -287,7 +288,7 @@
[device]
type = bthfpforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->$droid_sco_output
flags = disable_notify, refresh_always, delayed_port_change
@@ -324,7 +325,7 @@
[device]
type = headsetforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headset
flags = refresh_always
@@ -349,7 +350,7 @@
[device]
type = headphoneforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headphone
flags = refresh_always
@@ -369,7 +370,7 @@
[device]
type = lineoutforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headphone
flags = refresh_always
@@ -408,7 +409,7 @@
[device]
type = ihfforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-speaker
flags = refresh_always
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/earpiece.conf
^
|
| @@ -17,6 +17,6 @@
[device]
type = earpieceforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-earpiece
flags = refresh_always
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-reclaim-memory.sh
^
|
| @@ -0,0 +1,26 @@
+#!/bin/sh
+
+while [ "$(wc -l < /proc/swaps)" -lt 2 ]; do
+ sleep 1
+done
+
+TASKS=$(cat /sys/fs/cgroup/systemd/system.slice/*/cgroup.procs /sys/fs/cgroup/unified/system.slice/*/cgroup.procs /sys/fs/cgroup/system.slice/*/cgroup.procs)
+
+for task in $TASKS; do
+ echo "all" > /proc/"$task"/reclaim
+done
+
+DONE_FILE="/tmp/.droid-reclaim-memory-ran"
+
+if [ ! -f $DONE_FILE ]; then
+ # right after first login, no user apps are running yet
+ # reclaim also from the user session.
+ TASKS=$(cat /sys/fs/cgroup/systemd/user.slice/user-*.slice/*/cgroup.procs /sys/fs/cgroup/unified/user.slice/user-*.slice/*/cgroup.procs /sys/fs/cgroup/user.slice/user-*.slice/*/cgroup.procs)
+
+ for task in $TASKS; do
+ echo "all" > /proc/"$task"/reclaim
+ done
+
+ touch $DONE_FILE
+fi
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/usr/lib/sysctl.d/ipv4-settings.conf
^
|
| (renamed from droid-configs-device/sparse/etc/sysctl.d/ipv4-settings.conf)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/usr/lib/sysctl.d/ipv6-settings.conf
^
|
| (renamed from droid-configs-device/sparse/etc/sysctl.d/ipv6-settings.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/droid-reclaim-memory.service
^
|
| @@ -0,0 +1,13 @@
+[Unit]
+Description=Reclaim memory
+
+[Service]
+Type=oneshot
+After=init-done.service
+ExecStart=/usr/bin/droid/droid-reclaim-memory.sh
+DevicePolicy=strict
+NoNewPrivileges=yes
+PrivateTmp=yes
+ProtectHome=yes
+ProtectSystem=full
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/droid-reclaim-memory.timer
^
|
| @@ -0,0 +1,10 @@
+[Unit]
+Description=Reclaim memory once per day and on boot
+ConditionPathExists=/proc/1/reclaim
+
+[Timer]
+OnStartupSec=1s
+OnUnitActiveSec=1d
+
+[Install]
+WantedBy=timers.target
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/timers.target.wants/droid-reclaim-memory.timer
^
|
| +(symlink to ../droid-reclaim-memory.timer)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20220412184052.72377e2.tar.bz2/patterns/patterns-sailfish-device-adaptation-thea.inc
^
|
| @@ -83,8 +83,9 @@
# For GPS
Requires: geoclue-provider-hybris
-# For Mozilla location services (online)
-Requires: geoclue-provider-mlsdb
+
+# Telephony (RIL sockets)
+Requires: ofono-ril-plugin
# Fix for calls
Requires: pulseaudio-modules-droid-glue
|
