openkylin
/
device_google_redfin
mirror of https://gitee.com/openkylin/device_google_redfin.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
671 Commits 1 Branch 1 Tag 12 MiB
Commit Graph

671 Commits

Author SHA1 Message Date
Jason Hsu ea0d0e4cd2 audio: update acdb table 
Change list:
1. WAV PTL topology added in id 513
2. No mic HE volume table update
3. HANDSET_TRI_MIC (ID46)
     - change TOPO into AUDIO_TX_MONO_COPP on GENERAL_RECORDING app types
     - Set the mic gain and IIR & MBDRC parameters for three mic recording
4. For HANDSET_MIC_STEREO (ID34)
     - keep preGain_settings[0] & preGain_settings[1] in IIR module as "1" and set others as "0"
5. HA WB/SWB/FB Robustness
6. HAFB (voip) NS optimization

Bug: 156719506
Test: Verified by H/W
Signed-off-by: Jason Hsu <jasonchhsu@google.com>
Change-Id: I18e217de12336dddcb3c9d61ec7a9dfc933544f9
 2020-05-29 21:22:38 +08:00
TreeHugger Robot 37feddecf0 Merge "audio: redfin: seperate sound_trigger_mixer_paths.xml table" into rvc-d1-dev 
Change-Id: I06f3da1e7ccb34e60daa451c3523326523951fec
Change-Id: Ie5d9a9fd1fe1a4554b543150ba4a8afd0bf56412
Change-Id: I9b959a602e51f4b325aa985204fcd14c0a3f4170
Change-Id: I4fdd7866fa70afcf9043b23a57dca24c3f0b770e
Change-Id: I495e522f5fe52850975534bc66c65cd06e23755a
 2020-05-29 21:22:35 +08:00
TreeHugger Robot af49589c6d Merge "fingerprint: Include FP HIDL 2.2 in mk file" into rvc-dev am: aa423ac8da 
Change-Id: I4fd819412eeb9f428d6f5d6dd927c12818ff9b98
 2020-05-29 21:22:34 +08:00
Jason Hsu 5b7922e7cc audio: redfin: seperate sound_trigger_mixer_paths.xml table 
Bug: 156272507
Test: manual test
Signed-off-by: Jason Hsu <jasonchhsu@google.com>
Change-Id: I12f16c2ab0be614d313037d033c7e27612d99cb9
 2020-05-29 21:22:34 +08:00
TreeHugger Robot bf2caad5ef Merge "fingerprint: Include FP HIDL 2.2 in mk file" into rvc-dev 
Change-Id: I6042d616e709428692a6ea8e9bd3afdffc3dde5a
Change-Id: I3c62a05700dbb01421a901dbcd60c2b3d66ce38e
Change-Id: Id8b0d193d475a92132ed83871ad5e88e431b489a
Change-Id: Ide7d923d7e913d747a957af1b90248aa0d7a3476
 2020-05-29 21:22:33 +08:00
eddielan ae8869086f fingerprint: Include FP HIDL 2.2 in mk file 
Bug: 155257998
Test: Build Pass, onAcquried_2_2() works as expection
Change-Id: Ib9e10bb0af0b65ce7cc45fde81013859b3a848eb
 2020-05-29 21:22:33 +08:00
Justin Weng 34a7a1fdac Merge "thermal: add thermal sensors for panel audio throttling" into rvc-dev am: 8b793a6aa3 
Change-Id: Ie01bb041d2b4d79fefdfc498b43b9fb13684c94a
 2020-05-29 21:22:32 +08:00
Justin Weng 417ac61e2d Merge "thermal: add thermal sensors for panel audio throttling" into rvc-dev 
Change-Id: I050ad7afd4fc2df98fd0a742ec02e42ba78c2cfc
Change-Id: I3ed09e21677ccdc3affeeaaa4bb8a0a8f7e184e7
Change-Id: I0a9bf6c6bb108c34971089cae07bcaacf329feb6
Change-Id: I73fec288a43cdc2404d4fc2a8fe30c78ecaefffa
 2020-05-29 21:22:32 +08:00
