PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,307 Commits 1 Branch 0 Tags
bd6b8efb903e4b11e696c7be1a3c0b3400ae105c
Commit Graph

60307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
bd6b8efb90 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: fd12e2e677 am: fa77897db0 
Change-Id: Ib9a4757291bdf903a0afeb6a2166befa6283ef1e
 2020-03-10 08:19:23 +00:00
Automerger Merge Worker
8c1731910a Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc am: e1d122c3a0 
Change-Id: Icbc30aa9ab5063be26b2b7e103908cc842011d7e
 2020-03-10 08:19:15 +00:00
Automerger Merge Worker
fa77897db0 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: fd12e2e677 
Change-Id: Iad6655015c233c588e7fc01e5d9e884cf66b4745
 2020-03-10 08:04:19 +00:00
Automerger Merge Worker
e1d122c3a0 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc 
Change-Id: I64748c07ef3dbd2cdaa81169e781fca20ee08112
 2020-03-10 08:04:12 +00:00
Automerger Merge Worker
fd12e2e677 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e 
Change-Id: I21d36da4f3826bc1168d607945d9e45dbba8d0a2
 2020-03-10 07:44:09 +00:00
Automerger Merge Worker
84098ef1fc Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e 
Change-Id: Ic9c4c42f792b6eae86939cf66fa7385cb1915091
 2020-03-10 07:44:06 +00:00
TreeHugger Robot
b65866968e Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev 2020-03-10 07:24:52 +00:00
Automerger Merge Worker
fb1072d28f Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: b0ef375e6e am: 292f680b22 am: a766eb7737 
Change-Id: I37a7bc0ea2098717aa3f0a55ac2e3a67ddfc4205
 2020-03-10 06:28:43 +00:00
Automerger Merge Worker
394cf5647b Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: bb70a39c68 am: cf2f610479 
Change-Id: I812f945e2bfddba82975253058e8c606644fa817
 2020-03-10 06:06:04 +00:00
Automerger Merge Worker
a766eb7737 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: b0ef375e6e am: 292f680b22 
Change-Id: I55995d98df38ac9d437461f068182487ced3044a
 2020-03-10 06:06:00 +00:00
Automerger Merge Worker
c017a5182b Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: b0ef375e6e am: 0fe624b107 
Change-Id: I3b4079ce77f6577628fe4c03b06ec67581b5725f
 2020-03-10 06:05:58 +00:00
Automerger Merge Worker
cf2f610479 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: bb70a39c68 
Change-Id: I602efb5952bfe0003b8967191dc4a91ae264fbe4
 2020-03-10 05:46:26 +00:00
Automerger Merge Worker
292f680b22 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: b0ef375e6e 
Change-Id: I2be7496886d6947802b89a3ccc01f8f1d9c0a52f
 2020-03-10 05:46:22 +00:00
Automerger Merge Worker
0fe624b107 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: b0ef375e6e 
Change-Id: I01de77a3f6fc90267c87f1ec2eea3df20326a5af
 2020-03-10 05:46:09 +00:00
Automerger Merge Worker
bb70a39c68 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc 
Change-Id: Ibe04ae804fe19a7767ac28d1b509e81475b0d2fc
 2020-03-10 05:29:59 +00:00
Automerger Merge Worker
b0ef375e6e Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc 
Change-Id: I47f6bd36cba22132097b4926947ee9db3f4a183f
 2020-03-10 05:29:57 +00:00
TreeHugger Robot
e28309b2dc Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev 2020-03-10 05:17:40 +00:00
Automerger Merge Worker
0b6c1ff72b Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 am: a29182f550 am: 1e019409d1 
Change-Id: I6072c8ea97f5443e3db3488da6964087f282119c
 2020-03-10 04:18:17 +00:00
Automerger Merge Worker
80986f8780 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: a6b501c926 am: 415f7f024d 
Change-Id: I006649868e3f7021db1d3810bd2e4a64e82c618b
 2020-03-10 03:58:54 +00:00
Automerger Merge Worker
23d71554e5 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 am: 06982417ce 
Change-Id: Id1701a9983efe45073903ea2d944d8c9972846b4
 2020-03-10 03:58:42 +00:00
Automerger Merge Worker
1e019409d1 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 am: a29182f550 
Change-Id: I4cd7b51b54d6aa76b1088292c9d806011db63d58
 2020-03-10 03:52:17 +00:00
Automerger Merge Worker
415f7f024d Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: a6b501c926 
Change-Id: I786ef0de1178b9428cd6c1a712521d04ca13a42b
 2020-03-10 03:39:25 +00:00
Automerger Merge Worker
06982417ce Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 
Change-Id: I386afb206d77142fc93ba0454d5f09df05f5aaab
 2020-03-10 03:39:13 +00:00
Automerger Merge Worker
a29182f550 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 
Change-Id: Ie160b8d0c02db0bf72b35995755ddab10b621ef8
 2020-03-10 03:39:12 +00:00
Automerger Merge Worker
a6b501c926 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd 
Change-Id: I54caf734aa1e1e43ac5d85c5bdcc736cbcc75aff
 2020-03-10 03:21:11 +00:00
Automerger Merge Worker
84fb219cb0 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd 
Change-Id: I7bf33f1505ca0ec580b557313b72f934b1f484c5
 2020-03-10 03:20:57 +00:00
Arc Wang
3fd7e31e3c [Wi-Fi] Fix crash when launch Wi-Fi detail from slice 
Wi-Fi slice does not been applied to WifiTracker2, should not
launch the UI component for WifiTracker2.

