OSDN Git Service
TreeHugger Robot [Thu, 12 Dec 2019 22:23:16 +0000 (22:23 +0000)]
Merge "Check screenlock for unlock dialog" into qt-qpr1-dev
Long Ling [Thu, 12 Dec 2019 21:48:51 +0000 (21:48 +0000)]
Merge "Clamp brightness thresholds to the maximum brightness." into qt-qpr1-dev
Winson Chung [Thu, 12 Dec 2019 21:27:08 +0000 (21:27 +0000)]
Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev
Brad Ebinger [Thu, 12 Dec 2019 21:08:36 +0000 (21:08 +0000)]
Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" into qt-qpr1-dev
Jay Aliomer [Thu, 12 Dec 2019 20:32:00 +0000 (20:32 +0000)]
Merge "Apply Dark theme changes when screen off only" into qt-qpr1-dev
TreeHugger Robot [Thu, 12 Dec 2019 20:29:43 +0000 (20:29 +0000)]
Merge "Make emergency notification dismissable" into qt-qpr1-dev
Santos Cordon [Thu, 28 Nov 2019 11:24:21 +0000 (11:24 +0000)]
Clamp brightness thresholds to the maximum brightness.
Bug:
144702254
Test: atest AutomaticBrightnessControllerTest
Change-Id: Ia8ac92cf306424d1324d028559f4260b9f80d482
Merged-In: Ia8ac92cf306424d1324d028559f4260b9f80d482
TreeHugger Robot [Thu, 12 Dec 2019 20:05:40 +0000 (20:05 +0000)]
Merge "Use correct calling identity during camera permission check" into qt-qpr1-dev
Grace Cheng [Thu, 12 Dec 2019 19:43:20 +0000 (19:43 +0000)]
Merge "Coarse location permission description change for automobile" into qt-qpr1-dev
Jeff Sharkey [Sat, 7 Dec 2019 16:15:29 +0000 (16:15 +0000)]
Apply Dark theme changes when screen off only
this change waits to apply ui changes after screen off
battery manager sends updates and continuously updates the ui mode
this change also applies external changes to ui configurations when
the mode is actually changed. this resolves some perfromance regression
issues
Fixes:
145694649
Fixes:
145161355
Fixes:
145776479
Test: atest UiModeManagerService
Change-Id: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
Merged-In: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
Matt Pietal [Thu, 12 Dec 2019 15:26:49 +0000 (10:26 -0500)]
[DO NOT MERGE] Resolver/Chooser - Fix 'no apps available' inset
When zero apps match a filter, the empty view is set to visible and
shown. There is harm in making sure the inset always get applied to
the empty view so that when resolver determines it needs to be
visible, it is set to be shown.
Test: atest ResolverActivityTest, ChooserActivityTest
Bug:
146133961
Change-Id: I7412df84f8f482219635ccd73dff8e4a21355a18
TreeHugger Robot [Thu, 12 Dec 2019 09:33:41 +0000 (09:33 +0000)]
Merge "Fix crash after destroyed" into qt-qpr1-dev
Automerger Merge Worker [Thu, 12 Dec 2019 08:43:03 +0000 (08:43 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b am:
ab6b640548 -s ours am skip reason: subject contains skip directive am:
1300362067 -s ours am skip reason: subject contains skip directive am:
3b8b2681aa -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history am:
4536e07966 -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: I07ad787307e8373f84df7b8c715343f81c7ac1db
Automerger Merge Worker [Thu, 12 Dec 2019 08:42:56 +0000 (08:42 +0000)]
[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922 am:
bf965b484f -s ours am skip reason: subject contains skip directive am:
dec51767c9 -s ours am skip reason: subject contains skip directive am:
5166a0a3a0 -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history am:
b2425ffb9f -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: I16017c5f550220d9d5bd765f27d6bc5e6068d5d3
Automerger Merge Worker [Thu, 12 Dec 2019 07:54:50 +0000 (07:54 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b am:
ab6b640548 -s ours am skip reason: subject contains skip directive am:
1300362067 -s ours am skip reason: subject contains skip directive am:
3b8b2681aa -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: Idfc9a676a9f80381b8d85b3d3f4db6c8d82350ba
Automerger Merge Worker [Thu, 12 Dec 2019 07:54:47 +0000 (07:54 +0000)]
[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922 am:
bf965b484f -s ours am skip reason: subject contains skip directive am:
dec51767c9 -s ours am skip reason: subject contains skip directive am:
5166a0a3a0 -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: Ie592ed299a3138b0c440810e4dc51ac2c4861947
Automerger Merge Worker [Thu, 12 Dec 2019 07:30:47 +0000 (07:30 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b am:
ab6b640548 -s ours am skip reason: subject contains skip directive am:
1300362067 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibd1c0eb3d1d9d0178f2cfddf341167eb741013a5
Automerger Merge Worker [Thu, 12 Dec 2019 07:30:36 +0000 (07:30 +0000)]
[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922 am:
bf965b484f -s ours am skip reason: subject contains skip directive am:
dec51767c9 -s ours
am skip reason: subject contains skip directive
Change-Id: Icc516d8aa87f24084cf3c7053bf260357ccbc72a
Automerger Merge Worker [Thu, 12 Dec 2019 07:10:26 +0000 (07:10 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b am:
ab6b640548 -s ours
am skip reason: subject contains skip directive
Change-Id: I9810b56bf25eca7d1ac4fcb3a40c269637c24558
Automerger Merge Worker [Thu, 12 Dec 2019 07:10:17 +0000 (07:10 +0000)]
[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922 am:
bf965b484f -s ours
am skip reason: subject contains skip directive
Change-Id: Idb67d00b6ace91b47ec5e633be5c2f23942934bf
Automerger Merge Worker [Thu, 12 Dec 2019 06:50:06 +0000 (06:50 +0000)]
Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b
Change-Id: I6ccba38eeffbdab3ef9b4e90fe269bd61aabf698
Automerger Merge Worker [Thu, 12 Dec 2019 06:49:56 +0000 (06:49 +0000)]
DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922
Change-Id: Ic5b84e6b650b01d38801a2ff39c059a51173fe0b
Brad Ebinger [Tue, 10 Dec 2019 00:09:57 +0000 (16:09 -0800)]
Add CarrierConfig for roaming PLMNS that will need emer DDS switch
When roaming, we assume that the roaming operator will support
control plane fallback for emergency SUPL. For roaming operators
that we know do not support control plane fallback, we must perform
a DDS switch before dialing an emergency number on that operator.
Bug:
144383368
Test: atest TeleServiceTests; manual
Merged-In: I4a033f89610fd409ea81c40230938720ca76541c
Change-Id: I4a033f89610fd409ea81c40230938720ca76541c
Automerger Merge Worker [Thu, 12 Dec 2019 05:00:29 +0000 (05:00 +0000)]
Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3
Change-Id: I731a7fa2643382bd0df6f2107424d370a6f765b3
Automerger Merge Worker [Thu, 12 Dec 2019 05:00:18 +0000 (05:00 +0000)]
DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860
Change-Id: Iebebd941ee806b4e06d35f2134113f609160396f
Automerger Merge Worker [Thu, 12 Dec 2019 04:38:28 +0000 (04:38 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into pi-dev am:
da2466a36d -s ours am skip reason: subject contains skip directive am:
4c19a822ac -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history am:
f81579f0b9 -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: I14b85400e9d1c85360d677839286dfe97bcc391a
TreeHugger Robot [Thu, 12 Dec 2019 04:00:33 +0000 (04:00 +0000)]
Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev
Automerger Merge Worker [Thu, 12 Dec 2019 03:43:28 +0000 (03:43 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into pi-dev am:
da2466a36d -s ours am skip reason: subject contains skip directive am:
4c19a822ac -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: I438a0c90c903fe615dddf4eb54e8ccaded51fc9c
Automerger Merge Worker [Thu, 12 Dec 2019 02:54:53 +0000 (02:54 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into pi-dev am:
da2466a36d -s ours
am skip reason: subject contains skip directive
Change-Id: I784440f3454db036f414da52065ac6afc1f92e3f
TreeHugger Robot [Thu, 12 Dec 2019 02:38:28 +0000 (02:38 +0000)]
Merge "DO NOT MERGE back porting for fixing sysui direct reply" into pi-dev
Jimmy Chen [Thu, 12 Dec 2019 02:27:34 +0000 (02:27 +0000)]
Merge "p2p: check the length of the network name bytes" into qt-qpr1-dev
Grace Cheng [Wed, 27 Nov 2019 21:48:50 +0000 (13:48 -0800)]
Coarse location permission description change for automobile
The string is preloaded according to PRODUCT_CHARACTERISTICS which is
automotive for AAE platform.
Bug: b/
143243229
Test: Install recording app(coarse edition) on a hawk head unit, go to Settings > Apps &
notifications > Show all apps > Sensor Replay Recording > Permissions >
All permissions, click on access approximate location and verify the
string.
Change-Id: I54fe5903364b881498f0a0066efcc0fc7833d526
Jay Aliomer [Thu, 12 Dec 2019 01:21:08 +0000 (01:21 +0000)]
Merge "Updated UiModeManagerService to always trigger configuration change for setNightMode if it is AAE." into qt-qpr1-dev
Automerger Merge Worker [Thu, 12 Dec 2019 01:00:30 +0000 (01:00 +0000)]
[automerger skipped] Merge changes Iaa78a7ed,I6497b7ef into pi-dev am:
6e79d000ab -s ours am skip reason: Change-Id Iaa78a7edcf23755c89d7b354edbc28d37d74d891 with SHA-1
f98611062c is in history am:
1b79aef399 -s ours am skip reason: Change-Id Iaa78a7edcf23755c89d7b354edbc28d37d74d891 with SHA-1
f98611062c is in history am:
13aa01fd49 -s ours
am skip reason: Change-Id Iaa78a7edcf23755c89d7b354edbc28d37d74d891 with SHA-1
f98611062c is in history
Change-Id: I72c045aeeb3c516a286ad5ef6413fb227019a299
Automerger Merge Worker [Thu, 12 Dec 2019 00:38:49 +0000 (00:38 +0000)]
[automerger skipped] Merge changes Iaa78a7ed,I6497b7ef into pi-dev am:
6e79d000ab -s ours am skip reason: Change-Id Iaa78a7edcf23755c89d7b354edbc28d37d74d891 with SHA-1
f98611062c is in history am:
1b79aef399 -s ours
am skip reason: Change-Id Iaa78a7edcf23755c89d7b354edbc28d37d74d891 with SHA-1
f98611062c is in history
Change-Id: I33d00fde7d89d4cd84876bc982c6b28fa95287f5
Automerger Merge Worker [Thu, 12 Dec 2019 00:17:28 +0000 (00:17 +0000)]
[automerger skipped] Merge changes Iaa78a7ed,I6497b7ef into pi-dev am:
6e79d000ab -s ours
am skip reason: Change-Id Iaa78a7edcf23755c89d7b354edbc28d37d74d891 with SHA-1
f98611062c is in history
Change-Id: I92c1131ef02f7ca5e399b47c62993cf28719b66a
Erin Yan [Tue, 10 Dec 2019 19:46:37 +0000 (11:46 -0800)]
Check screenlock for unlock dialog
Only show unlock dialog when the foreground user has screenlock and trusted device.
Bug:
144590810
Test: Manually on IHU
Change-Id: I2585ec33391aec9f3cd71f03507e863cbd5d4e76
Merged-in: I08c7aa677150ca950785428580eee6a39ffadd37
Lorenzo Colitti [Wed, 11 Dec 2019 23:55:10 +0000 (23:55 +0000)]
Merge changes Iaa78a7ed,I6497b7ef into pi-dev
* changes:
Support strict mode private DNS on VPNs that provide Internet.
Add test coverage for strict mode private DNS.
JianYang Liu [Tue, 10 Dec 2019 22:32:30 +0000 (14:32 -0800)]
Updated UiModeManagerService to always trigger configuration change for
setNightMode if it is AAE.
Bug:
145997050
Test: Manual
Change-Id: I6450dda422622ac29862f5d1fc362e23f55228f0
Merged-In: I6450dda422622ac29862f5d1fc362e23f55228f0
TreeHugger Robot [Wed, 11 Dec 2019 23:16:31 +0000 (23:16 +0000)]
Merge "DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time"" into qt-qpr1-dev
Automerger Merge Worker [Wed, 11 Dec 2019 23:04:27 +0000 (23:04 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 22:37:23 +0000 (22:37 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 22:18:05 +0000 (22:18 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 22:17:42 +0000 (22:17 +0000)]
Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev am:
5c9dd5462f am:
ab5e7a775e
Change-Id: Ia5a0d75f8dcfc67357442c534bd006245b8014fe
Automerger Merge Worker [Wed, 11 Dec 2019 22:17:36 +0000 (22:17 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 22:17:33 +0000 (22:17 +0000)]
DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps am:
323ce62057 am:
35c443bd0a
Change-Id: I6e2f964cc85caa430ca5aa28986fcb65e416a033
Abodunrinwa Toki [Wed, 11 Dec 2019 21:58:38 +0000 (21:58 +0000)]
Merge "RESTRICT AUTOMERGE Disable TextClassifier for RemoteInputView." into pi-dev
Automerger Merge Worker [Wed, 11 Dec 2019 21:56:21 +0000 (21:56 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 21:56:01 +0000 (21:56 +0000)]
Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev am:
5c9dd5462f
Change-Id: I1f8d015508d8a9439778b64c2a9726f9251fc4c1
Automerger Merge Worker [Wed, 11 Dec 2019 21:55:59 +0000 (21:55 +0000)]
DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps am:
323ce62057
Change-Id: I83100c671931304bc515fb9b4510e5df251b8288
Automerger Merge Worker [Wed, 11 Dec 2019 21:48:22 +0000 (21:48 +0000)]
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:
aced288d66 am:
62a0566244
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am:
34e380cdd6 am:
bccb8bec0a
Automerger Merge Worker [Wed, 11 Dec 2019 21:48:08 +0000 (21:48 +0000)]
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am:
aced288d66 am:
62a0566244
Change-Id: If49a4f7bfdc49d65214c54ab452a50c3ccb61c5b
Oscar Shu [Wed, 11 Dec 2019 21:46:55 +0000 (21:46 +0000)]
Merge "mac randomization notification fix typo" into qt-qpr1-dev
Automerger Merge Worker [Wed, 11 Dec 2019 21:45:33 +0000 (21:45 +0000)]
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am:
34e380cdd6 am:
bccb8bec0a
Change-Id: Id6995c02dc69230eab7cd1d312c4c4d569e44a25
Automerger Merge Worker [Wed, 11 Dec 2019 21:44:09 +0000 (21:44 +0000)]
[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
TreeHugger Robot [Wed, 11 Dec 2019 21:30:13 +0000 (21:30 +0000)]
Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev
Evan Laird [Tue, 10 Dec 2019 22:15:03 +0000 (17:15 -0500)]
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
Automerger Merge Worker [Wed, 11 Dec 2019 21:14:28 +0000 (21:14 +0000)]
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am:
aced288d66
Change-Id: Iead83b500ad5b7fef1b0d8c5e3e92aea10b87bbd
Automerger Merge Worker [Wed, 11 Dec 2019 21:14:16 +0000 (21:14 +0000)]
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am:
34e380cdd6
Change-Id: I43130453f6b576679c52be643344589ac624dadd
TreeHugger Robot [Wed, 11 Dec 2019 21:10:46 +0000 (21:10 +0000)]
Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into pi-dev
Automerger Merge Worker [Wed, 11 Dec 2019 21:04:10 +0000 (21:04 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 21:03:58 +0000 (21:03 +0000)]
[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
TreeHugger Robot [Wed, 11 Dec 2019 20:55:34 +0000 (20:55 +0000)]
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev
Automerger Merge Worker [Wed, 11 Dec 2019 20:40:20 +0000 (20:40 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 20:40:09 +0000 (20:40 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 20:17:43 +0000 (20:17 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 20:17:34 +0000 (20:17 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 19:53:03 +0000 (19:53 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 19:52:49 +0000 (19:52 +0000)]
[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
Automerger Merge Worker [Wed, 11 Dec 2019 19:30:18 +0000 (19:30 +0000)]
Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am:
70ffc41cad am:
063d83ca63
Change-Id: I0622df10fdde4fb961c920fc0c9529e4c3b3ecfc
Automerger Merge Worker [Wed, 11 Dec 2019 19:30:08 +0000 (19:30 +0000)]
DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am:
b52efcb9d5 am:
9b1ddfe488
Change-Id: Idcdef9d986a8d0e2f6f0209fd550900a6275796d
Automerger Merge Worker [Wed, 11 Dec 2019 19:10:38 +0000 (19:10 +0000)]
Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am:
70ffc41cad
Change-Id: I8439eee725f85cc1e939772663a4217e5dde2e38
Automerger Merge Worker [Wed, 11 Dec 2019 19:10:27 +0000 (19:10 +0000)]
DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am:
b52efcb9d5
Change-Id: I438383977e4b7454e732dba8d2906a8c333f2bad
Taran Singh [Wed, 11 Dec 2019 18:52:54 +0000 (18:52 +0000)]
Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev
TreeHugger Robot [Wed, 11 Dec 2019 16:57:54 +0000 (16:57 +0000)]
Merge "Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"" into qt-qpr1-dev
Lorenzo Colitti [Fri, 10 May 2019 11:33:43 +0000 (04:33 -0700)]
Support strict mode private DNS on VPNs that provide Internet.
Currently, strict mode private DNS does not work on VPNs because
NetworkMonitor does not validate VPNs. When a VPN connects, it
immediately transitions to ValidatedState, skipping private DNS
hostname resolution.
This change makes NetworkMonitor perform private DNS hostname
resolution and evaluation even on VPNs.
In order to ensure that the system always immediately switches to
the VPN as soon as it connects, remove the unvalidated penalty
for VPN networks. This ensures that the VPN score is always 101
and the VPN always outscores other networks as soon as it
connects. Previously, it would only outscore other networks
when no-op validation completed.
Backport of
414b8c8b1ce8ae2ad6ef95c1ffba19062077d3e6.
Bug:
122652057
Test: atest FrameworksNetTests
Test: manually ran a VPN with private DNS in strict mode
Test: atest android.net.cts.ConnectivityManagerTest com.android.cts.net.HostsideVpnTests
Change-Id: Iaa78a7edcf23755c89d7b354edbc28d37d74d891
Merged-In: Iaa78a7edcf23755c89d7b354edbc28d37d74d891
Lorenzo Colitti [Fri, 25 Oct 2019 16:20:57 +0000 (01:20 +0900)]
Add test coverage for strict mode private DNS.
Support faking out the DNS lookups used by NetworkMonitor to
resolve strict mode DNS, and add more test coverage.
These tests were partly adapted from tests we have in Q but
also contain new coverage. This is because in Q the interface
between ConnectivityService and NetworkMonitor changed
substantially, and it is impractical to backport
NetworkMonitorTest.
Bug:
122652057
Test: atest FrameworksNetTests
Change-Id: I6497b7efa539267576d38d3036eef0af0df4e9cb
Merged-In: Iaa78a7edcf23755c89d7b354edbc28d37d74d891
Jimmy Chen [Fri, 15 Nov 2019 02:06:27 +0000 (10:06 +0800)]
p2p: check the length of the network name bytes
Fixes:
144472136
Bug:
144472136
Test: atest FrameworksWifiApiTests
Change-Id: I80b8e0330499e6c655efb1712811891a8e8229cb
(cherry picked from commit
a0900344f4ea850ca9ee81fc936298f894e77f54)
Nate Myren [Wed, 11 Dec 2019 00:37:07 +0000 (00:37 +0000)]
Merge "Add logging upon failure to edit SystemSettings" into qt-qpr1-dev
Jian Jin [Wed, 11 Dec 2019 00:35:05 +0000 (00:35 +0000)]
Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"
This reverts commit
ba4b561c3e292cca1e2b58276ff2671ef6d53ae7.
Reason for revert: Move to CarSettings
Change-Id: I91fd1fa7dee2400095a014c189a40706b853c471
xshu [Tue, 10 Dec 2019 23:24:17 +0000 (15:24 -0800)]
mac randomization notification fix typo
Makes the "c" in "connecting" lowercase.
Bug:
144172117
Test: compiles
Change-Id: Ib4514d36fc2244f0f04f97f3f67c455089e975b2
Merged-In: Ide9708c87c2a9b3c943744decff639ad1dfde985
Oscar Shu [Tue, 10 Dec 2019 22:28:29 +0000 (22:28 +0000)]
Merge "Strings for no randomized MAC support notification" into qt-qpr1-dev
TreeHugger Robot [Tue, 10 Dec 2019 22:27:32 +0000 (22:27 +0000)]
Merge "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings" into qt-qpr1-dev
Automerger Merge Worker [Tue, 10 Dec 2019 21:35:51 +0000 (21:35 +0000)]
Merge "Revoke granted permission when the permission defining app is removed." into qt-dev am:
a2e31e4794 am:
c4b58c3a53
Change-Id: I0c552b0a3d38df1c1252147f669b36791713d2aa
TreeHugger Robot [Tue, 10 Dec 2019 21:05:16 +0000 (21:05 +0000)]
Merge "Make AccountManagerService more resilient to database corruption." into qt-qpr1-dev
Automerger Merge Worker [Tue, 10 Dec 2019 21:05:11 +0000 (21:05 +0000)]
Merge "Revoke granted permission when the permission defining app is removed." into qt-dev am:
a2e31e4794
Change-Id: I567fef9ae46e4ad9dd520c534eb6c987ce346fbf
Heemin Seog [Tue, 10 Dec 2019 20:45:40 +0000 (20:45 +0000)]
Merge "DO NOT MERGE Make nav bar button click listeners overrideable" into qt-qpr1-dev
TreeHugger Robot [Tue, 10 Dec 2019 20:39:08 +0000 (20:39 +0000)]
Merge "Revoke granted permission when the permission defining app is removed." into qt-dev
TreeHugger Robot [Tue, 10 Dec 2019 19:00:31 +0000 (19:00 +0000)]
Merge "Don't set mLockscreenWallpaper when wallpaper is not supported." into qt-qpr1-dev
xshu [Wed, 20 Nov 2019 01:20:35 +0000 (17:20 -0800)]
Strings for no randomized MAC support notification
Bug:
144172117
Test: atest FrameworksWifiTests
Test: Manual sanity test
Change-Id: Ic4603bde26c7036819b163000a971886ed3b017c
Merged-In: Ide9708c87c2a9b3c943744decff639ad1dfde985
(cherry picked from
3f656193a2c6d6ae6b6ba81d1450c813ad1cbbb0)
TreeHugger Robot [Tue, 10 Dec 2019 18:38:42 +0000 (18:38 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
TreeHugger Robot [Tue, 10 Dec 2019 18:36:43 +0000 (18:36 +0000)]
Merge "track and report packages with undecorated remoteviews" into qt-qpr1-dev
Felipe Leme [Thu, 5 Dec 2019 21:25:46 +0000 (13:25 -0800)]
Don't set mLockscreenWallpaper when wallpaper is not supported.
Bug:
138939803
Bug:
144862300
Test: a CtsAppTestCases:android.app.cts.WallpaperManagerTest
Merged-In: Ibb5dd6097939a5b50244ee3cec5ee09a1f5417cb
Change-Id: Ibb5dd6097939a5b50244ee3cec5ee09a1f5417cb
(cherry picked from commit
e8d7b883b4e30572cd1d6d9655394ef05be93621)
Yu-Han Yang [Thu, 5 Dec 2019 22:07:23 +0000 (14:07 -0800)]
Make emergency notification dismissable
Bug:
145608692
Fixes:
145608692
Test: on device
Change-Id: I7bf7d1786b6eed5fc32fdf438a223ec0020a4888
(cherry picked from commit
1f503e45f7aa3f68eae5a947c3afa63437b4c2eb)
Bill Yi [Tue, 10 Dec 2019 15:16:21 +0000 (07:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I41f224919842bda5577b61e9254df1958ac8b3dd
Auto-generated-cl: translation import
Alex Huang [Tue, 10 Dec 2019 05:33:45 +0000 (05:33 +0000)]
Merge "DO NOT MERGE Allow app switches for accessibility services" into qt-qpr1-dev
Evan Laird [Mon, 5 Aug 2019 21:11:54 +0000 (17:11 -0400)]
DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time"
See CL with change id (I0680034ed9315aa2c05282524d48faaed066ebd0) for
the meaningful changes/description. This change was reverted in qt-qpr1-dev
in order to fix a bug but never got unreverted due to the qt-dev CL
having the same change-id as the reverted one.
Bug:
119041698
Test: atest NotificationManagerServiceTest
Test: atest ForegroundServiceNotificationListenerTest
Change-Id: I50f16072b0e56ab69aabf8010ffffd172ca7c05a
Jian Jin [Thu, 5 Dec 2019 00:15:23 +0000 (16:15 -0800)]
DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings
Bug:
144846684
Test: SettingsProviderTest
Change-Id: Iebc53c70ea401c6ba244ed43db7a1d73f3a894df
Nate Myren [Fri, 6 Dec 2019 23:14:29 +0000 (15:14 -0800)]
Add logging upon failure to edit SystemSettings
Add more logs about file state and file permission state upon failing to
read or write a Settings file. In the case of failing to create a parent
directory for the settings file, SettingsState will attempt to create
the folder with Files.createDirectories, which throws more informative
errors.
Bug:
119723324
Test: None
Change-Id: Iec8ed903e109558efc3a98906c68d1579b985232
Chris Wren [Fri, 22 Nov 2019 21:58:17 +0000 (16:58 -0500)]
track and report packages with undecorated remoteviews
print query results with:
adb shell dumpsys notification --remote-view-stats
test the pulled atom with:
make statsd_testdrive
./out/host/linux-x86/bin/statsd_testdrive 10066
Bug:
144855217
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/notification
Change-Id: I6dcc9871f78298a8b213a051223c7316f8feefc5
Merged-In: I773378fc7cfb47a9f9c7495404ddafa63f39cfaf
OSDN Git Service
