JianYang Liu
3eee9437b2
Updated UiModeManagerService to always trigger configuration change for
...
setNightMode if it is AAE.
Bug: 145997050
Test: Manual
Change-Id: I6450dda422622ac29862f5d1fc362e23f55228f0
Merged-In: I6450dda422622ac29862f5d1fc362e23f55228f0
2019-12-12 00:41:35 +00:00
Automerger Merge Worker
f7eebf6f26
Merge "DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time"" into qt-qpr1-dev am: e24e97f9b2
...
Change-Id: I049ebe2411eb295d0441c6b4ed5b8116e0dafcf9
2019-12-11 23:26:42 +00:00
Automerger Merge Worker
896414c79d
DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time" am: b0d526ac12
...
Change-Id: Id030fe62bd5d665e291ce6ac11b03fdaf1f2af88
2019-12-11 23:26:29 +00:00
Automerger Merge Worker
4a0a495232
[automerger skipped] Merge "RESTRICT AUTOMERGE Disable TextClassifier for RemoteInputView." into pi-dev am: 4828033816 -s ours am skip reason: subject contains skip directive am: 1208225ccc am: e295eed244 am: 3989960e7f
...
Change-Id: I2b94c82fba615ccda77a6080705dd5938dd41894
2019-12-11 23:25:37 +00:00
TreeHugger Robot
e24e97f9b2
Merge "DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time"" into qt-qpr1-dev
2019-12-11 23:16:31 +00:00
Automerger Merge Worker
3989960e7f
[automerger skipped] Merge "RESTRICT AUTOMERGE Disable TextClassifier for RemoteInputView." into pi-dev am: 4828033816 -s ours am skip reason: subject contains skip directive am: 1208225ccc am: e295eed244
...
Change-Id: I6ab669dbff6a092614bc749e4aac8656d1fd7f1b
2019-12-11 23:04:27 +00:00
Automerger Merge Worker
e295eed244
[automerger skipped] Merge "RESTRICT AUTOMERGE Disable TextClassifier for RemoteInputView." into pi-dev am: 4828033816 -s ours am skip reason: subject contains skip directive am: 1208225ccc
...
Change-Id: Ifcfe124ee30aed7a6f5b56e23f7fd30384f9d835
2019-12-11 22:37:23 +00:00
Automerger Merge Worker
6cff7b3a12
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into pi-dev am: 319f57f0d7 -s ours am skip reason: subject contains skip directive am: 6abc77d484 am: eca2797ffb am: f648b1732b
...
Change-Id: I3c0dce65316f3630885e1ea3a2ca96a978bc2010
2019-12-11 22:35:45 +00:00
Automerger Merge Worker
cd7920d2cc
Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev am: 5c9dd5462f am: ab5e7a775e am: b303a271c5
...
Change-Id: Id3f2a8481a9d897bb315f97bd43d9133683618e9
2019-12-11 22:35:13 +00:00
Automerger Merge Worker
874302f4dc
DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps am: 323ce62057 am: 35c443bd0a am: a512e6473b
...
Change-Id: I4d72d48bf266f00358802f3dc7f0a162865d0a70
2019-12-11 22:35:04 +00:00
Automerger Merge Worker
e8d49ec0da
Merge changes from topic "am-832d01d3cd424691910400d0c94d526d" into qt-qpr1-dev am: 6442668c74
...
Change-Id: Ia24e578f08ecc0227af6a02c5d935147830c4aa2
2019-12-11 22:34:26 +00:00
Automerger Merge Worker
6afb28c9c8
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66 am: 62a0566244 am: be2826e8dc
...
Change-Id: I18e07c3ae09432469b8a3a8804b40c76676b64c0
2019-12-11 22:34:14 +00:00
Automerger Merge Worker
9d5e3b9f81
Merge "mac randomization notification fix typo" into qt-qpr1-dev am: 8ff3c7db9f
...
Change-Id: I1350b67b7206527e2b0dcac9779c23b6290ee885
2019-12-11 22:33:14 +00:00
Automerger Merge Worker
f648b1732b
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into pi-dev am: 319f57f0d7 -s ours am skip reason: subject contains skip directive am: 6abc77d484 am: eca2797ffb
...
Change-Id: I97c3d1ae13ad527b4782c30e6c7d9c5b3ac891fa
2019-12-11 22:18:05 +00:00
Automerger Merge Worker
b303a271c5
Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev am: 5c9dd5462f am: ab5e7a775e
...
Change-Id: Ia5a0d75f8dcfc67357442c534bd006245b8014fe
2019-12-11 22:17:42 +00:00
Automerger Merge Worker
1208225ccc
[automerger skipped] Merge "RESTRICT AUTOMERGE Disable TextClassifier for RemoteInputView." into pi-dev am: 4828033816 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I744ace4b545c756b50b9d5708c46957ec920fa8b
2019-12-11 22:17:36 +00:00
Automerger Merge Worker
a512e6473b
DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps am: 323ce62057 am: 35c443bd0a
...
Change-Id: I6e2f964cc85caa430ca5aa28986fcb65e416a033
2019-12-11 22:17:33 +00:00
Abodunrinwa Toki
4828033816
Merge "RESTRICT AUTOMERGE Disable TextClassifier for RemoteInputView." into pi-dev
2019-12-11 21:58:38 +00:00
Automerger Merge Worker
eca2797ffb
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into pi-dev am: 319f57f0d7 -s ours am skip reason: subject contains skip directive am: 6abc77d484
...
Change-Id: Ib38f27571f3381d107479cfe228b4711847ad059
2019-12-11 21:56:21 +00:00
Automerger Merge Worker
85d23aa0b4
Merge "Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" am: 6fce89f8b6 am: 3780da605a
...
Change-Id: I6df8824ca6a5ba668d49e728434cc6d9cacda8a3
2019-12-11 21:56:19 +00:00
Automerger Merge Worker
ab5e7a775e
Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev am: 5c9dd5462f
...
Change-Id: I1f8d015508d8a9439778b64c2a9726f9251fc4c1
2019-12-11 21:56:01 +00:00
Automerger Merge Worker
35c443bd0a
DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps am: 323ce62057
...
Change-Id: I83100c671931304bc515fb9b4510e5df251b8288
2019-12-11 21:55:59 +00:00
Automerger Merge Worker
6442668c74
Merge changes from topic "am-832d01d3cd424691910400d0c94d526d" into qt-qpr1-dev
...
* changes:
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d6662a056624434e380cdd6bccb8bec0a
2019-12-11 21:48:22 +00:00
Automerger Merge Worker
be2826e8dc
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66 am: 62a0566244
...
Change-Id: If49a4f7bfdc49d65214c54ab452a50c3ccb61c5b
2019-12-11 21:48:08 +00:00
Oscar Shu
8ff3c7db9f
Merge "mac randomization notification fix typo" into qt-qpr1-dev
2019-12-11 21:46:55 +00:00
Automerger Merge Worker
bae05149de
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6 am: bccb8bec0a
...
Change-Id: Id6995c02dc69230eab7cd1d312c4c4d569e44a25
2019-12-11 21:45:33 +00:00
Automerger Merge Worker
6abc77d484
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into pi-dev am: 319f57f0d7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iba84efe287e2a35d51693ceb76caa035c6efdf2f
2019-12-11 21:44:09 +00:00
Meng Wang
3780da605a
Merge "Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED"
...
am: 6fce89f8b6
2019-12-11 13:33:03 -08:00
TreeHugger Robot
5c9dd5462f
Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev
2019-12-11 21:30:13 +00:00
Automerger Merge Worker
89cb6a04ab
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad am: 063d83ca63 am: 402a7b2c33 -s ours am skip reason: subject contains skip directive am: e561e0fdbb -s ours am skip reason: subject contains skip directive am: 62fec618b9 am: 1ceaf86ef6 am: 2c26c551a9
...
Change-Id: I88899022deda0b3e6ddf0e5173fcf62294cd660f
2019-12-11 21:24:57 +00:00
Automerger Merge Worker
43dfc38ec4
[automerger skipped] DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5 am: 9b1ddfe488 am: 4f5d0e446e -s ours am skip reason: subject contains skip directive am: 9238b76a83 -s ours am skip reason: subject contains skip directive am: 8dbea0e476 am: 93c71c0470 am: fc49553039
...
Change-Id: I648e619840e60b49e7778f2fae3104b8929d3b61
2019-12-11 21:24:44 +00:00
Meng Wang
6fce89f8b6
Merge "Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED"
2019-12-11 21:23:43 +00:00
Evan Laird
323ce62057
DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps
...
When a notification becomes lifetime-extended, NotificationEntryManager
was holding onto the RankingMap that was passed at the time of removal
of _that_ notification, and using it again in the
NotificationSafeToRemoveCallback. The problem here is that when
onSafeToRemove gets called, it was passing that same stale ranking map
to removeNotification, which caused any notification that arrived in the
intervening time to get improperly ranked.
This fixes an issue where any notification that arrives while another is
lifetime-extended can get the wrong ranking applied to it, causing
trouble later in time such as mis-ranking and mis-sorting until the next
update from system server.
Bug: 146046016
Bug: 119041698
Test: atest SystemUITests
Test: manual - Post a FGS notification and immediately cancel, then post
a regular notification and wait for the FGS notification to dismiss.
Note that the regular notification keeps showing in the status bar.
Change-Id: I3df1279f13c424fcedd878bae2095fadc75d61b4
2019-12-11 21:17:07 +00:00
Automerger Merge Worker
62a0566244
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66
...
Change-Id: Iead83b500ad5b7fef1b0d8c5e3e92aea10b87bbd
2019-12-11 21:14:28 +00:00
Automerger Merge Worker
bccb8bec0a
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6
...
Change-Id: I43130453f6b576679c52be643344589ac624dadd
2019-12-11 21:14:16 +00:00
TreeHugger Robot
319f57f0d7
Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into pi-dev
2019-12-11 21:10:46 +00:00
Automerger Merge Worker
2c26c551a9
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad am: 063d83ca63 am: 402a7b2c33 -s ours am skip reason: subject contains skip directive am: e561e0fdbb -s ours am skip reason: subject contains skip directive am: 62fec618b9 am: 1ceaf86ef6
...
Change-Id: I77c6c7f17ea9bfaa96941f0429798107a84f619a
2019-12-11 21:04:10 +00:00
Automerger Merge Worker
fc49553039
[automerger skipped] DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5 am: 9b1ddfe488 am: 4f5d0e446e -s ours am skip reason: subject contains skip directive am: 9238b76a83 -s ours am skip reason: subject contains skip directive am: 8dbea0e476 am: 93c71c0470
...
Change-Id: I7151df83f8081277ad54c83bb63edf342c552e4f
2019-12-11 21:03:58 +00:00
TreeHugger Robot
aced288d66
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev
2019-12-11 20:55:34 +00:00
Automerger Merge Worker
1ceaf86ef6
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad am: 063d83ca63 am: 402a7b2c33 -s ours am skip reason: subject contains skip directive am: e561e0fdbb -s ours am skip reason: subject contains skip directive am: 62fec618b9
...
Change-Id: I5c074b6f7da2056711fce43f687717aa445798a9
2019-12-11 20:40:20 +00:00
Automerger Merge Worker
93c71c0470
[automerger skipped] DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5 am: 9b1ddfe488 am: 4f5d0e446e -s ours am skip reason: subject contains skip directive am: 9238b76a83 -s ours am skip reason: subject contains skip directive am: 8dbea0e476
...
Change-Id: Ief059054a3c05cc08fa486f687d556087cbc5c1a
2019-12-11 20:40:09 +00:00
Automerger Merge Worker
62fec618b9
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad am: 063d83ca63 am: 402a7b2c33 -s ours am skip reason: subject contains skip directive am: e561e0fdbb -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3b336c9f55f01e5213ff15a60a99c042cd039671
2019-12-11 20:17:43 +00:00
Automerger Merge Worker
8dbea0e476
[automerger skipped] DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5 am: 9b1ddfe488 am: 4f5d0e446e -s ours am skip reason: subject contains skip directive am: 9238b76a83 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I97b04b1eb70144e0c34e608b13bf2868fa1dce4b
2019-12-11 20:17:34 +00:00
Automerger Merge Worker
e561e0fdbb
[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad am: 063d83ca63 am: 402a7b2c33 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie33411c2b6b95dba41997171acf0fced3ba4a740
2019-12-11 19:53:03 +00:00
Automerger Merge Worker
9238b76a83
[automerger skipped] DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5 am: 9b1ddfe488 am: 4f5d0e446e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I770bd1ba8cc66b4179e88f194d45bb715be1977c
2019-12-11 19:52:49 +00:00
Automerger Merge Worker
add0df301c
Merge "Remove hidden API usage: CallQuality no-argument constructor." am: ce7d2e8fe3 am: aa007c7e4b
...
Change-Id: I2c756ffb05bd979333571e41e4ba10189b22e47a
2019-12-11 19:40:58 +00:00
Automerger Merge Worker
402a7b2c33
Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad am: 063d83ca63
...
Change-Id: I0622df10fdde4fb961c920fc0c9529e4c3b3ecfc
2019-12-11 19:30:18 +00:00
Automerger Merge Worker
4f5d0e446e
DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5 am: 9b1ddfe488
...
Change-Id: Idcdef9d986a8d0e2f6f0209fd550900a6275796d
2019-12-11 19:30:08 +00:00
Meng Wang
aa007c7e4b
Merge "Remove hidden API usage: CallQuality no-argument constructor."
...
am: ce7d2e8fe3
2019-12-11 11:21:37 -08:00
Meng Wang
ce7d2e8fe3
Merge "Remove hidden API usage: CallQuality no-argument constructor."
2019-12-11 19:13:39 +00:00