Justin Weng d7db92276a Merge "audio: apply thermal listener config" into rvc-d1-dev 
Change-Id: I8bc79fc148d3a73830c518e664e46a41794db6e5
Change-Id: Id567520db3cb96ea9bbe6258f94ebc78189b8c7f
Change-Id: Ied34bfd0eeebb4ff98b2ac5920e0b61c3af30553
Change-Id: I94ea1a569d1934d568fdbf9c49238f382c02f654
Change-Id: I8d16ece93aa32ee662168361c325e1f052f9fed0
 2020-05-29 21:22:31 +08:00
TeYuan Wang d6616de80c thermal: add thermal sensors for panel audio throttling 
Add panel-audio-therm for audio hal to detect Tskin temperature and sdm-therm to detect system power.
Bug: 143265000
Test: Panel audio throttling can be triggered
Change-Id: I5e0d659deca4d50d7a142b2efbf030c284de8784
 2020-05-29 21:22:31 +08:00
TreeHugger Robot 3b4b885dc8 Merge "audio: correct routing order for voip output" into rvc-dev am: 68f60253e9 
Change-Id: Ifb5bbbfcd00ecedc825f677213558e2b143f8c7b
 2020-05-29 21:22:30 +08:00
justinweng 13f7ecaf13 audio: apply thermal listener config 
- apply PTL in acdb for speaker path
- add thermal listener configuration
- enable thermal listener

Bug: 143265000
Test: manual

Signed-off-by: justinweng <justinweng@google.com>
Change-Id: I7426e9febf678b1e50f511fdd89ded6902347175
 2020-05-29 21:22:30 +08:00
TreeHugger Robot 0fee5bd3b0 Merge "audio: correct routing order for voip output" into rvc-dev 
Change-Id: I4af3d410d283a8c8e1eaf87da5910172089d9ba5
Change-Id: Ib288791e4db20174c31f8bdc59423b04f216f0e3
Change-Id: I0e32c8237aba29e870b6d3aa55b1a0f5a3d89256
Change-Id: Ieec74248b8f8424a8a4372f47acf1eed20976f6b
 2020-05-29 21:22:29 +08:00
Jasmine Cha d8c4c1184d audio: correct routing order for voip output 
Routing primary output before voip_rx output will cause unexpected
RX/TX path suddenly and unmuted voice stream during when system
plays touch sound and switches path between handset and handsfree.

Bug: 154290829
Test: manual test in VoIP

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: Ia60802ec887f0dfeaa0f93d151ba2f2c50e0d41d
 2020-05-29 21:22:29 +08:00
Sam Ou 948da2f4b9 Merge "power_profile: Correct CPU topology, battery and power number" into rvc-dev am: 2aeb6154d3 
Change-Id: I372591b33c148c6f202f32e2b3cd498a5f73962d
 2020-05-29 21:22:28 +08:00
Sam Ou 842ea59e28 Merge "power_profile: Correct CPU topology, battery and power number" into rvc-dev 
Change-Id: Ieaed9428acea73c3674028420a10ae36c6355dad
Change-Id: I931c58d961d644fe57af0eae071b591fc6b8c1c8
Change-Id: I5dd48c22165edb2ed43d79caf475c49e70089c96
Change-Id: I29bdb4da4fcb5f29ec3c650dd163dfc08911685b
 2020-05-29 21:22:28 +08:00
TreeHugger Robot ce453833e8 Merge "audio: update mixer path table" into rvc-d1-dev 
Change-Id: I312af868d1c3083b57109c43450997efe47b087d
Change-Id: I828273d4dc44aea0ce4d78a725b33d96b01f4a32
Change-Id: I0b4634aee5726167a2ba4cef5d669154246a932c
Change-Id: If9c87e4c1119ecaad09a7946902e1da0be92dd3a
 2020-05-29 21:22:27 +08:00
Sam Ou cb7464ac65 power_profile: Correct CPU topology, battery and power number 
Bug: 155988446
Change-Id: Ia542e04b679fcd00b47093bb78dfd1a752924d8c
Signed-off-by: samou <samou@google.com>
 2020-05-29 21:22:27 +08:00
Howard Yen 4b39e552fd Update USB Gadget HAL to V1.1 implementation am: b1eb3c4c18 
Change-Id: I7df27bf5bba949b06541591f68683c36e1267f63
 2020-05-29 21:22:26 +08:00
