Commit Graph

418641 Commits

Author SHA1 Message Date
Tony Mak
642c22b223 Put userId at the end of parcel
userId is a new field added in ag/8350816, and it is written in between
some old fields when we parcelize it.

That breaks AiAi because some of its code rely on the implementation
details of SelectionEvent.writeToParcel.

In the long run, we may want to update AiAi such that it works
without this assumption, but before that, let's fix that in platform
for now.

Bug: 145962464
Bug: 123232892

Test: atest FrameworksCoreTests:android.view.textclassifier.SelectionEventTest

Merged-In: I98137a095cddf0fb4c600e1e09eef507bb750528
Change-Id: I66f65ac4c81ca964f710404fd081496355276435
2019-12-13 02:47:21 +00:00
TreeHugger Robot
e8ba34a851 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
2019-12-13 00:15:10 +00:00
Automerger Merge Worker
3b8b2681aa [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
2019-12-12 07:30:47 +00:00
Automerger Merge Worker
5166a0a3a0 [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
2019-12-12 07:30:36 +00:00
Automerger Merge Worker
1300362067 [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
2019-12-12 07:10:26 +00:00
Automerger Merge Worker
dec51767c9 [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
2019-12-12 07:10:17 +00:00
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
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
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
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
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
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
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
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
Abodunrinwa Toki
4828033816 Merge "RESTRICT AUTOMERGE Disable TextClassifier for RemoteInputView." into pi-dev 2019-12-11 21:58:38 +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
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
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
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
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
Automerger Merge Worker
063d83ca63 Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad
Change-Id: I8439eee725f85cc1e939772663a4217e5dde2e38
2019-12-11 19:10:38 +00:00
Automerger Merge Worker
9b1ddfe488 DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5
Change-Id: I438383977e4b7454e732dba8d2906a8c333f2bad
2019-12-11 19:10:27 +00:00
Taran Singh
70ffc41cad Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev 2019-12-11 18:52:54 +00:00
Lorenzo Colitti
029d9ea119 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 414b8c8b1c.

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
2019-12-11 20:19:40 +09:00
Lorenzo Colitti
60cd85533d 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
2019-12-11 20:19:29 +09:00
TreeHugger Robot
a2e31e4794 Merge "Revoke granted permission when the permission defining app is removed." into qt-dev 2019-12-10 20:39:08 +00:00
TreeHugger Robot
aa23deba63 Merge "DO NOT MERGE Remove *.aidl for parcelable declarations from srcs" into qt-dev 2019-12-05 00:28:44 +00:00
Jin Seok Park
acd260e11f Merge "[DO NOT MERGE] Return correct offsets for getAttributeRange()" into qt-dev 2019-12-04 02:16:32 +00:00
Nick Cook
54a4bdccc4 Merge "docs: Delete duplicate word." into qt-dev 2019-12-02 22:50:55 +00:00
TreeHugger Robot
20bf2110c3 Merge "Doc: Adds a link to the WifiRTT codelab" into qt-dev 2019-12-02 22:18:44 +00:00
David Castro
2d61e036f3 Doc: Adds a link to the WifiRTT codelab
BUG:113332240
Change-Id: I404de18dd3c8880332b5a103079723fb1927d60d
Exempt-From-Owner-Approval: Docs-only change
2019-12-02 22:18:19 +00:00
Nick Cook
4ca501a6bf docs: Delete duplicate word.
Change-Id: I09fcceda7a7b0fd291c57a3005d4e027ecb99bcc
bug: 145259639
2019-11-27 22:03:43 +00:00
Jiyong Park
6e1127e004 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
2019-11-25 06:19:41 +00:00
TreeHugger Robot
3b74a86752 Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList." into qt-dev 2019-11-22 16:48:36 +00:00
David Castro
716edf3883 Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev 2019-11-22 15:57:29 +00:00
David Castro
e3681d08e9 Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev 2019-11-22 03:36:51 +00:00
David Castro
46676918a1 Updates the description of the provider parameter as per feedback in
BUG:111695926.

Change-Id: I74fa22d7733d06616be44da3923649271584090c
2019-11-21 16:53:21 +00:00
TreeHugger Robot
8bd0310456 Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev 2019-11-21 12:37:08 +00:00
David Castro
7904f376bb Removed the confusing note as per guidance from mylesgw@ in
BUG:117309989.

Change-Id: I07680c04798642d21420bbea5c6b592c1c741f43
2019-11-21 03:44:32 +00:00