修复swap开机自启动失败

Author: helloklf

app/build.gradle

@@ -22,7 +22,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 30
         versionCode 202107051
-        versionName "4.4.13"
+        versionName "4.4.13 Beta"
         externalNativeBuild {
             cmake {
                 cppFlags ""

app/src/main/assets/addin/swap_control.sh

@@ -1,5 +1,3 @@
-#!/system/bin/sh
-
 swapfile=/data/swapfile
 action="$1"     # 操作(脚本中的函数名)
 loop="$2"       # 是否挂载为loop设备
@@ -8,8 +6,9 @@ swapsize="$4"   # SWAP大小MB
 
 loop_save="vtools.swap.loop"
 next_loop_path=""
+
 # 获取下一个loop设备的索引
-function get_next_loop() {
+get_next_loop() {
     local current_loop=`getprop $loop_save`
 
     if [[ "$current_loop" != "" ]]
@@ -52,7 +51,7 @@ else
 fi
 
 # 关闭swap（如果正在使用，那可不是一般的慢）
-diable_swap() {
+disable_swap() {
 	swapoff $swap_mount >/dev/null 2>&1
 
     if [[ $loop == "1" ]]; then
@@ -64,8 +63,7 @@ diable_swap() {
 
 # 开启SWAP
 enable_swap() {
-  if [[ ! -f $swapfile ]]
-  then
+  if [[ ! -f $swapfile ]]; then
     if [[ "$swapsize" = "" ]]; then
       swapsize=256
     fi
@@ -82,8 +80,8 @@ enable_swap() {
     setprop $loop_save $next_loop_path
   fi
 
-	mkswap $swap_mount >/dev/null 2>&1 # 初始化
-	if [[ "$priority" != "" ]]; then
+  mkswap $swap_mount >/dev/null 2>&1 # 初始化
+  if [[ "$priority" != "" ]]; then
 
     # zram_priority=`cat /proc/swaps | grep /zram0 | sed 's/[ \t][ ]*/,/g' | cut -f5 -d ','`
     zram_info=`cat /proc/swaps | grep /zram0`
@@ -104,14 +102,18 @@ enable_swap() {
       fi
     fi
 
-    swapon $swap_mount -p "$priority" >/dev/null 2>&1   # 开启
+    if [[ "$priority" -lt 0 ]]; then
+      swapon $swap_mount >/dev/null 2>&1                  # 开启
+    else
+      swapon $swap_mount -p "$priority" >/dev/null 2>&1   # 开启
+    fi
   else
     swapon $swap_mount >/dev/null 2>&1                  # 开启
-	fi
+  fi
 
-	echo 100 > /proc/sys/vm/overcommit_ratio
-	echo 100 > /proc/sys/vm/swap_ratio
-	echo 0 > /proc/sys/panic_on_oom
+  echo 100 > /proc/sys/vm/overcommit_ratio
+  echo 100 > /proc/sys/vm/swap_ratio
+  echo 0 > /proc/sys/panic_on_oom
 }
 
 "$action"

app/src/main/assets/powercfg/lahaina/active.sh

@@ -44,7 +44,6 @@ if [[ "$action" = "powersave" ]]; then
   cpuset '0-2' '0-3' '0-3' '0-7'
   stune_top_app 0 0
   cpuctl top-app 0 1 0 max
-  echo 75000000 > /sys/class/devfreq/1d84000.ufshc/max_freq
 
 
 elif [[ "$action" = "balance" ]]; then
@@ -61,7 +60,6 @@ elif [[ "$action" = "balance" ]]; then
   cpuset '0-2' '0-3' '0-6' '0-7'
   stune_top_app 0 0
   cpuctl top-app 0 1 0.1 max
-  echo 300000000 > /sys/class/devfreq/1d84000.ufshc/max_freq
 
 
 elif [[ "$action" = "performance" ]]; then
@@ -76,7 +74,6 @@ elif [[ "$action" = "performance" ]]; then
   cpuset '0-1' '0-3' '0-6' '0-7'
   stune_top_app 1 0
   cpuctl top-app 0 1 0.5 max
-  echo 300000000 > /sys/class/devfreq/1d84000.ufshc/max_freq
 
 
 elif [[ "$action" = "fast" ]]; then
@@ -91,7 +88,6 @@ elif [[ "$action" = "fast" ]]; then
   cpuset '0' '0-3' '0-6' '0-7'
   stune_top_app 1 50
   cpuctl top-app 0 1 max max
-  echo 300000000 > /sys/class/devfreq/1d84000.ufshc/max_freq
 
 
 fi

app/src/main/assets/powercfg/lahaina/conservative.sh

@@ -44,7 +44,6 @@ if [[ "$action" = "powersave" ]]; then
   cpuset '0-2' '0-3' '0-3' '0-7'
   stune_top_app 0 0
   cpuctl top-app 0 0 0 max
-  echo 75000000 > /sys/class/devfreq/1d84000.ufshc/max_freq
 
 
 elif [[ "$action" = "balance" ]]; then
@@ -62,7 +61,6 @@ elif [[ "$action" = "balance" ]]; then
   stune_top_app 0 0
   # cpuctl top-app 0 1 0.1 max
   cpuctl top-app 0 1 0 max
-  echo 300000000 > /sys/class/devfreq/1d84000.ufshc/max_freq
 
 
 elif [[ "$action" = "performance" ]]; then
@@ -77,7 +75,6 @@ elif [[ "$action" = "performance" ]]; then
   cpuset '0-1' '0-3' '0-6' '0-7'
   stune_top_app 0 0
   cpuctl top-app 0 1 0.25 max
-  echo 300000000 > /sys/class/devfreq/1d84000.ufshc/max_freq
 
 
 elif [[ "$action" = "fast" ]]; then
@@ -92,7 +89,6 @@ elif [[ "$action" = "fast" ]]; then
   cpuset '0' '0-3' '0-6' '0-7'
   stune_top_app 1 0
   cpuctl top-app 0 1 max max
-  echo 300000000 > /sys/class/devfreq/1d84000.ufshc/max_freq
 
 
 fi

app/src/main/java/com/omarea/library/shell/SwapUtils.kt

@@ -75,7 +75,7 @@ class SwapUtils(private val context: Context) {
     }
 
     // 启动swap
-    fun swapOn(priority: Int, useLoop: Boolean = false): String {
+    fun swapOn(priority: Int, useLoop: Boolean = false, keepShell: KeepShell): String {
         val sb = StringBuilder()
 
         sb.append("sh ")
@@ -91,8 +91,15 @@ class SwapUtils(private val context: Context) {
             sb.append(priority)
         }
 
+        return keepShell.doCmdSync(sb.toString())
+    }
+
+    // 启动swap
+    fun swapOn(priority: Int, useLoop: Boolean = false): String {
         val keepShell = KeepShell()
-        val result = keepShell.doCmdSync(sb.toString())
+
+        val result = swapOn(priority, useLoop, keepShell)
+
         keepShell.tryExit()
         return result
     }
@@ -103,7 +110,7 @@ class SwapUtils(private val context: Context) {
 
         sb.append("sh ")
         sb.append(swapControlScript)
-        sb.append(" diable_swap ")
+        sb.append(" disable_swap ")
         if (sceneSwaps.contains("loop")) {
             sb.append("1")
         } else {
@@ -121,7 +128,7 @@ class SwapUtils(private val context: Context) {
 
         sb.append("sh ")
         sb.append(swapControlScript)
-        sb.append(" diable_swap ")
+        sb.append(" disable_swap ")
         if (sceneSwaps.contains("loop")) {
             sb.append("1")
         } else {

app/src/main/java/com/omarea/vtools/popup/FloatMonitor.kt

@@ -196,10 +196,8 @@ class FloatMonitor(private val mContext: Context) {
 
     private var activityManager: ActivityManager? = null
     private var myHandler = Handler(Looper.getMainLooper())
-    private var batteryUnit = BatteryUtils()
     private val info = ActivityManager.MemoryInfo()
 
-    private var sum = -1
     private var totalMem = 0
     private var availMem = 0
     private var coreCount = -1;
@@ -213,6 +211,13 @@ class FloatMonitor(private val mContext: Context) {
     private val boldStyleSpan = StyleSpan(Typeface.BOLD)
     private val whiteSpan = ForegroundColorSpan(Color.WHITE)
 
+    private fun whiteBoldSpan(text: String): SpannableString {
+        return SpannableString(text).apply {
+            setSpan(whiteSpan, 0, text.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            setSpan(boldStyleSpan, 0, text.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        }
+    }
+
     private fun updateInfo() {
         if (coreCount < 1) {
             coreCount = CpuFrequencyUtil.getCoreCount()
@@ -265,33 +270,22 @@ class FloatMonitor(private val mContext: Context) {
             availMem = (info.availMem / 1024 / 1024f).toInt()
             val ramInfoText = "#RAM  " + ((totalMem - availMem) * 100 / totalMem).toString() + "%"
 
-            otherInfoBuilder.append(SpannableString(ramInfoText).apply {
-                setSpan(whiteSpan, 0, ramInfoText.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                setSpan(boldStyleSpan, 0, ramInfoText.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-            })
+            otherInfoBuilder.append(whiteBoldSpan(ramInfoText))
             otherInfoBuilder.append("\n")
 
             if (gpuMemoryUsage != null) {
-                gpuMemoryUsage = "#GMEM " + gpuMemoryUsage
-                otherInfoBuilder.append(SpannableString(gpuMemoryUsage).apply {
-                    setSpan(whiteSpan, 0, gpuMemoryUsage.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                    setSpan(boldStyleSpan, 0, gpuMemoryUsage.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                })
+                otherInfoBuilder.append(whiteBoldSpan("#GMEM " + gpuMemoryUsage))
                 otherInfoBuilder.append("\n")
             }
 
-            var clusterIndex = 0
-            for (cluster in clusters) {
+            for ((clusterIndex, cluster) in clusters.withIndex()) {
                 if (clusterIndex != 0) {
                     otherInfoBuilder.append("\n")
                 }
-                if (cluster.size > 0) {
+                if (cluster.isNotEmpty()) {
                     try {
                         val title = "#" + cluster[0] + "~" + cluster[cluster.size - 1] + "  " + subFreqStr(clustersFreq.get(clusterIndex)) + "Mhz";
-                        otherInfoBuilder.append(SpannableString(title).apply {
-                            setSpan(whiteSpan, 0, title.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                            setSpan(boldStyleSpan, 0, title.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                        })
+                        otherInfoBuilder.append(whiteBoldSpan(title))
 
                         val otherInfos = StringBuilder("")
                         for (core in cluster) {
@@ -310,28 +304,21 @@ class FloatMonitor(private val mContext: Context) {
                     } catch (ex: Exception) {
                     }
                 }
-                clusterIndex++
             }
 
             fpsUtils.currentFps?.run {
                 otherInfoBuilder.append("\n")
 
                 val fpsInfo = "#FPS  $this"
-                otherInfoBuilder.append(SpannableString(fpsInfo).apply {
-                    setSpan(whiteSpan, 0, fpsInfo.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                    setSpan(boldStyleSpan, 0, fpsInfo.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                })
+                otherInfoBuilder.append(SpannableString(fpsInfo))
             }
 
             batteryCurrentNowMa?.run {
                 if (this > -20000 && this < 20000) {
                     otherInfoBuilder.append("\n")
 
                     val batteryInfo = "#BAT  " + (if (this > 0) ("+" + this) else this) + "mA"
-                    otherInfoBuilder.append(SpannableString(batteryInfo).apply {
-                        setSpan(whiteSpan, 0, batteryInfo.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                        setSpan(boldStyleSpan, 0, batteryInfo.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                    })
+                    otherInfoBuilder.append(SpannableString(batteryInfo))
                 }
             }
         }

app/src/main/java/com/omarea/vtools/services/BootService.kt

@@ -10,7 +10,6 @@ import android.content.SharedPreferences
 import android.os.Build
 import android.os.PowerManager
 import androidx.core.app.NotificationCompat
-import com.omarea.common.shared.FileWrite
 import com.omarea.common.shared.RawText
 import com.omarea.common.shell.KeepShell
 import com.omarea.common.shell.KernelProrp
@@ -19,6 +18,7 @@ import com.omarea.data.EventType
 import com.omarea.library.shell.BatteryUtils
 import com.omarea.library.shell.LMKUtils
 import com.omarea.library.shell.PropsUtils
+import com.omarea.library.shell.SwapUtils
 import com.omarea.scene_mode.ModeSwitcher
 import com.omarea.scene_mode.SceneMode
 import com.omarea.store.CpuConfigStorage
@@ -192,18 +192,17 @@ class BootService : IntentService("vtools-boot") {
             KernelProrp.setProp("/sys/block/zram0/comp_algorithm", value)
         }
 
-    fun enableSwap(keepShell: KeepShell, context: Context) {
+    private fun enableSwap(keepShell: KeepShell, context: Context) {
         updateNotification(getString(R.string.boot_swapon))
-        val swapControlScript = FileWrite.writePrivateShellFile("addin/swap_control.sh", "addin/swap_control.sh", context)
         val swapPriority = swapConfig.getInt(SpfConfig.SWAP_SPF_SWAP_PRIORITY, -2)
-        val useLoop = if (swapConfig.getBoolean(SpfConfig.SWAP_SPF_SWAP_USE_LOOP, false)) "1" else "0"
-        keepShell.doCmdSync("sh $swapControlScript enable_swap $useLoop $swapPriority\n")
+        val useLoop = swapConfig.getBoolean(SpfConfig.SWAP_SPF_SWAP_USE_LOOP, false)
+        SwapUtils(context).swapOn(swapPriority, useLoop, keepShell)
     }
 
     /**
      * swapFirst：是否已开启可优先使用的swap，如果未开启，则在调整zram前，先将swappiness调为0，避免在回收时还在写入zram，导致回收时间变长！
      */
-    fun resizeZram(sizeVal: Int, algorithm: String = "", keepShell: KeepShell, swapFirst: Boolean = false) {
+    private fun resizeZram(sizeVal: Int, algorithm: String = "", keepShell: KeepShell, swapFirst: Boolean = false) {
         val currentSize = keepShell.doCmdSync("cat /sys/block/zram0/disksize")
         if (currentSize != "" + (sizeVal * 1024 * 1024L) || (algorithm.isNotEmpty() && algorithm != compAlgorithm)) {
             val sb = StringBuilder()

app/src/main/res/values/strings.xml

@@ -33,7 +33,7 @@
     <string name="share_link">你也来试试Scene吧，我觉得还不错，下载地址：\n http://vtools.omarea.com/</string>
     <!--<string name="feedback_link">mqqwpa://im/chat?chat_type=wpa&amp;uin=1191634433</string>-->
 
-    <string name="app_name">Scene4</string>
+    <string name="app_name">Scene4 Beta</string>
     <string name="app_name_short">Scene4</string>
     <string name="app_name_mode_switch">Scene-快速切换模式</string>