Jason Hsu 12173e3a15 audio: update mixer path table 
1. Change HAC mode config
<path name="voice-hac-handset">
        <path name="handset" />
        <ctl name="PCM Source" value="ASP" />
        <ctl name="AMP PCM Gain" value="0" />

2. Change 3 mic
<!-- Tri MIC devices -->
    <path name=""three-mic"">
        <ctl name=""ADC1 Capture Volume"" id=""0"" value=""23""/>
        <ctl name=""ADC2 Capture Volume"" id=""0"" value=""23""/>
        <ctl name=""ADC2 Capture Volume"" id=""1"" value=""23""/>
        <ctl name=""PRI TDM TX Channel Offset"" id=""0"" value=""12""/>
        <ctl name=""PRI TDM TX Channel Offset"" id=""1"" value=""8"" />
        <ctl name=""PRI TDM TX Channel Offset"" id=""2"" value=""0"" />
        <ctl name=""PRI_TDM_TX_0 Channels"" value=""Three""/>
        <ctl name=""Sto1 ADC MIXL DMIC Switch"" value=""1"" />
        <ctl name=""Sto2 ADC MIXL DMIC Switch"" value=""1"" />
        <ctl name=""Sto2 ADC MIXR DMIC Switch"" value=""1"" />
        <ctl name=""Stereo1 DMIC Mux"" value=""DMIC1"" />
        <ctl name=""Stereo2 DMIC Mux"" value=""DMIC2"" />
    </path>

Bug: 145244105
Test: Verified H/W
Signed-off-by: Jason Hsu <jasonchhsu@google.com>
Change-Id: I0e70431f3fe9bf488150dc935b95bea2d034cf8d
 2020-05-29 21:22:26 +08:00
Jason Hsu 2cecb14c5d audio: update acdb tables 
The change list is as below:
1. HHFB TX: improve noise suppression (subjective)
2. HHWB TX: improve noise suppression (ATT15909)
3. HE NB/WB/FB TX: echo improvement (subjective)
4. HE FB RX: reduce 2dB
5. HE SWB TX: echo improvement + improvement noise suppression (subjective)
6. HA-TMUS adjusted back to HA-Generic settings

Test: verified by H/W
Bug: 156219729
Signed-off-by: Jason Hsu <jasonchhsu@google.com>
Change-Id: Ib98af7ab403d440cef12d517242659724cbc2b84
 2020-05-29 21:22:25 +08:00
Howard Yen 31b4aa302c Update USB Gadget HAL to V1.1 implementation 
Bug: 138702846
Test: build pass, function works
Change-Id: I82a74d31f4339e4b4b8c59d879871550b943a36e
 2020-05-29 21:22:25 +08:00
Chenglu Lin 4918e8ee68 Select vintf kernel for user build 
Disable debugfs only to pass VINTF compliance for user build
and keep other debug capability still.

Bug: 155999580
Test: compile and check kernel config
Change-Id: Ie60d050f8a1771f07085f22e8bbd67e9323ca199
 2020-05-29 21:22:25 +08:00
Blake Kragten b7eaa3d9a6 Update Power Profile For Redfin 
Estimated power constants: https://docs.google.com/spreadsheets/d/1dHcJC1xCqZkbe3-rOkm91jr4Pyr1-56NBNg4d7aSeTw/edit?usp=drive_web&ouid=103882653818665213772

Bug: 155925796
Test: On Device
Change-Id: Icb4746f49fc08ec164d53cfb1d31d3897b034e6b
 2020-05-29 21:22:24 +08:00
TreeHugger Robot 9973c620af Merge "UsbGadget: change the permission" into rvc-d1-dev 
Change-Id: Ic592edf88e1d968d522dd678e743e665923d06f1
Change-Id: Id20a54684192ef209065b6c9b8abdc0d1d8cc7de
Change-Id: Ibab4d5cf5765af74aa82c91d37e8e42656b83940
Change-Id: I5a578b7b422753b0fbdb4ac6d3cc11e16e83a0ff
 2020-05-29 21:22:24 +08:00
Justin Weng 563aaaf612 Merge "audio: temporarily disabling auido-ull-playback feature" into rvc-dev am: 98c7535354 
Change-Id: I2c8ab31499a84fac9cb0be8701d0ef6d483dd98e
 2020-05-29 21:22:23 +08:00
