Commit Graph

424299 Commits

Author SHA1 Message Date
Automerger Merge Worker
ab6b640548 Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am: 090476d5f3 am: 9d5989df0b
Change-Id: I6ccba38eeffbdab3ef9b4e90fe269bd61aabf698
2019-12-12 06:50:06 +00:00
Automerger Merge Worker
bf965b484f DO NOT MERGE back porting for fixing sysui direct reply am: 08aae90860 am: a37fe87922
Change-Id: Ic5b84e6b650b01d38801a2ff39c059a51173fe0b
2019-12-12 06:49:56 +00:00
Brad Ebinger
9fd5576e60 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
2019-12-12 05:08:45 +00:00
Automerger Merge Worker
9d5989df0b Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am: 090476d5f3
Change-Id: I731a7fa2643382bd0df6f2107424d370a6f765b3
2019-12-12 05:00:29 +00:00
Automerger Merge Worker
a37fe87922 DO NOT MERGE back porting for fixing sysui direct reply am: 08aae90860
Change-Id: Iebebd941ee806b4e06d35f2134113f609160396f
2019-12-12 05:00:18 +00:00
Automerger Merge Worker
ffa766c971 [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
2019-12-12 04:38:28 +00:00
TreeHugger Robot
090476d5f3 Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev 2019-12-12 04:00:33 +00:00
Automerger Merge Worker
f81579f0b9 [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
2019-12-12 03:43:28 +00:00
Automerger Merge Worker
4c19a822ac [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
2019-12-12 02:54:53 +00:00
TreeHugger Robot
da2466a36d Merge "DO NOT MERGE back porting for fixing sysui direct reply" into pi-dev 2019-12-12 02:38:28 +00:00
Jimmy Chen
2e513c5b1b Merge "p2p: check the length of the network name bytes" into qt-qpr1-dev 2019-12-12 02:27:34 +00:00
Grace Cheng
1c0bf0f17f 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
2019-12-12 02:23:28 +00:00
Jay Aliomer
73582b6d49 Merge "Updated UiModeManagerService to always trigger configuration change for setNightMode if it is AAE." into qt-qpr1-dev 2019-12-12 01:21:08 +00:00
Automerger Merge Worker
6b94e44a21 [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
2019-12-12 01:00:30 +00:00
Automerger Merge Worker
13aa01fd49 [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
2019-12-12 00:38:49 +00:00
Automerger Merge Worker
1b79aef399 [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
2019-12-12 00:17:28 +00:00
Erin Yan
65664b2909 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
2019-12-11 16:04:36 -08:00
Lorenzo Colitti
6e79d000ab 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.
2019-12-11 23:55:10 +00:00
JianYang Liu
d7d27271ff 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-11 23:30:03 +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
Patrick Baumann
bf04ea6d3b RESTRICT AUTOMERGE
Fixes NPE when preparing app data during init

When deleting an unused static shared library on Q, the user manager was
fetched via mContext.getSystemService. At this time during boot, the
service wasn't registered and so null was returned. This has already
been addressed in R with a move to injecting dependencies in the
PackageManagerService constructor.

Bug: 142083996
Bug: 141413692
Test: manual; remove static dependency on eng Q build and reboot
Change-Id: I8ae4e331d09b4734c54cdc6887b273705dce88b1
Merged In: I8ae4e331d09b4734c54cdc6887b273705dce88b1
2019-12-11 15:07:56 -08:00
Patrick Baumann
428a272285 RESTRICT AUTOMERGE
Use KNOWN_PACKAGES when shared lib consumers

This change ensures we find ALL known packages that could be consuming a
shared library, not only currently installed ones. Without this check,
the system may get into a state in which we have currently uninstalled
but on-device apps that depend on a shared library that does not exist
on device.

This change also leaves static shared library packages on device even if
it's not installed for any of the remaining users as it could still be
used, but marked uninstalled for users in which it is consumed.

Bug: 141413692
Bug: 142083996
Test: Manual; attempt to remove shared lib after marking its consumer uninstalled.
Test: atest StaticSharedLibsHostTests
Change-Id: Id4e37c3e4d3ea3ad5fddae5d2c7305e56f50eeea
Merged In: Id4e37c3e4d3ea3ad5fddae5d2c7305e56f50eeea
2019-12-11 15:07:46 -08:00
Patrick Baumann
1bb2d3c62f RESTRICT AUTOMERGE
Handles null outInfo in deleteSystemPackageLI

This change adds null checks before accessing outInfo in
deleteSystemPackageLI.

Bug: 142083996
Bug: 141413692
Test: manual; remove static dependency on eng build and reboot
Change-Id: If0fd48343e89cbb77ccd25826656194195d5b0cd
(cherry picked from commit 1747101650)
Merged In: If0fd48343e89cbb77ccd25826656194195d5b0cd
2019-12-11 15:07:34 -08: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
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
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: aced288d66 am: 62a0566244
  RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6 am: bccb8bec0a
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
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
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