diff options
author | Xin Li <delphij@google.com> | 2019-07-01 20:59:10 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2019-07-01 20:59:10 +0000 |
commit | 71d92e827b6dc156dea5da053cf22f589f644f26 (patch) | |
tree | 46fe9947159debd039b518d41669cb23cbacc34d | |
parent | f040ceb3f6169eda2efbd4799eeac1ae012b29ae (diff) | |
parent | f093e520c67fc895975b4e500e074d760a22ef6b (diff) | |
download | muskie-71d92e827b6dc156dea5da053cf22f589f644f26.tar.gz |
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I4cf198b11f6194235cb7e8432cb6b9fda0fb13cc
-rw-r--r-- | WCNSS_qcom_cfg.ini | 2 | ||||
-rw-r--r-- | audio_platform_info_tavil.xml | 12 | ||||
-rw-r--r-- | device-common.mk | 23 | ||||
-rw-r--r-- | device-walleye.mk | 3 | ||||
-rw-r--r-- | init-common.rc | 25 | ||||
-rw-r--r-- | powerhint.json | 517 | ||||
-rw-r--r-- | recovery/Android.bp | 38 | ||||
-rw-r--r-- | recovery/recovery_ui.cpp | 58 | ||||
-rw-r--r-- | self-extractors/extract-lists.txt | 3 | ||||
-rw-r--r-- | self-extractors/qcom/staging/device-partial.mk | 3 | ||||
-rwxr-xr-x | thermal-engine.conf | 13 | ||||
-rw-r--r-- | thermal_info_config.json | 214 | ||||
-rw-r--r-- | walleye/BoardConfig.mk | 7 | ||||
-rw-r--r-- | walleye/overlay/frameworks/base/core/res/res/values/config.xml | 4 | ||||
-rw-r--r-- | walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml | 2 | ||||
-rw-r--r-- | walleye/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml | 22 |
16 files changed, 916 insertions, 30 deletions
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 9f945f1..3397494 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -313,7 +313,7 @@ g_enable_probereq_whitelist_ies=1 # g_probe_req_ie_bitmap_0=0x00000000 #[] (default) # g_probe_req_ie_bitmap_1=0x80000009 #[32, 35, 63] g_probe_req_ie_bitmap_0=0x0000000B -# g_probe_req_ie_bitmap_1=0x00000000 +g_probe_req_ie_bitmap_1=0x00040000 # g_probe_req_ie_bitmap_2=0x00000000 # g_probe_req_ie_bitmap_3=0x00000000 # g_probe_req_ie_bitmap_4=0x00000000 diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 101c821..219f7dc 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -122,18 +122,24 @@ <app uc_type="PCM_CAPTURE" mode="default" bit_width="24" id="69940" max_rate="96000" /> <app uc_type="PCM_CAPTURE" mode="voip" bit_width="16" id="69945" max_rate="48000" /> </app_types> + <!-- Mandatory microphone characteristics include: device_id, type, --> + <!-- address, location, group, index_in_the_group, directionality, --> + <!-- num_frequency_responses, frequencies and responses. --> + <!-- Optional microphone characteristics include: Sensitivity, max_spl, --> + <!-- min_spl, orientation and geometric_location. If missing they will --> + <!-- be populated as unknown. --> <microphone_characteristics> - <microphone valid_mask="31" device_id="builtin_mic_1" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="bottom" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" + <microphone device_id="builtin_mic_1" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="bottom" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" group="0" index_in_the_group="0" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256" frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98" responses="-0.23 -0.26 -0.09 -0.28 -0.46 -0.32 -0.06 0.10 -0.28 -0.41 -0.07 0.21 0.34 0.30 0.25 0.15 0.06 0.07 0.22 0.31 0.45 0.63 0.97 1.21 0.86 0.65 0.74 0.80 0.85 1.06 1.38 1.14 0.77 1.31 1.54 1.63 1.74 1.71 1.52 1.43 1.53 1.99 2.00 1.63 1.75 1.44 1.11 1.21 0.77 0.83 0.89 0.72 0.40 0.70 0.45 0.28 0.62 0.14 0.58 0.37 -0.11 -0.44 0.09 -0.65 -0.58 -0.28 -0.26 0.37 0.58 1.32 1.21 2.02 2.06 2.61 2.57 3.16 3.02 2.87 2.88 2.68 2.65 2.34 2.39 2.54 2.48 1.65 1.14 0.70 0.89 0.19 -0.62 -0.82 -1.17 -1.16 -1.26 -0.66 0.27 0.48 1.28 1.53 1.93 2.14 2.37 1.95 1.60 1.87 1.50 1.71 0.98 0.83 0.08 0.20 0.30 0.64 0.50 0.53 1.18 1.59 1.73 1.64 2.32 1.66 0.61 0.19 0.56 1.85 0.85 1.58 1.92 2.43 1.99 3.69 2.60 1.52 0.76 -0.41 0.24 1.43 0.74 2.95 3.42 4.31 5.74 3.68 3.30 2.89 4.54 4.18 2.47 0.86 -0.55 -1.71 0.90 1.25 2.66 3.38 0.95 5.23 1.42 1.90 3.38 4.70 5.37 3.67 3.75 1.72 5.67 1.36 3.03 7.54 6.71 3.45 0.58 1.22 6.80 5.61 5.71 1.37 -2.06 4.23 5.43 3.43 0.46 2.00 4.63 3.30 3.09 2.44 3.93 4.73 5.21 5.52 5.90 4.01 5.06 5.48 8.03 9.33 5.17 4.77 6.23 6.26 6.78 6.95 6.29 8.82 5.60 4.80 2.16 6.09 2.90 6.41 7.52 7.85 6.48 5.12 6.13 7.79 5.50 9.06 7.82 9.98 9.14 10.36 9.29 9.01 6.95 10.98 11.82 12.02 11.49 13.30 11.53 12.65 13.53 12.21 12.64 14.07 14.12 14.71 15.08 16.27 17.73 17.54 18.24 16.64 17.24 17.17 16.96 16.25 18.65 17.64 14.89 15.97 32.20 19.96" sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0225 0.0081 0.0078" /> - <microphone valid_mask="31" device_id="builtin_mic_2" type="AUDIO_DEVICE_IN_BACK_MIC" address="back" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" + <microphone device_id="builtin_mic_2" type="AUDIO_DEVICE_IN_BACK_MIC" address="back" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" group="0" index_in_the_group="1" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256" frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98" responses="0.26 0.06 -0.08 -0.16 -0.05 0.01 0.17 0.42 0.14 -0.12 -0.10 0.03 0.10 0.10 0.15 0.19 0.22 0.30 0.32 0.38 0.58 0.65 0.66 0.67 0.70 0.72 0.71 0.67 0.64 0.64 0.62 0.58 0.69 1.18 1.43 1.56 1.62 1.62 1.47 1.38 1.29 1.20 1.16 1.08 1.02 0.97 0.90 1.00 0.92 0.93 1.00 0.89 0.83 0.75 0.66 0.52 0.42 0.34 0.14 0.08 -0.02 -0.13 -0.31 -0.26 -0.29 -0.25 -0.20 -0.09 0.14 0.40 0.68 0.91 1.33 1.54 1.66 1.70 1.58 1.47 1.43 1.23 1.14 0.95 0.76 0.56 0.49 0.46 0.55 0.79 0.83 0.72 0.39 -0.08 -0.53 -1.12 -1.54 -1.45 -1.04 -0.31 0.45 0.97 1.28 1.32 1.06 0.89 0.85 1.03 0.97 1.17 1.22 0.87 0.42 0.00 -0.21 -0.30 -0.53 -0.44 -0.29 -0.08 -0.19 -0.13 0.47 1.50 1.52 1.02 0.65 1.49 1.34 1.33 1.61 1.67 1.25 1.44 0.98 1.00 -0.19 -0.70 0.55 2.94 3.57 3.66 4.40 4.83 5.15 4.47 4.13 3.09 3.07 2.74 2.90 2.69 2.24 -0.23 -1.56 -2.65 2.11 4.98 4.40 5.14 4.56 3.83 3.83 5.48 5.16 3.72 5.59 5.17 6.04 5.29 4.75 6.05 5.01 4.38 5.05 4.15 4.29 6.15 5.19 3.46 2.81 3.79 7.34 7.00 4.97 6.03 7.99 7.16 6.91 6.88 8.80 9.80 8.47 9.28 11.02 10.61 8.48 10.60 11.31 8.03 12.39 13.00 11.19 13.69 15.42 14.80 15.64 17.39 15.16 18.50 19.69 20.50 22.19 24.75 27.10 26.67 23.02 23.53 21.02 19.62 15.29 15.92 14.64 14.70 13.45 14.84 16.10 12.79 10.10 11.98 10.10 10.43 11.41 9.03 6.82 8.51 8.93 8.36 9.46 10.04 10.97 10.47 7.52 7.22 6.89 7.20 7.59 7.79 6.69 7.30 7.55 8.43 9.19 10.27 8.05 7.88 18.67 11.77" sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.0212 0.1457 0.0041" /> - <microphone valid_mask="31" device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="top" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" + <microphone device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="top" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" group="0" index_in_the_group="2" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="256" frequencies="99.61 102.54 105.47 108.40 111.33 114.26 117.19 120.12 123.05 125.98 128.91 131.84 134.77 137.70 140.63 143.55 146.48 149.41 152.34 155.27 158.20 161.13 164.06 166.99 169.92 172.85 175.78 178.71 181.64 184.57 187.50 190.43 193.36 199.22 202.15 205.08 210.94 213.87 219.73 222.66 228.52 234.38 237.30 243.16 249.02 254.88 257.81 263.67 269.53 275.39 281.25 287.11 292.97 298.83 307.62 313.48 319.34 325.20 333.98 339.84 345.70 354.49 360.35 369.14 377.93 383.79 392.58 401.37 410.16 418.95 427.73 436.52 445.31 454.10 462.89 474.61 483.40 495.12 503.91 515.63 524.41 536.13 547.85 559.57 571.29 583.01 594.73 609.38 621.09 632.81 647.46 662.11 673.83 688.48 703.13 717.77 732.42 750.00 764.65 779.30 796.88 814.45 832.03 846.68 867.19 884.77 902.34 922.85 940.43 960.94 981.45 1001.95 1022.46 1042.97 1066.41 1089.84 1110.35 1133.79 1157.23 1183.59 1207.03 1233.40 1259.77 1286.13 1312.50 1338.87 1368.16 1397.46 1426.76 1456.05 1485.35 1517.58 1549.80 1582.03 1617.19 1649.41 1684.57 1719.73 1754.88 1792.97 1831.05 1869.14 1907.23 1948.24 1989.26 2030.27 2074.22 2118.16 2162.11 2206.05 2252.93 2299.80 2349.61 2399.41 2449.22 2499.02 2551.76 2607.42 2660.16 2715.82 2774.41 2833.01 2891.60 2953.13 3014.65 3079.10 3143.55 3208.01 3275.39 3345.70 3416.02 3486.33 3559.57 3635.74 3711.91 3791.02 3870.12 3952.15 4034.18 4119.14 4204.10 4291.99 4382.81 4476.56 4570.31 4666.99 4763.67 4863.28 4965.82 5071.29 5176.76 5285.16 5396.48 5510.74 5625.00 5745.12 5865.23 5988.28 6114.26 6243.16 6372.07 6506.84 6644.53 6785.16 6925.78 7072.27 7221.68 7371.09 7526.37 7684.57 7845.70 8012.70 8179.69 8352.54 8528.32 8707.03 8888.67 9076.17 9266.60 9462.89 9659.18 9864.26 10069.34 10283.20 10497.07 10719.73 10945.31 11173.83 11408.20 11648.44 11891.60 12143.55 12398.44 12659.18 12925.78 13195.31 13473.63 13757.81 14044.92 14340.82 14642.58 14950.20 15263.67 15583.01 15911.13 16245.12 16587.89 16936.52 17291.02 17654.30 18026.37 18404.30 18791.02 19186.52 19590.82 20000.98" responses="-1.45 -1.74 -1.62 -1.75 -1.67 -1.48 -1.69 -1.91 -1.82 -1.75 -1.49 -1.36 -1.35 -1.27 -1.19 -1.19 -1.09 -1.11 -1.27 -1.27 -1.11 -0.83 -0.56 -0.57 -0.58 -0.47 -0.51 -0.57 -0.63 -0.64 -0.55 -0.68 -0.76 0.01 0.32 0.41 0.29 0.43 0.12 -0.14 0.23 0.16 0.18 0.09 -0.02 -0.14 -0.12 -0.40 -0.43 -0.15 -0.21 -0.42 -0.54 -0.33 -0.46 -0.80 -0.66 -0.71 -0.77 -0.96 -1.28 -1.32 -1.27 -1.37 -1.49 -1.47 -1.43 -1.28 -1.11 -0.79 -0.72 -0.45 0.30 0.47 0.90 0.95 0.95 0.94 0.75 0.65 0.83 0.24 0.11 0.00 0.08 -0.13 -0.44 0.18 0.43 0.43 0.18 0.00 -0.31 -0.80 -1.14 -0.72 -0.76 -0.50 -0.08 0.25 0.88 0.75 0.79 0.66 0.63 0.68 0.52 0.87 1.03 0.67 0.14 0.10 0.17 0.37 0.45 0.33 0.13 0.26 0.42 0.74 1.24 2.22 1.95 1.79 1.46 2.64 2.69 1.25 2.12 2.39 3.18 3.51 3.19 3.16 2.61 2.39 3.43 4.79 5.43 6.08 7.01 7.05 5.81 5.07 4.19 3.89 3.46 3.45 3.20 3.52 4.61 4.17 4.05 4.68 4.64 5.46 6.00 7.41 6.59 5.77 6.67 7.74 5.93 6.17 8.07 7.02 9.90 7.96 6.70 8.76 9.04 7.09 8.24 8.27 9.35 6.82 5.38 6.28 6.10 8.48 6.25 6.74 5.10 7.17 7.83 3.66 5.75 7.68 6.52 7.64 9.37 8.45 10.19 10.18 9.60 9.90 10.89 10.56 12.34 10.02 12.48 9.36 12.95 10.50 10.50 11.81 10.16 8.86 8.92 9.29 9.84 12.21 12.31 13.39 11.54 12.38 12.10 13.03 10.77 13.94 14.73 15.59 15.73 17.14 17.77 15.20 14.12 15.84 13.98 17.79 19.86 18.31 17.22 17.24 16.79 15.97 16.11 15.90 17.19 17.55 15.84 13.70 16.01 15.66 14.27 15.13 15.95 14.48 14.71 14.88 15.13 13.25 13.74 10.18 9.94 11.96" diff --git a/device-common.mk b/device-common.mk index 53c97d4..14b8a57 100644 --- a/device-common.mk +++ b/device-common.mk @@ -79,15 +79,7 @@ PRODUCT_COPY_FILES += \ include device/google/wahoo/device.mk # Kernel modules -ifeq (,$(filter-out walleye_gcc, $(TARGET_PRODUCT))) -# if TARGET_PRODUCT == *_gcc -BOARD_VENDOR_KERNEL_MODULES += \ - device/google/wahoo-kernel/gcc/synaptics_dsx_core_htc.ko \ - device/google/wahoo-kernel/gcc/synaptics_dsx_rmi_dev_htc.ko \ - device/google/wahoo-kernel/gcc/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/gcc/htc_battery.ko \ - device/google/wahoo-kernel/gcc/wlan.ko -else ifeq (,$(filter-out walleye_kasan, $(TARGET_PRODUCT))) +ifeq (,$(filter-out walleye_kasan, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == *_kasan BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/synaptics_dsx_core_htc.ko \ @@ -95,14 +87,6 @@ BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/synaptics_dsx_fw_update_htc.ko \ device/google/wahoo-kernel/kasan/htc_battery.ko \ device/google/wahoo-kernel/kasan/wlan.ko -else ifeq (,$(filter-out walleye_kcfi, $(TARGET_PRODUCT))) -# if TARGET_PRODUCT == *_kcfi -BOARD_VENDOR_KERNEL_MODULES += \ - device/google/wahoo-kernel/kcfi/synaptics_dsx_core_htc.ko \ - device/google/wahoo-kernel/kcfi/synaptics_dsx_rmi_dev_htc.ko \ - device/google/wahoo-kernel/kcfi/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/kcfi/htc_battery.ko \ - device/google/wahoo-kernel/kcfi/wlan.ko else ifeq (,$(filter-out walleye_kernel_debug_memory, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_memory BOARD_VENDOR_KERNEL_MODULES += \ @@ -162,6 +146,9 @@ PRODUCT_COPY_FILES += \ device/google/muskie/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \ device/google/muskie/thermal-engine-vr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-vr.conf +PRODUCT_COPY_FILES += \ + device/google/muskie/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json + # Wifi configuration file PRODUCT_COPY_FILES += \ device/google/muskie/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini @@ -173,3 +160,5 @@ PRODUCT_PROPERTY_OVERRIDES += \ # NFC/camera interaction workaround - DO NOT COPY TO NEW DEVICES PRODUCT_PROPERTY_OVERRIDES += \ ro.camera.notify_nfc=1 + +PRODUCT_CHECK_ELF_FILES := true diff --git a/device-walleye.mk b/device-walleye.mk index 46d86c2..e1dec8d 100644 --- a/device-walleye.mk +++ b/device-walleye.mk @@ -37,3 +37,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ persist.traced.enable=1 +# Thermal HAL +PRODUCT_COPY_FILES += \ + device/google/muskie/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json diff --git a/init-common.rc b/init-common.rc index 0dcc3f0..f10721d 100644 --- a/init-common.rc +++ b/init-common.rc @@ -48,3 +48,28 @@ on property:persist.vendor.charge.stop.level=* && property:sys.all.modules.ready on property:persist.vendor.charge.start.level=* && property:sys.all.modules.ready=1 write /sys/module/htc_battery/parameters/charge_start_level ${persist.vendor.charge.start.level} + +# Write the dark theme magic (`theme-dark`, or 0x7468656d652d6461726b in hex string) to /misc +# partition. Offset 12360 (0x3048) in vendor space is effectively offset 14408 (0x3848) in /misc +# partition. +service vendor.darkboot /vendor/bin/misc_writer --vendor-space-offset 12360 --hex-string 0x7468656d652d6461726b + disabled + oneshot + +# Clear the 10-byte dark theme magic in /misc partition. Offset 0 in vendor space is effectively +# offset 2048 in /misc partition. +service vendor.darkboot_clear /vendor/bin/misc_writer --vendor-space-offset 12360 --hex-string 0x00000000000000000000 + disabled + oneshot + +# Set the dark boot flag on dark mode (UiModeManager.MODE_NIGHT_YES == 2). +on property:persist.sys.theme=2 + start vendor.darkboot + +# Clear the dark theme flag on light mode (UiModeManager.MODE_NIGHT_NO == 1) or auto mode +# (UiModeManager.MODE_NIGHT_AUTO == 0). +on property:persist.sys.theme=1 + start vendor.darkboot_clear + +on property:persist.sys.theme=0 + start vendor.darkboot_clear diff --git a/powerhint.json b/powerhint.json new file mode 100644 index 0000000..462a5aa --- /dev/null +++ b/powerhint.json @@ -0,0 +1,517 @@ +{ + "Nodes": [ + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "1900800", + "1555200", + "1478400", + "1248000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "1900800", + "1555200", + "1512000", + "1478400", + "1134000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "2457600", + "1958400", + "1574400", + "1344000", + "1267200" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "2457600", + "1574400", + "1420800", + "1344000", + "1132800", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMaxFreq", + "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/max_freq", + "Values": [ + "342000000", + "414000000", + "515000000", + "710000000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/min_freq", + "Values": [ + "515000000", + "414000000", + "257000000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUBusMinFreq", + "Path": "/sys/class/devfreq/soc:qcom,gpubw/min_freq", + "Values": [ + "11863", + "7759", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TASchedtuneBoost", + "Path": "/dev/stune/top-app/schedtune.boost", + "Values": [ + "50", + "10" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBWHystTriggerCount", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_trigger_count", + "Values": [ + "0", + "3" + ] + }, + { + "Name": "CPUBWHistMemory", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hist_memory", + "Values": [ + "0", + "20" + ] + }, + { + "Name": "CPUBWHystLength", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/bw_hwmon/hyst_length", + "Values": [ + "0", + "10" + ] + }, + { + "Name": "CPUBWMinFreq", + "Path": "/sys/devices/soc/soc:qcom,cpubw/devfreq/soc:qcom,cpubw/min_freq", + "Values": [ + "13763", + "5195", + "1525", + "762" + ], + "ResetOnInit": true + }, + { + "Name": "PMQoSCpuDmaLatency", + "Path": "/dev/cpu_dma_latency", + "Values": [ + "44", + "100" + ], + "HoldFd": true + }, + { + "Name": "PowerHALMainState", + "Path": "vendor.powerhal.state", + "Values": [ + "CAMERA_STREAMING", + "VR_SUSTAINED_PERFORMANCE", + "SUSTAINED_PERFORMANCE", + "VR_MODE", + "" + ], + "Type": "Property" + }, + { + "Name": "PowerHALAudioState", + "Path": "vendor.powerhal.audio", + "Values": [ + "AUDIO_LOW_LATENCY", + "" + ], + "Type": "Property" + }, + { + "Name": "ThermalConfig", + "Path": "vendor.qcom.thermalcfg", + "Values": [ + "/vendor/etc/thermal-engine-vr.conf", + "/vendor/etc/thermal-engine.conf" + ], + "Type": "Property", + "ResetOnInit": true + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + } + ], + "Actions": [ + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "SUSTAINED_PERFORMANCE" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1267200" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1248000" + }, + { + "PowerHint": "SUSTAINED_PERFORMANCE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "342000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "VR_MODE" + }, + { + "PowerHint": "VR_MODE", + "Node": "ThermalConfig", + "Duration": 0, + "Value": "/vendor/etc/thermal-engine-vr.conf" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1574400" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1574400" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1555200" + }, + { + "PowerHint": "VR_MODE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1555200" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "515000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "515000000" + }, + { + "PowerHint": "VR_MODE", + "Node": "GPUBusMinFreq", + "Duration": 0, + "Value": "11863" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "VR_MODE" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "ThermalConfig", + "Duration": 0, + "Value": "/vendor/etc/thermal-engine-vr.conf" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1344000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1344000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1478400" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1478400" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUMaxFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "414000000" + }, + { + "PowerHint": "VR_SUSTAINED_PERFORMANCE", + "Node": "GPUBusMinFreq", + "Duration": 0, + "Value": "7759" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "1132800" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "1134000" + }, + { + "PowerHint": "INTERACTION", + "Node": "TASchedtuneBoost", + "Duration": 0, + "Value": "50" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHystTriggerCount", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHystLength", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWHistMemory", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBWMinFreq", + "Duration": 0, + "Value": "5195" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "2457600" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 5000, + "Value": "2457600" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 5000, + "Value": "1900800" + }, + { + "PowerHint": "LAUNCH", + "Node": "PMQoSCpuDmaLatency", + "Duration": 5000, + "Value": "44" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHystTriggerCount", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHystLength", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWHistMemory", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBWMinFreq", + "Duration": 5000, + "Value": "13763" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "1900800" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMQoSCpuDmaLatency", + "Duration": 1000, + "Value": "44" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "PowerHALMainState", + "Duration": 0, + "Value": "CAMERA_STREAMING" + }, + { + "PowerHint": "CAMERA_STREAMING", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1958400" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "2457600" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "1900800" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "PMQoSCpuDmaLatency", + "Duration": 1000, + "Value": "44" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHystTriggerCount", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHystLength", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWHistMemory", + "Duration": 1000, + "Value": "0" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBWMinFreq", + "Duration": 1000, + "Value": "13763" + }, + { + "PowerHint": "AUDIO_STREAMING", + "Node": "CPUBigClusterMinFreq", + "Duration": 2000, + "Value": "1420800" + }, + { + "PowerHint": "AUDIO_STREAMING", + "Node": "PMQoSCpuDmaLatency", + "Duration": 2000, + "Value": "44" + }, + { + "PowerHint": "AUDIO_LOW_LATENCY", + "Node": "PowerHALAudioState", + "Duration": 0, + "Value": "AUDIO_LOW_LATENCY" + }, + { + "PowerHint": "AUDIO_LOW_LATENCY", + "Node": "PMQoSCpuDmaLatency", + "Duration": 0, + "Value": "44" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "0" + } + ] +} diff --git a/recovery/Android.bp b/recovery/Android.bp new file mode 100644 index 0000000..fffe848 --- /dev/null +++ b/recovery/Android.bp @@ -0,0 +1,38 @@ +// +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +cc_library_static { + name: "librecovery_ui_walleye", + owner: "google", + cflags: [ + "-Wall", + "-Wextra", + "-Werror", + "-pedantic", + ], + srcs: [ + "recovery_ui.cpp", + ], + + static_libs: [ + "libbootloader_message", + ], + + shared_libs: [ + "libbase", + "librecovery_ui", + ], +} diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp new file mode 100644 index 0000000..0ac214f --- /dev/null +++ b/recovery/recovery_ui.cpp @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <string> + +#include <android-base/logging.h> +#include <bootloader_message/bootloader_message.h> +#include <recovery_ui/device.h> +#include <recovery_ui/screen_ui.h> + +// Wipes the provisioned flag as part of data wipe. +static bool WipeProvisionedFlag() { + // Must be consistent with the one in init.hardware.rc (10-byte `theme-dark`). The magic is at + // 0x3048 in vendor space, or (0x800 + 0x3048) since the start of /misc. + const std::string wipe_str(10, '\x00'); + constexpr size_t kProvisionedFlagOffsetInVendorSpace = 0x3048; + if (std::string err; !WriteMiscPartitionVendorSpace( + wipe_str.data(), wipe_str.size(), kProvisionedFlagOffsetInVendorSpace, &err)) { + LOG(ERROR) << "Failed to write wipe string: " << err; + return false; + } + LOG(INFO) << "Provisioned flag wiped successful"; + return true; +} + +class WalleyeDevice : public Device { + public: + WalleyeDevice(ScreenRecoveryUI* ui) : Device(ui) {} + + // Hook to wipe user data not stored in /data. + bool PostWipeData() override { + // Try to do everything but report a failure if anything wasn't successful. + bool total_success = true; + auto ui = GetUI(); + ui->Print("Wiping provisioned flag...\n"); + if (!WipeProvisionedFlag()) { + total_success = false; + } + return total_success; + } +}; + +Device* make_device() { + return new WalleyeDevice(new ScreenRecoveryUI); +} diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt index 099f866..4ec19ed 100644 --- a/self-extractors/extract-lists.txt +++ b/self-extractors/extract-lists.txt @@ -26,7 +26,6 @@ system/lib64/lib-imsvtextutils.so \ system/lib64/lib-imsvt.so \ system/lib64/lib-imsvtutils.so \ - system/lib64/libiperf.so \ system/lib64/librcc.so \ system/lib/com.qualcomm.qti.imsrtpservice@1.0.so \ system/lib/libdiag_system.so \ @@ -36,8 +35,6 @@ system/lib/lib-imsvtextutils.so \ system/lib/lib-imsvt.so \ system/lib/lib-imsvtutils.so \ - system/lib/libiperf.so \ system/lib/librcc.so \ - system/xbin/iperf3 \ " ;; diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index 49293f3..b0c2f16 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -35,7 +35,6 @@ PRODUCT_COPY_FILES := \ vendor/qcom/walleye/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so:qcom \ vendor/qcom/walleye/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so:qcom \ vendor/qcom/walleye/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/libiperf.so:system/lib64/libiperf.so:qcom \ vendor/qcom/walleye/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \ vendor/qcom/walleye/proprietary/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ vendor/qcom/walleye/proprietary/libdiag_system.so:system/lib/libdiag_system.so:qcom \ @@ -45,6 +44,4 @@ PRODUCT_COPY_FILES := \ vendor/qcom/walleye/proprietary/lib-imsvtextutils.so:system/lib/lib-imsvtextutils.so:qcom \ vendor/qcom/walleye/proprietary/lib-imsvt.so:system/lib/lib-imsvt.so:qcom \ vendor/qcom/walleye/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \ - vendor/qcom/walleye/proprietary/libiperf.so:system/lib/libiperf.so:qcom \ vendor/qcom/walleye/proprietary/librcc.so:system/lib/librcc.so:qcom \ - vendor/qcom/walleye/proprietary/iperf3:system/xbin/iperf3:qcom \ diff --git a/thermal-engine.conf b/thermal-engine.conf index ef41dad..fa98894 100755 --- a/thermal-engine.conf +++ b/thermal-engine.conf @@ -59,6 +59,15 @@ thresholds_clr 49000 51000 53000 actions cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report action_info 1094400+1190400+414000000+1 883200+902400+342000000+1 300000+300000+257000000+1 +[MNH-MONITOR] +algo_type monitor +sampling 2000 +sensor back_therm +thresholds 50000 52000 +thresholds_clr 49000 51000 +actions mnh mnh +action_info 3 4 + [BATTERY-MONITOR] algo_type monitor sampling 2000 @@ -72,8 +81,8 @@ action_info 3 algo_type monitor sampling 1000 sensor back_therm -thresholds 56000 -thresholds_clr 55000 +thresholds 58000 +thresholds_clr 57000 actions shutdown action_info 1 diff --git a/thermal_info_config.json b/thermal_info_config.json new file mode 100644 index 0000000..25f95d0 --- /dev/null +++ b/thermal_info_config.json @@ -0,0 +1,214 @@ +{ + "Sensors":[ + { + "Name":"tsens_tz_sensor1", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor2", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor4", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor3", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor7", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor8", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor9", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor10", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"tsens_tz_sensor13", + "Type":"GPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + 95.0, + "NAN", + "NAN", + 125.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1 + }, + { + "Name":"battery", + "Type":"BATTERY", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + 60.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_port_temp", + "Type":"USB_PORT", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "70.0", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 0.0, + 5.0, + 0.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.1, + "Monitor":true + }, + { + "Name":"back_therm", + "Type":"SKIN", + "HotThreshold":[ + "NAN", + 40.0, + 47.0, + 50.0, + 52.0, + 54.0, + 56.0 + ], + "HotHysteresis":[ + 0.0, + 2.0, + 2.0, + 2.0, + 2.0, + 2.0, + 2.0 + ], + "VrThreshold":52.0, + "Multiplier":1.0, + "Monitor":true + } + ], + "CoolingDevices":[ + { + "Name":"thermal-cpufreq-0", + "Type":"CPU" + }, + { + "Name":"thermal-cpufreq-1", + "Type":"CPU" + } + ] +} diff --git a/walleye/BoardConfig.mk b/walleye/BoardConfig.mk index 66725e3..cd1e5c2 100644 --- a/walleye/BoardConfig.mk +++ b/walleye/BoardConfig.mk @@ -33,3 +33,10 @@ BOARD_LISA_TARGET_SCRIPTS := device/google/wahoo/lisa/ # VTS DTBO Verification. This kernel cmdline parameter should be added by the bootloader # for all future devices. BOARD_KERNEL_CMDLINE += androidboot.dtbo_idx=3 + +BOARD_EXT4_SHARE_DUP_BLOCKS := true + +TARGET_RECOVERY_UI_LIB := \ + librecovery_ui_walleye \ + libbootloader_message \ + libfstab diff --git a/walleye/overlay/frameworks/base/core/res/res/values/config.xml b/walleye/overlay/frameworks/base/core/res/res/values/config.xml index 93d1a80..bae87f1 100644 --- a/walleye/overlay/frameworks/base/core/res/res/values/config.xml +++ b/walleye/overlay/frameworks/base/core/res/res/values/config.xml @@ -186,6 +186,10 @@ <!-- Whether the display blanks itself when transitioning from a doze to a non-doze state --> <bool name="config_displayBlanksAfterDoze">true</bool> + <!-- Delay that allows some content to arrive at the display before switching + from DOZE to ON. --> + <integer name="config_wakeUpDelayDoze">50</integer> + <!-- If true, the doze component is not started until after the screen has been turned off and the screen off animation has been performed. --> <bool name="config_dozeAfterScreenOff">true</bool> diff --git a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 3fac0ad..d1c664d 100644 --- a/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/walleye/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -169,7 +169,7 @@ </array> <!-- Additional power used when screen is ambient mode --> - <item name="ambient.on">23.69</item> + <item name="ambient.on">19</item> <!-- Additional power used when screen is turned on at minimum brightness --> <item name="screen.on">131.397</item> diff --git a/walleye/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/walleye/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml new file mode 100644 index 0000000..4114c28 --- /dev/null +++ b/walleye/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2019, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources> + <!-- Default for Settings.Global.APPLY_RAMPING_RINGER --> + <bool name="def_apply_ramping_ringer">false</bool> +</resources> |