raychi 7103885af8 UsbGadget: change the permission 
There is no necessary to get root permission for USB Hal.
Therefore, this commit will remove the root permission.

Bug: 154895957
Test: build pass and verified USB HAL
Change-Id: Ib88e4dc124a8b5b803989b51c2e8c085d9b2e65e
 2020-05-29 21:22:23 +08:00
Justin Weng 1d8d3a2925 Merge "audio: temporarily disabling auido-ull-playback feature" into rvc-dev 
Change-Id: I0e8d847d9b2c0b396dce9bf90ece3c6017dc5eb8
Change-Id: I4dcde23c80399e4c68b66fecbc62249c74f08196
Change-Id: If051a94e587f4a66b4fab95131b6b7a8fd496690
Change-Id: I8b63f57e22f6233b99a8198ec48a9b884e7ab9d4
 2020-05-29 21:22:22 +08:00
justinweng a06658e335 audio: temporarily disabling auido-ull-playback feature 
ULL playback does not enable COPP in the ADSP, meaning there is no
MaxxAudio tuning enabled. This means the vibration filtering in place in
MaxxAudio is not present in ULL, resulting in high vibration levels
which will cause discomfort in the user's hand.

Temporarily disabling the ULL feature to avoid this path being opened.
ULL will be re-enabled once the main fix is ready.

Bug: 155357554
Test: manual

Signed-off-by: justinweng <justinweng@google.com>
Change-Id: I59aa5848e3bb92a03fcd368c045cc8fe158ff626
 2020-05-29 21:22:22 +08:00
TreeHugger Robot b40e5fc813 Merge "audio: update acdb files" into rvc-dev am: dcfbf4132d 
Change-Id: I0f4de641fe6279a6665c6b86131715a3b3b21b86
 2020-05-29 21:22:21 +08:00
TreeHugger Robot aa54becf5a Merge "audio: update acdb files" into rvc-dev 
Change-Id: I28a1f264fe0211d3b5d0340f7aa32855acb51ec1
Change-Id: Ib2c5e84e2b163c13ca13acc5c71fbb2e776b0a53
Change-Id: I41179ade6ec2d563bcf918cfe2315dc1f47dadf0
Change-Id: I797bc469e21fb3978c9b5e6e7daec04ba49dceac
 2020-05-29 21:22:21 +08:00
TreeHugger Robot b874b9ce7e Merge changes from topic "p20-moisture-detection-control" into rvc-d1-dev 
* changes:
  Do not enable Moisture Detection if vendor prop is set
  Do not moisture detection when uart is enabled.
Change-Id: I3dd43bd33ce73331e8b1aa65aefbec709cbb0bac
Change-Id: I552310560557b4f63b0d1f26ee46be0dfdab8e2d
Change-Id: I1042633f0502bdc6e9d6d338f52199e8dd57fd82
Change-Id: I740daa5b44c4c77251417af9eff24a2562556e00
 2020-05-29 21:22:20 +08:00
Jason Hsu 3db17d1eb1 audio: update acdb files 
1. Update Mono recording parameter
2. Update the IIR parameters for camcorder use case ID 61-66
3. Update BT tuning setting (NB/WB/SWB)

Bug: 155358910
Test: verified by H/W
Signed-off-by: Jason Hsu <jasonchhsu@google.com>
Change-Id: Ie7896c8aaf3b6ff2fa810ddd0f8830419dd894ab
 2020-05-29 21:22:20 +08:00
Kyle Tso 29edf80f17 Do not enable Moisture Detection if vendor prop is set 
setprop vendor.usb.contaminantdisable true
disable contaminant detection.

Bug: 154985161
Test: setprop vendor.usb.contaminantdisable true
Change-Id: I2cfd5baab45074f2ca68216cb5d8b9790d711b75
(cherry picked from commit 21e7d5aec7e3e5b9b032b71a3153310376a46ae2)
[separated the commit into rc part and HAL part]
Signed-off-by: Kyle Tso <kyletso@google.com>
 2020-05-29 21:22:20 +08:00
Nicole Huang 31ef5467b1 Merge "Revert "Enable dark theme by defaut"" into rvc-dev am: fd5dbf92e4 
Change-Id: I84f1a9f98fe892b61ad105458023ef640919a20b
 2020-05-29 21:22:19 +08:00
