OSDN Git Service
Automerger Merge Worker [Fri, 13 Dec 2019 18:04:31 +0000 (18:04 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f am:
5f1d7675ea am:
ad56194783 -s ours am:
929b23ac43 -s ours am:
d98efda2ba
Change-Id: I7feee02b0dfab2d74ee82fee39a2ba5a77c27f99
Automerger Merge Worker [Fri, 13 Dec 2019 18:04:14 +0000 (18:04 +0000)]
[automerger skipped] RESTRICT AUTOMERGE am:
fe4bf7926e am:
9680a6d75d am:
e0465e2881 -s ours am:
8c5af9b7d9 -s ours am:
1ed77b86cf
Change-Id: Icdc837b6af117638414dea01063a66161ce8465c
Automerger Merge Worker [Fri, 13 Dec 2019 17:50:17 +0000 (17:50 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f am:
5f1d7675ea am:
ad56194783 -s ours am:
929b23ac43 -s ours
am skip reason: subject contains skip directive
Change-Id: I53d35a4d2f2c517ec50cfdbc22008bda2e4041c5
Automerger Merge Worker [Fri, 13 Dec 2019 17:49:57 +0000 (17:49 +0000)]
[automerger skipped] RESTRICT AUTOMERGE am:
fe4bf7926e am:
9680a6d75d am:
e0465e2881 -s ours am:
8c5af9b7d9 -s ours
am skip reason: subject contains skip directive
Change-Id: I05c1ed670d07b677a8e6a20b4d50a06b7482cbc6
Automerger Merge Worker [Fri, 13 Dec 2019 17:37:31 +0000 (17:37 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f am:
5f1d7675ea am:
ad56194783 -s ours
am skip reason: subject contains skip directive
Change-Id: I5b7670226082f60abc45ae023e687a8b0191f20e
Automerger Merge Worker [Fri, 13 Dec 2019 17:37:15 +0000 (17:37 +0000)]
[automerger skipped] RESTRICT AUTOMERGE am:
fe4bf7926e am:
9680a6d75d am:
e0465e2881 -s ours
am skip reason: subject contains skip directive
Change-Id: I67f8185d1a6d3b75fad924d07e8eb6e8e9db0207
Automerger Merge Worker [Fri, 13 Dec 2019 17:14:42 +0000 (17:14 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f am:
5f1d7675ea
Change-Id: I197f9d12435267964c84bfcee18c371611fa728c
Automerger Merge Worker [Fri, 13 Dec 2019 17:14:28 +0000 (17:14 +0000)]
RESTRICT AUTOMERGE am:
fe4bf7926e am:
9680a6d75d
Change-Id: I490bf47b2c6588da4b28998333fbfb197688d6c0
Automerger Merge Worker [Fri, 13 Dec 2019 17:07:57 +0000 (17:07 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am:
b64534ceb2 -s ours am:
4505eccb39 -s ours am:
3c352b62af
Change-Id: Ia263bc63065b686eec529b04036bcd89df0135e4
Automerger Merge Worker [Fri, 13 Dec 2019 17:07:28 +0000 (17:07 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am:
4b6e07283c -s ours am:
2b4b2c3d5a
Change-Id: I01afa68e3cea31b7fe868d14fb612718cdf2a257
Automerger Merge Worker [Fri, 13 Dec 2019 17:07:06 +0000 (17:07 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev am:
1e53d56481
Change-Id: I19ff0f27ad95dc5d80a1c6ae444a91befeba9670
Automerger Merge Worker [Fri, 13 Dec 2019 17:06:50 +0000 (17:06 +0000)]
RESTRICT AUTOMERGE am:
b81f269ae2
Change-Id: Ia2afa630f1df185c6d38775768d9f3dfb54a2f16
Automerger Merge Worker [Fri, 13 Dec 2019 17:02:27 +0000 (17:02 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am:
b64534ceb2 -s ours am:
4505eccb39 -s ours
am skip reason: subject contains skip directive
Change-Id: I7a98fa39acee962cf209fa64abdac9a708497d98
Automerger Merge Worker [Fri, 13 Dec 2019 17:02:07 +0000 (17:02 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f
Change-Id: I0b4b6a26b538d6f51780413376d70b6906877893
Automerger Merge Worker [Fri, 13 Dec 2019 17:01:46 +0000 (17:01 +0000)]
RESTRICT AUTOMERGE am:
fe4bf7926e
Change-Id: I92627314fc09b129f37b08192084c5b807a00ed2
Automerger Merge Worker [Fri, 13 Dec 2019 17:01:11 +0000 (17:01 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am:
4b6e07283c -s ours
am skip reason: subject contains skip directive
Change-Id: I5e7c7ba4ba9d7c460a1e73e9e5b0feb01b5ae31d
Automerger Merge Worker [Fri, 13 Dec 2019 16:57:18 +0000 (16:57 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am:
b64534ceb2 -s ours
am skip reason: subject contains skip directive
Change-Id: I46e62bd45f14b79772dbb584167a01bef66b314b
Sterling Huber [Fri, 13 Dec 2019 16:44:15 +0000 (16:44 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev
Sterling Huber [Fri, 13 Dec 2019 16:44:15 +0000 (16:44 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev
Sterling Huber [Fri, 13 Dec 2019 16:44:15 +0000 (16:44 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev
Sterling Huber [Fri, 13 Dec 2019 16:44:14 +0000 (16:44 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev
Automerger Merge Worker [Fri, 13 Dec 2019 00:26:40 +0000 (00:26 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am:
e8ba34a851
Change-Id: Iefe7ac373d783298f608effd81ae50b21053d69c
Automerger Merge Worker [Fri, 13 Dec 2019 00:26:31 +0000 (00:26 +0000)]
RESTRICT AUTOMERGE am:
bf04ea6d3b
Change-Id: I4c99e09d21cd93af567f186ae1e86ab076c96ce3
TreeHugger Robot [Fri, 13 Dec 2019 00:15:10 +0000 (00:15 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev
* changes:
RESTRICT AUTOMERGE Fixes NPE when preparing app data during init
RESTRICT AUTOMERGE Use KNOWN_PACKAGES when shared lib consumers
RESTRICT AUTOMERGE Handles null outInfo in deleteSystemPackageLI
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
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
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
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
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.
Patrick Baumann [Wed, 6 Nov 2019 18:36:39 +0000 (10:36 -0800)]
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
Patrick Baumann [Thu, 10 Oct 2019 22:50:28 +0000 (15:50 -0700)]
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
Patrick Baumann [Fri, 23 Aug 2019 20:50:23 +0000 (13:50 -0700)]
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
17471016508bb9c9ffb8c3946dda0b4897d722f1)
Merged In: If0fd48343e89cbb77ccd25826656194195d5b0cd
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: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
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: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
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
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
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
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
Sterling Huber [Thu, 7 Nov 2019 19:04:03 +0000 (11:04 -0800)]
RESTRICT AUTOMERGE
Make toasts non-clickable
Since enforcement was only on client-side, in Toast class, an app could
use reflection (or other means) to make the Toast clickable. This is a
security vulnerability since it allows tapjacking, that is, intercept touch
events and do stuff like steal PINs and passwords.
This CL brings the enforcement to the system by applying flag
FLAG_NOT_TOUCHABLE.
Test: Construct app that uses reflection to remove flag FLAG_NOT_TOUCHABLE and
log click events. Then:
1) Observe click events are logged without this CL.
2) Observer click events are not logged with this CL.
Bug:
128674520
Change-Id: Ica346c853dcb9a1e494f7143ba1c38d22c0003d0
Sterling Huber [Thu, 7 Nov 2019 19:04:03 +0000 (11:04 -0800)]
RESTRICT AUTOMERGE
Make toasts non-clickable
Since enforcement was only on client-side, in Toast class, an app could
use reflection (or other means) to make the Toast clickable. This is a
security vulnerability since it allows tapjacking, that is, intercept touch
events and do stuff like steal PINs and passwords.
This CL brings the enforcement to the system by applying flag
FLAG_NOT_TOUCHABLE.
Test: Construct app that uses reflection to remove flag FLAG_NOT_TOUCHABLE and
log click events. Then:
1) Observe click events are logged without this CL.
2) Observer click events are not logged with this CL.
Bug:
128674520
Change-Id: Ica346c853dcb9a1e494f7143ba1c38d22c0003d0
Merged In: Ica346c853dcb9a1e494f7143ba1c38d22c0003d0
Sterling Huber [Thu, 7 Nov 2019 19:04:03 +0000 (11:04 -0800)]
RESTRICT AUTOMERGE
Make toasts non-clickable
Since enforcement was only on client-side, in Toast class, an app could
use reflection (or other means) to make the Toast clickable. This is a
security vulnerability since it allows tapjacking, that is, intercept touch
events and do stuff like steal PINs and passwords.
This CL brings the enforcement to the system by applying flag
FLAG_NOT_TOUCHABLE.
Test: atest CtsWindowManagetDeviceTestCases:ToastTest
Test: Construct app that uses reflection to remove flag FLAG_NOT_TOUCHABLE and
log click events. Then:
1) Observe click events are logged without this CL.
2) Observer click events are not logged with this CL.
Bug:
128674520
Change-Id: Ica346c853dcb9a1e494f7143ba1c38d22c0003d0
Bernardo Rufino [Tue, 22 Oct 2019 10:53:42 +0000 (11:53 +0100)]
RESTRICT AUTOMERGE
Make toasts non-clickable
Since enforcement was only on client-side, in Toast class, an app could
use reflection (or other means) to make the Toast clickable. This is a
security vulnerability since it allows tapjacking, that is, intercept touch
events and do stuff like steal PINs and passwords.
This CL brings the enforcement to the system by applying flag
FLAG_NOT_TOUCHABLE.
Test: atest CtsWindowManagerDeviceTestCases:ToastTest
Test: Construct app that uses reflection to remove flag FLAG_NOT_TOUCHABLE and
log click events. Then:
1) Observe click events are logged without this CL.
2) Observer click events are not logged with this CL.
Bug:
128674520
Change-Id: Ic36585bc4f186e0224f5b687c49c0b3d9266838c
Automerger Merge Worker [Thu, 5 Dec 2019 00:57:26 +0000 (00:57 +0000)]
Merge "DO NOT MERGE Remove *.aidl for parcelable declarations from srcs" into qt-dev am:
aa23deba63
Change-Id: I06341bc7fd8e57afa69f1bac570eea83f8541c48
Automerger Merge Worker [Thu, 5 Dec 2019 00:57:12 +0000 (00:57 +0000)]
DO NOT MERGE Remove *.aidl for parcelable declarations from srcs am:
6e1127e004
Change-Id: Ibd6fda029eb5898e8c6d0ae689d50e6ef8eb6150
TreeHugger Robot [Thu, 5 Dec 2019 00:28:44 +0000 (00:28 +0000)]
Merge "DO NOT MERGE Remove *.aidl for parcelable declarations from srcs" into qt-dev
Automerger Merge Worker [Wed, 4 Dec 2019 02:31:21 +0000 (02:31 +0000)]
Merge "[DO NOT MERGE] Return correct offsets for getAttributeRange()" into qt-dev am:
acd260e11f
Change-Id: I264d42c4c484dae65bd54256a014ca37f08d8e39
Automerger Merge Worker [Wed, 4 Dec 2019 02:30:44 +0000 (02:30 +0000)]
[DO NOT MERGE] Return correct offsets for getAttributeRange() am:
013afc4daf
Change-Id: I4593b8f6b7503391b41c4894298872fbe71f7fee
Jin Seok Park [Wed, 4 Dec 2019 02:16:32 +0000 (02:16 +0000)]
Merge "[DO NOT MERGE] Return correct offsets for getAttributeRange()" into qt-dev
Automerger Merge Worker [Mon, 2 Dec 2019 23:03:04 +0000 (23:03 +0000)]
Merge "docs: Delete duplicate word." into qt-dev am:
54a4bdccc4
Change-Id: I8a2aa5bc892412471324f3ec5edfa2aa6d39d62c
Nick Cook [Mon, 2 Dec 2019 22:50:55 +0000 (22:50 +0000)]
Merge "docs: Delete duplicate word." into qt-dev
Automerger Merge Worker [Mon, 2 Dec 2019 22:30:26 +0000 (22:30 +0000)]
Merge "Doc: Adds a link to the WifiRTT codelab" into qt-dev am:
20bf2110c3
Change-Id: Ibe2e2a2bee6acef662dd1235c6c887dae4571645
TreeHugger Robot [Mon, 2 Dec 2019 22:18:44 +0000 (22:18 +0000)]
Merge "Doc: Adds a link to the WifiRTT codelab" into qt-dev
David Castro [Fri, 15 Nov 2019 23:01:04 +0000 (23:01 +0000)]
Doc: Adds a link to the WifiRTT codelab
BUG:
113332240
Change-Id: I404de18dd3c8880332b5a103079723fb1927d60d
Exempt-From-Owner-Approval: Docs-only change
Nick Cook [Wed, 27 Nov 2019 22:03:40 +0000 (22:03 +0000)]
docs: Delete duplicate word.
Change-Id: I09fcceda7a7b0fd291c57a3005d4e027ecb99bcc
bug:
145259639
Jiyong Park [Mon, 21 Oct 2019 04:19:42 +0000 (13:19 +0900)]
DO NOT MERGE Remove *.aidl for parcelable declarations from srcs
When an AIDL file is listed in the srcs property, the build system
expects a Java file for the AIDL file even when the AIDL file is for a
parcelable declaration. Previously, the AIDL compiler generated an empty
Java file in that case, but with Iaa9c78c5df06afee165462db05c6dc6e11a1ba8a
that is no longer the case.
Therefore, removing two AIDL files for the parcelable declarations from
the srcs property.
Note that, in master branch (for R and beyond), we don't need to
filter-out such AIDL files because the build system expects a srcjar
file from AIDL files. This change is only for Q where the build system
change doesn't exist.
Bug:
143993752
Test: m
Merged-In: I0705ddf76b3c628127f65d75e0a8b06c6c250fe2
Change-Id: Iadb82092b8f6ea12c93285e9e0af18845f0feab9
David Castro [Fri, 22 Nov 2019 16:55:24 +0000 (08:55 -0800)]
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList." into qt-dev
am:
3b74a86752
Change-Id: I2b5e70ef834a0d0f4ccc3689d036321094a24170
TreeHugger Robot [Fri, 22 Nov 2019 16:48:36 +0000 (16:48 +0000)]
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList." into qt-dev
David Castro [Fri, 22 Nov 2019 16:25:24 +0000 (08:25 -0800)]
Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:
119380943." into qt-dev
am:
716edf3883
Change-Id: I74463f481c599c0680c8c536eef12ac1f23e6fa0
David Castro [Fri, 22 Nov 2019 15:57:29 +0000 (15:57 +0000)]
Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:
119380943." into qt-dev
David Castro [Fri, 22 Nov 2019 03:47:23 +0000 (19:47 -0800)]
Merge "Updates the description of the provider parameter as per feedback in BUG:
111695926." into qt-dev
am:
e3681d08e9
Change-Id: I927aa4ba7b60bc30de3588dafadc62c9c17109f4
David Castro [Fri, 22 Nov 2019 03:36:51 +0000 (03:36 +0000)]
Merge "Updates the description of the provider parameter as per feedback in BUG:
111695926." into qt-dev
David Castro [Mon, 18 Nov 2019 19:25:20 +0000 (19:25 +0000)]
Updates the description of the provider parameter as per feedback in
BUG:
111695926.
Change-Id: I74fa22d7733d06616be44da3923649271584090c
David Castro [Thu, 21 Nov 2019 12:45:04 +0000 (04:45 -0800)]
Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:
117309989." into qt-dev
am:
8bd0310456
Change-Id: Ib5d2d07b77e57d65bb5b028773ed063606247a16
TreeHugger Robot [Thu, 21 Nov 2019 12:37:08 +0000 (12:37 +0000)]
Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:
117309989." into qt-dev
David Castro [Fri, 15 Nov 2019 23:51:03 +0000 (23:51 +0000)]
Removed the confusing note as per guidance from mylesgw@ in
BUG:
117309989.
Change-Id: I07680c04798642d21420bbea5c6b592c1c741f43
David Castro [Mon, 18 Nov 2019 20:10:38 +0000 (20:10 +0000)]
Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList.
BUG:
140947822
Change-Id: I77b9e3a5b466afea51467418f25ffe7f1b921c7d