Bug: 151065311
Test: manual
      Settings -> disable/enable Wi-Fi -> click the connected Wi-Fi
      See if Wi-Fi detail carshed.
Change-Id: I9cea305db85aab1bb694c21f95b81afd6a35321e
 2020-03-10 11:06:59 +08:00
tim peng
af4d55e7dd Merge "Adjust layout for Slice InputRange" into rvc-dev 2020-03-10 03:04:26 +00:00
Chen Chen
24344d5001 MetricId: Avoid byte[] and string ambiguity 
Passing null to the function will result in conflict with Bluetooth proto
(int int int byte[] int)
Bug: 122571213
Test: Build

Change-Id: I2d1c3896d5d850a81a987aded14e3f0c05558e8c
 2020-03-10 01:56:04 +00:00
Automerger Merge Worker
e46e6d3f90 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 am: ef8818e1b6 am: c18a46e58b 
Change-Id: Id8e3d99001049affea131a48d23b9644892eba2a
 2020-03-10 01:42:42 +00:00
Automerger Merge Worker
6bee27a470 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 8e3a79813d am: 8e30c80477 
Change-Id: I2446ec82007a84911c2fd8fcd9d50453ca5fc799
 2020-03-10 01:25:13 +00:00
Automerger Merge Worker
3736b16cfe Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 am: c4f441876b 
Change-Id: Ieaeb1397d33ba8ee3f48ace8b35253889405b529
 2020-03-10 01:24:44 +00:00
Automerger Merge Worker
c18a46e58b Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 am: ef8818e1b6 
Change-Id: Idd58d4db0e217c696af75fa8cffcb7302442b79c
 2020-03-10 01:24:34 +00:00
Automerger Merge Worker
ef8818e1b6 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 
Change-Id: Ife852ac3a31b4d3170f9d2f3a75a1c2d24ed9454
 2020-03-10 01:06:20 +00:00
Automerger Merge Worker
8e30c80477 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 8e3a79813d 
Change-Id: Ic64da459b673439fd1e0ef9936348ef04f0745f5
 2020-03-10 01:06:01 +00:00
Automerger Merge Worker
c4f441876b Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 
Change-Id: I6ba1fcb55c5e3da3f450aa26dd7e5f6dcbf6e7ee
 2020-03-10 01:05:39 +00:00
Automerger Merge Worker
8e3a79813d Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 
Change-Id: Idb4dfadbac5a73cf606e56bb4b310b6d7399464c
 2020-03-10 00:48:49 +00:00
Automerger Merge Worker
7d797c2915 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 
Change-Id: Ifc0701181ccbba715f7ac59bee6450398acf76b8
 2020-03-10 00:48:49 +00:00
TreeHugger Robot
7eada07c97 Merge "Corrected the indexing data of Tips and support" into rvc-dev 2020-03-10 00:33:41 +00:00
Automerger Merge Worker
9d639465bb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours am: 86c7343b49 -s ours am: 33e5c5abdf -s ours 
am skip reason: subject contains skip directive

Change-Id: I9b67a3d978ed8b9699a80a478a693d2f358d4f5e
 2020-03-10 00:29:28 +00:00
Automerger Merge Worker
e9ac1b0f7d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 5dcf6647cd -s ours am: c059786aa2 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iadce372f95e6691ae070ecd93b72efafcf6a7c9e
 2020-03-10 00:09:34 +00:00
Automerger Merge Worker
0259039d14 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours am: 140fed1e3a -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic1682576c4ba549ba1222eb2ae7b98fe477b5576
 2020-03-10 00:09:17 +00:00
Automerger Merge Worker
33e5c5abdf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours am: 86c7343b49 -s ours 
am skip reason: subject contains skip directive

Change-Id: I47de09d88fa1dba0166d604610c640f0ec8f89f0
 2020-03-10 00:08:56 +00:00
Automerger Merge Worker
0a607b6faf Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe am: 57f9809fbd am: 206800a06e 
Change-Id: I7abf8a0f851c24ba509bc8db272e7f27537d0f69
 2020-03-09 23:53:32 +00:00
Automerger Merge Worker
c059786aa2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 5dcf6647cd -s ours 
am skip reason: subject contains skip directive

Change-Id: I0df672cc1a14f03bf2c2bc13712b73ce64811055
 2020-03-09 23:53:21 +00:00
Automerger Merge Worker
86c7343b49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours 
am skip reason: subject contains skip directive

Change-Id: I2b232bed6fdd507d20008983611c2dd79e47944b
 2020-03-09 23:53:20 +00:00
Automerger Merge Worker
140fed1e3a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours 
am skip reason: subject contains skip directive

Change-Id: I7cd04f6f444f249641f5877746188794847e7ede
 2020-03-09 23:53:09 +00:00
Automerger Merge Worker
3235770dad Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 5c1a4dcde4 am: 2575100329 
Change-Id: Ibbe853e377ca7363adaed3e97898085fb6daf035
 2020-03-09 23:35:52 +00:00
Automerger Merge Worker
5dcf6647cd [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ibb8959ba14f95b65231b0d11f84ebf9185756948
 2020-03-09 23:34:34 +00:00
Automerger Merge Worker
38aa29d60f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6a88f6b6794a33fdb0722dd1bb65d8c5353500b1
 2020-03-09 23:34:17 +00:00