Commit Graph

59547 Commits

Author SHA1 Message Date
Automerger Merge Worker
0d2e9894d3 Merge "Merge "Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: 88416ffaf6" into rvc-d1-dev-plus-aosp am: 309ef55124" into rvc-qpr-dev-plus-aosp 2020-03-01 03:56:52 +00:00
Automerger Merge Worker
473d1721aa Merge "Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: 88416ffaf6" into rvc-d1-dev-plus-aosp am: 309ef55124
Change-Id: Ibfcfb4dc3ad3cbfbc81fd27500a928285014fe1a
2020-03-01 03:56:49 +00:00
Automerger Merge Worker
142e386b53 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: c3ab634078 am: b701190f5f
Change-Id: Ic5d177d86d16c8c4eb2a892bfacba11ba2e9e8c5
2020-03-01 03:56:47 +00:00
Automerger Merge Worker
b2b674ee98 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: c3ab634078 am: 0c31cb3f6d
Change-Id: Ie52000004b9c504746d4f41ee38ab0a2169dc05a
2020-03-01 03:56:41 +00:00
Automerger Merge Worker
309ef55124 Merge "Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: 88416ffaf6" into rvc-d1-dev-plus-aosp 2020-03-01 03:47:20 +00:00
Automerger Merge Worker
d9a9b26030 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: 88416ffaf6
Change-Id: I1069a7a2e62c78b98c50f9e6b8eda5dca301b635
2020-03-01 03:47:12 +00:00
Automerger Merge Worker
b701190f5f Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: c3ab634078
Change-Id: I220ddabc30a23574d294c903922da7c269b1985a
2020-03-01 03:47:11 +00:00
Automerger Merge Worker
0c31cb3f6d Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: c3ab634078
Change-Id: Ic82d692d4cd8ba491d04e1857705f990e512adc5
2020-03-01 03:47:08 +00:00
Automerger Merge Worker
88416ffaf6 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473
Change-Id: Ie864fbbc9631721b9f9fe4259cb13651dd135926
2020-03-01 03:34:25 +00:00
Automerger Merge Worker
c3ab634078 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473
Change-Id: Ic92989a2d2a096c06d59039b6359e869855edf84
2020-03-01 03:34:09 +00:00
tim peng
3248376473 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev 2020-03-01 03:22:29 +00:00
Automerger Merge Worker
38ae332818 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 am: cb914954a7
Change-Id: I99353e23fd66af73c91c36e69201d6049e2bb746
2020-02-29 06:05:59 +00:00
Automerger Merge Worker
aff183a602 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 91f7309d5d am: 9a3a819ec5
Change-Id: I62d738fda960c6c3fb810b565e81305455224b31
2020-02-29 06:05:45 +00:00
Automerger Merge Worker
b699a66c0a Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 am: 93ae61af3e
Change-Id: Idb8ee8b1c3ae8f0e95382cae5f9f70bfb68001ba
2020-02-29 06:05:40 +00:00
Automerger Merge Worker
9a3a819ec5 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 91f7309d5d
Change-Id: I07df3083ac3d41892219c3aedfdc361ecff4be0b
2020-02-29 05:52:31 +00:00
Automerger Merge Worker
cb914954a7 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85
Change-Id: I19ab18c1e05dc1f559351de60057e2281aa3f790
2020-02-29 05:52:30 +00:00
Automerger Merge Worker
93ae61af3e Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85
Change-Id: I22933fd2237bd866d8960c75b2a874401b71ffd2
2020-02-29 05:52:23 +00:00
Automerger Merge Worker
91f7309d5d Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2
Change-Id: I7da82152579dd6934937881fecb28ea056fd5937
2020-02-29 05:39:01 +00:00
Automerger Merge Worker
90551d0a85 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2
Change-Id: Iea24224c2f7137619e7faf123914cb360283da05
2020-02-29 05:38:56 +00:00
TreeHugger Robot
9229504fe2 Merge "Fix notification history crash & layout" into rvc-dev 2020-02-29 05:23:07 +00:00
Automerger Merge Worker
17740a5bd7 [automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b -s ours am: bf69895603 am: 72fb16ae89
Change-Id: Ib043ba0cf494a8ea4877dc031f89a214dc0830a3
2020-02-29 04:51:40 +00:00
Automerger Merge Worker
72fb16ae89 [automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b -s ours am: bf69895603
Change-Id: I3eb7c7c5d4dd76991fdc8a098ae441b69b30f3b3
2020-02-29 04:35:48 +00:00
Automerger Merge Worker
bf69895603 [automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b -s ours
am skip reason: subject contains skip directive

Change-Id: I5c3fb50f656ded58064ae0e18424ea9f9b0ba429
2020-02-29 04:20:58 +00:00
Julia Reynolds
291ee404c2 Fix notification history crash & layout
- Fix occasional crash on device boot
- No more overlapping text

Test: manual
Fixes: 150326599
Fixes: 149767075
Change-Id: I3032a2913f2ca4ce57af596c180faa819e4c9363
2020-02-28 16:16:44 -05:00
Automerger Merge Worker
f22c895c79 [automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: 47efc875da -s ours am: b60e1c38fe -s ours
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0 is in history

Change-Id: Icd214fb2d7c25831d0de6ca6adda43fb15ace454
2020-02-28 17:25:29 +00:00
Automerger Merge Worker
ad16af86f1 [automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105 am: 857753c2bc -s ours
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0 is in history

Change-Id: I8049d17b31fa4c6ad301852190ba08662879e2d8
2020-02-28 17:25:05 +00:00
Automerger Merge Worker
da7bd9223d Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105 am: bad7d5578b
Change-Id: I19ae57751e6881d43c6ea6371f7e1b14d6c4a22b
2020-02-28 17:23:57 +00:00
Automerger Merge Worker
b60e1c38fe [automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: 47efc875da -s ours
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0 is in history

Change-Id: I60cc7ebaa0aeb133bc5d6d0c2f5d492f2b4efed7
2020-02-28 17:11:52 +00:00
Automerger Merge Worker
bad7d5578b Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105
Change-Id: I020c2888494297e7ff381d745a80ff8a452ea801
2020-02-28 17:11:31 +00:00
Automerger Merge Worker
857753c2bc Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105
Change-Id: Ida95e5c4508b65ad2dee5478c5be4902024c9e0a
2020-02-28 17:11:24 +00:00
Automerger Merge Worker
d858122105 Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec
Change-Id: I4f4f4356a2b481a18b5aeffdcd72c4f0a23658a2
2020-02-28 16:56:34 +00:00
Automerger Merge Worker
47efc875da Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec
Change-Id: Iead26d883a75dc45269a9f060ea74a6b8aae3084
2020-02-28 16:55:59 +00:00
Automerger Merge Worker
717553a1d3 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 31899646f8 am: 4b2be4b738
Change-Id: I7ec73431763e38843914ef24fcb06496f61749fc
2020-02-28 16:54:28 +00:00
Automerger Merge Worker
46bc1d437c Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa am: c311369f40
Change-Id: I5c15355f8d8e912b54f0dfe2f1ebbba1c8b69969
2020-02-28 16:54:22 +00:00
Automerger Merge Worker
44c4818f76 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa am: 6550b96794
Change-Id: I43df9d5db24c57af93addc7ac3110d7654b17a03
2020-02-28 16:54:06 +00:00
Sarah Chin
f7fe2b0dec Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev 2020-02-28 16:48:41 +00:00
Automerger Merge Worker
c311369f40 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa
Change-Id: Id380c299d304da18a1be5678529b62b9fe32f674
2020-02-28 16:34:23 +00:00
Automerger Merge Worker
4b2be4b738 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 31899646f8
Change-Id: I6b4e151327f47c1330ca07661d3916b5dd7c3ed2
2020-02-28 16:34:11 +00:00
Automerger Merge Worker
6550b96794 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa
Change-Id: I2ca3f522a7db1bdd7fd8dab74c378123b8d9a2a3
2020-02-28 16:33:47 +00:00
Automerger Merge Worker
31899646f8 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1
Change-Id: Ia318c314d726f84aea16427b50ffb2f569ad44ef
2020-02-28 16:22:49 +00:00
Automerger Merge Worker
54575ffdfa Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1
Change-Id: I689d269de3bbc9e96f6999721d99a1b6986b8dfb
2020-02-28 16:22:28 +00:00
TreeHugger Robot
fc2939ddd1 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev 2020-02-28 16:14:33 +00:00
Automerger Merge Worker
c6ee91e5b1 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 767b00a6e8 am: 4f17dfd7fe
Change-Id: I0820aec867115798204ff5bbaa2544a7364b5a53
2020-02-28 16:04:33 +00:00
Automerger Merge Worker
2a7506b793 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415 am: e467048b39
Change-Id: I42125f0d37b57a72a343e137dcdcb557ab1194f8
2020-02-28 16:03:46 +00:00
Automerger Merge Worker
f927cb1ab3 Merge "Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: 48823ea702" into rvc-d1-dev-plus-aosp am: 5889d406c6
Change-Id: I6f2ee8b217c714126f85bd346a02e9a12f78c650
2020-02-28 16:03:39 +00:00
Automerger Merge Worker
5b368251e8 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415 am: e86b816046
Change-Id: I52d439dcca44373fe5216209f3b1cf98ef0c5858
2020-02-28 16:03:33 +00:00
Automerger Merge Worker
1197fd7f84 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5 am: 051020fc6a
Change-Id: Ibb56b87022616acec8c6396f1357af55445b24d5
2020-02-28 16:03:02 +00:00
Automerger Merge Worker
3ce15a6006 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5 am: c3b12f302b
Change-Id: If4367dfa3e6f648c5556a3bba21aaaa9f83ecab6
2020-02-28 16:02:49 +00:00
Automerger Merge Worker
e86b816046 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415
Change-Id: Id80601383e934bc6f8f4ad5991f5272fdf4f65c9
2020-02-28 15:48:24 +00:00
Automerger Merge Worker
4f17dfd7fe Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 767b00a6e8
Change-Id: I650958bec0356363f924a14f6737ed4f7ca17a3a
2020-02-28 15:48:22 +00:00