Badhri Jagan Sridharan 606ee94a25 Do not moisture detection when uart is enabled. 
Bug: 154985161
Test: Tested with mock circuit. Moisture detection does not
reenable when serial uart is enabled.

Change-Id: If7d43227a603a5645d4c581477cb9c144c5e9d86
(cherry picked from commit ccc09ed8a9b826d56f685d0e618e1f3cc0403c12)
Signed-off-by: Kyle Tso <kyletso@google.com>
 2020-05-29 21:22:19 +08:00
Nicole Huang e0ec405cb8 Merge "Revert "Enable dark theme by defaut"" into rvc-dev 
Change-Id: Ia06b6443b5c6b3da0c33a803c065eff71427feaa
Change-Id: Ib7326b0b97617b62770c48a85cc4a5dcfd66202f
Change-Id: Ie3e44dc1b599e8974abd0920943ed055b8d9f9d8
Change-Id: Ifbbcb8aa28d9641e7c3f6e8b08be08c22eb00805
 2020-05-29 21:22:18 +08:00
Nicole Huang 32aa43b1a7 Revert "Enable dark theme by defaut" 
Revert submission 11049460-p20_dark_theme_by_default

Reason for revert: For P20 default dark mode will adopt the solution in b/154171431#comment19. System keep default light, let SUW to change the dark mode.
Reverted Changes:
I38c78a4ee:Enable dark theme by defaut
Ia3b0b43b5:Enable dark theme by defaut

Bug: 154171431
Change-Id: I04cc71a166093136ed2df5b16ad5e2a3a66af9fd
 2020-05-29 21:22:18 +08:00
TreeHugger Robot 839a4aa063 Merge "audio: update audio table" into rvc-dev am: 78736d07ba 
Change-Id: I77e71f5fde4d2e41b8899b212eaed44ff96a0f35
 2020-05-29 21:22:17 +08:00
TreeHugger Robot ccd04ea545 Merge "audio: update audio table" into rvc-dev 
Change-Id: Ied2a9f02b429e2c4b66dac6829c8049aefdec5d6
Change-Id: I9b8bf0521ef8f5d74b3e45e64f2194592dcb09c5
Change-Id: I5005a90bd44a2f02ea2f042435fd3c539f621bc1
Change-Id: I8143060f521466df4810e567a375bbc392f08a94
 2020-05-29 21:22:16 +08:00
Jason Hsu 9579405603 audio: update audio table 
Mixer Path:
1.
-Gain change to 0 dB
<path name="handset-mic">
        <ctl name="ADC1 Capture Volume" id="0" value="23"/>
        <ctl name="PRI_TDM_TX_0 Channels" value="One"/>
        <ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
        <ctl name="Stereo1 DMIC Mux" value="DMIC1" />
    </path>

2.
-Gain change to 0 dB
-Change 2nd mic from rear mic (mic2) to top mic (mic3)
<!-- Dual MIC devices -->
    <path name="handset-dmic-endfire">
        <ctl name="ADC1 Capture Volume" id="0" value="23"/>
        <ctl name="ADC2 Capture Volume" id="1" value="23"/>
        <ctl name="PRI TDM TX Channel Offset" id="0" value="12" />
        <ctl name="PRI TDM TX Channel Offset" id="1" value="8" />
        <ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
        <ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
        <ctl name="Sto2 ADC MIXR DMIC Switch" value="1" />
    </path>
3.
<path name="camcorder-mic-invert">
        <ctl name="ADC1 Capture Volume" id="0" value="23"/>
        <ctl name="ADC2 Capture Volume" id="0" value="23"/>
        <ctl name="ADC2 Capture Volume" id="1" value="23"/>
        <ctl name="PRI TDM TX Channel Offset" id="0" value="12" />              ---> From 8 -> 12
        <ctl name="PRI TDM TX Channel Offset" id="1" value="8" />               --->  From 12 -> 8

ACDB:
1. Recalibrate the camcorder parameters(ID61~66) for R3 EVT stage.

2. For HANDSET_MIC_STEREO (ID34)
  - change on GENERAL_RECORDING app types
  - Set the mic gain and IIR & MBDRC parameters for Stereo mic recording

3. HA EVT+ devibration tuning (test 1.5 version)
   - Volume curve change : NB/WB/SWB  (Generic/Sprint)
   - FM EQ devibration tuning : NB/WB/SWB/FB (Generic/Sprint)
   - TX SLR stable tuning: WB (Generic/Sprint/TMUS)

4. For HANDSET_MIC_MONO (ID4)
  - change the topology to AUDIO_TX_MONO_COPP on GENERAL_RECORDING app types
  - change the CHANNEL_TYPE_INFORMATION to PCM_CHANNEL_C

5. Set the mic gain and IIR & MBDRC parameters for Mono mic recording

Bug: 145244105
Bug: 155358910
Test: test by H/W

Signed-off-by: Jason Hsu <jasonchhsu@google.com>
Change-Id: Ib656d39f4c776ade7b43ae4f477c98ffdf581d2a
 2020-05-29 21:22:16 +08:00
TreeHugger Robot 3c22138a95 Merge "init: fix setprop spelling error" into rvc-d1-dev 
Change-Id: I7acd788b16fb696aacc65377f304616e87ed954f
Change-Id: Ibe47fa5bc1a2c311c9026ac7a9b76205973326ee
Change-Id: I07c2d76d739bea3f4d83257ded8d84e133d8a97d
Change-Id: Iad079a6e8aff6841d9a02a15c3300263bed8834e
 2020-05-29 21:22:15 +08:00
TreeHugger Robot 368a4806b4 Merge "Extract regulatory_info into RRO" into rvc-dev am: fa507d7965 
Change-Id: Id1e35a07dde00e3f28966353ccafb7676838d03b
 2020-05-29 21:22:15 +08:00
Will McVicker 41233cadde init: fix setprop spelling error 
Fix spelling setporp to setprop.

Bug: 155357559
Test: compile, boot redfin
Change-Id: I40ae48660548ca7761d585be5ebdb8f2d2f126de
 2020-05-29 21:22:15 +08:00
TreeHugger Robot d88eb11780 Merge "Extract regulatory_info into RRO" into rvc-dev 
Change-Id: I3c68c8448efacb769186c95a70ecd2df221653b7
Change-Id: I660cd5815644606562b81a97eefcc3d25dd6b211
Change-Id: I7210d499c791608ab0df2ed129f0f0cea073a81f
Change-Id: I7f7e8e790a6301f41f5553ddb34d765c57b97562
 2020-05-29 21:22:14 +08:00
Jeongik Cha 46f60ac795 Extract regulatory_info into RRO 
Bug: 152926806
Test: Set sku value, and check if settings show proper info image according to sku
Change-Id: I34651b0117415b00d4c9c6d03ee30b73533c9232
 2020-05-29 21:22:14 +08:00
Peter Wang 71177ca498 Merge "Add 5G RAT for bramble and redfin" into rvc-dev 
Change-Id: I7978bf9eee19b56f7984e479b678edfc24a6eb9a
Change-Id: I45db7a4aae2511e97dd484614c812e77b11a158c
Change-Id: Ibebb72a186e163449ac9a197ecffd3d27bdb72bd
Change-Id: I61f6358bce5ce6ad372dd4e41cedf3137a15586a
 2020-05-29 21:22:13 +08:00
Peter Wang 103f05c226 Merge "Add 5G RAT for bramble and redfin" into rvc-dev am: 2ffeb6d6b8 
Change-Id: I6c69a3e6bd82e3d2d06e1a679a347524507bc5d2
 2020-05-29 21:22:13 +08:00
Peter Wang fe86431138 Add 5G RAT for bramble and redfin 
Bug: 151964705
Fix: 151964705
Test: Build
Change-Id: I93d5bd43c8728eef9da5d0a6fd71ac7053c1c083
 2020-05-29 21:22:12 +08:00
TreeHugger Robot e022ebcc1f Merge "Add new latch threshold for Redfin prox sensor." into rvc-d1-dev 
Change-Id: I6864205864c89a6c6c7ce52f79b4cbf987abed19
Change-Id: I7e98a697229973eebe4af3ada20c322379a090db
Change-Id: I80d286ca8aaba4a994c55195ac931938b6ee2a90
Change-Id: Ic5b71b479f00bb6aaac8c3dfcc9204718397df4b
 2020-05-29 21:22:12 +08:00