OSDN Git Service
Automerger Merge Worker [Thu, 9 Jan 2020 16:50:08 +0000 (16:50 +0000)]
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am:
361f1e97f6 -s ours
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1
9352cb24b1 is in history
Change-Id: Id83288231d705e604e5094d40d211c0c940c4dd4
Automerger Merge Worker [Thu, 9 Jan 2020 16:49:00 +0000 (16:49 +0000)]
[automerger skipped] Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am:
e422bc0c8f am:
43d5e3bb62 am:
929c2c5e1b am:
0cf089521a -s ours
am skip reason: Change-Id I8ae4e331d09b4734c54cdc6887b273705dce88b1 with SHA-1
bf04ea6d3b is in history
Change-Id: I8dd0a9c26382b390dd7417fe35820abce79fdb92
Automerger Merge Worker [Thu, 9 Jan 2020 16:48:50 +0000 (16:48 +0000)]
[automerger skipped] Use KNOWN_PACKAGES when shared lib consumers am:
08315953bc am:
e580843476 am:
d46ef183b1 am:
d6f29b2711 -s ours
am skip reason: Change-Id Id4e37c3e4d3ea3ad5fddae5d2c7305e56f50eeea with SHA-1
428a272285 is in history
Change-Id: Ia06b75350be3d1a99972e9763653fb0b6422b131
Automerger Merge Worker [Thu, 9 Jan 2020 16:48:29 +0000 (16:48 +0000)]
[automerger skipped] Handles null outInfo in deleteSystemPackageLI am:
6afabce549 am:
ae901aceda am:
3e28284fb8 am:
9f31fb9eaf -s ours
am skip reason: skipped by user patb
Change-Id: I1be1d1947f31c4c9e89f6de3768a578f58511668
Paul Hu [Thu, 9 Jan 2020 08:53:08 +0000 (08:53 +0000)]
Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev
Paul Hu [Thu, 9 Jan 2020 05:41:52 +0000 (05:41 +0000)]
Merge "Fix PermissionMonitor issues" into qt-dev
Automerger Merge Worker [Thu, 9 Jan 2020 01:50:54 +0000 (01:50 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am:
e422bc0c8f am:
43d5e3bb62 am:
929c2c5e1b
Change-Id: I59ffea6df5c62eb899b3603c8767318e96af195a
Automerger Merge Worker [Thu, 9 Jan 2020 01:50:38 +0000 (01:50 +0000)]
Use KNOWN_PACKAGES when shared lib consumers am:
08315953bc am:
e580843476 am:
d46ef183b1
Change-Id: I6a21d79dc45635a49540f5d821094925b2e71d01
Automerger Merge Worker [Thu, 9 Jan 2020 01:50:24 +0000 (01:50 +0000)]
Handles null outInfo in deleteSystemPackageLI am:
6afabce549 am:
ae901aceda am:
3e28284fb8
Change-Id: Ib34f13ac3d1e34dbe639dc19c1c664aab9d7f17d
Automerger Merge Worker [Thu, 9 Jan 2020 01:04:14 +0000 (01:04 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am:
e422bc0c8f am:
43d5e3bb62
Change-Id: I5df542202c561a4ed931b918ccbaed317a8ba942
Automerger Merge Worker [Thu, 9 Jan 2020 01:03:58 +0000 (01:03 +0000)]
Use KNOWN_PACKAGES when shared lib consumers am:
08315953bc am:
e580843476
Change-Id: I64af9ee49999f2de11f1a6779e116357649f63b2
Automerger Merge Worker [Thu, 9 Jan 2020 01:03:45 +0000 (01:03 +0000)]
Handles null outInfo in deleteSystemPackageLI am:
6afabce549 am:
ae901aceda
Change-Id: I2741bc7999cd2b1c1e16b982791f72e3023361c7
Automerger Merge Worker [Thu, 9 Jan 2020 00:08:31 +0000 (00:08 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am:
e422bc0c8f
Change-Id: I7efbfda4517e46abf406fd53487836704a941a2e
Automerger Merge Worker [Thu, 9 Jan 2020 00:08:14 +0000 (00:08 +0000)]
Use KNOWN_PACKAGES when shared lib consumers am:
08315953bc
Change-Id: I3ab4cc8d36bd79f3b7342cf0d0fa3056d08988e7
Automerger Merge Worker [Thu, 9 Jan 2020 00:08:02 +0000 (00:08 +0000)]
Handles null outInfo in deleteSystemPackageLI am:
6afabce549
Change-Id: I077e6febea84013403feb65842ae99bc449ac737
Bryan Ferris [Wed, 8 Jan 2020 22:46:45 +0000 (22:46 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev
* changes:
Fixes NPE when preparing app data during init
Use KNOWN_PACKAGES when shared lib consumers
Handles null outInfo in deleteSystemPackageLI
Patrick Baumann [Wed, 6 Nov 2019 18:36:39 +0000 (10:36 -0800)]
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)]
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
Adam He [Wed, 8 Jan 2020 01:16:40 +0000 (01:16 +0000)]
Merge "DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from password fields." into qt-dev
Patrick Baumann [Fri, 23 Aug 2019 20:50:23 +0000 (13:50 -0700)]
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
Kevin Hufnagle [Tue, 7 Jan 2020 22:29:32 +0000 (22:29 +0000)]
Merge "docs: Add documentation for equals() method" into qt-dev
Kevin Hufnagle [Fri, 3 Jan 2020 15:38:37 +0000 (07:38 -0800)]
docs: Add documentation for equals() method
Explain the conditions that must be true in order for two objects
of type `ComponentName` to be considered equal.
Test: make ds-docs -j32
Bug:
62991861
Change-Id: I162ecd825b187ca688af11271a937e3740a4a833
Exempt-From-Owner-Approval: Docs-only change
Kevin Hufnagle [Fri, 3 Jan 2020 20:05:28 +0000 (20:05 +0000)]
docs: Fix typo in IMPORTANCE_SERVICE description
Test: make ds-docs -j32
Bug:
140783404
Change-Id: Ife86109eebefe9c87f7c9ed4a0587676e3392d90
Exempt-From-Owner-Approval: Docs-only change
Automerger Merge Worker [Thu, 2 Jan 2020 21:11:32 +0000 (21:11 +0000)]
Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am:
546c644f27 am:
af521c4ced
Change-Id: Id28175d26ec9910e184d5520cdf280e3ab831cf4
Automerger Merge Worker [Thu, 2 Jan 2020 20:47:01 +0000 (20:47 +0000)]
Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am:
546c644f27
Change-Id: I511da6d59c3b525cb678d6bb08a6cfa8e4e5a94f
TreeHugger Robot [Thu, 2 Jan 2020 20:31:27 +0000 (20:31 +0000)]
Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev
Paul Hu [Mon, 25 Nov 2019 18:35:55 +0000 (10:35 -0800)]
Fix PermissionMonitor issues
PermissionMonitor#hasPermission only checks permssions that app
requested but it doesn't check whether the permission can be
granted to this app. If requested permission doens't be granted
to app, this method still returns that app has this permission.
Then PermissionMonitor will pass this info to netd that means
this app still can use network even restricted network without
granted privileged permission like CONNECTIVITY_INTERNAL or
CONNECTIVITY_USE_RESTRICTED_NETWORKS.
PermissionMonitor#hasUseBackgroundNetworksPermission only uses
the first package name of the uid for checking permission.
This is incorrect since each package declared different
permissions. So using the mApps which already checked both
network and using restricted network permissions. If uid is in
the mApps list that means uid has one of permission at least.
Bug:
144679405
Test: Build, flash, manual test
atest FrameworksNetTests
Change-Id: I2da730feda4d7ebed1f158b073167bb3964b3e7d
Merged-In: I8b03c9e23ffc9ff46264d6307fb841a7eda76a76
Merged-In: Ib08a940a6e5d3365c392ab7174d8484c197e0947
(cherry picked from commit
2e1da35b3b903f4aa01435c46b7014b88a41328d)
paulhu [Mon, 16 Dec 2019 10:24:05 +0000 (18:24 +0800)]
Fix security problem on PermissionMonitor#hasPermission
PermissionMonitor#hasPermission only checks permssions that app
requested but it doesn't check whether the permission can be
granted to this app. If requested permission doens't be granted
to app, this method still returns that app has this permission.
Then PermissionMonitor will pass this info to netd that means
this app still can use network even restricted network without
granted privileged permission like CONNECTIVITY_INTERNAL or
CONNECTIVITY_USE_RESTRICTED_NETWORKS.
Bug:
144679405
Test: Build, flash, manual test
Change-Id: Iae9c273af822b18c2e6fce04848a86f8dea6410a
Merged-In: I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4
Merged-In: I2da730feda4d7ebed1f158b073167bb3964b3e7d
Andrew Solovay [Tue, 17 Dec 2019 23:20:29 +0000 (23:20 +0000)]
Merge "docs: Fixed typo" into qt-dev
Adam He [Fri, 25 Oct 2019 18:58:15 +0000 (11:58 -0700)]
DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from
password fields.
Bug:
141703197
Test: atest android.autofillservice.cts.augmented
Change-Id: I09a75ad5674a0cfdb169b49461bfec2a129e781f
Andrew Solovay [Mon, 16 Dec 2019 22:52:12 +0000 (14:52 -0800)]
docs: Fixed typo
Fixed a clear copy/paste error, docs had said "call getHeight() to
get the width" when it should have been "...to get the height".
Skipping staging since it's a simple text change.
Change-Id: Ic06557ac38517f409943585054835d774240ccf3
Test: make ds-docs
Exempt-from-owner-approval: Docs-only change
Bug:
144537947
Andrew Solovay [Thu, 5 Dec 2019 21:05:38 +0000 (13:05 -0800)]
docs: Removing most of the intro to PowerManager API
The intro text says PowerManager is discouraged, and almost
all the available wakelock options have long been deprecated.
Given that, I think it makes sense to remove most of that
intro and just point devs to FLAG_KEEP_SCREEN_ON instead.
Staged to:
go/dac-stage/reference/android/os/PowerManager
Test: make ds-docs
Bug:
145699347
Change-Id: I517366903f3d9743166d7edaddc08471af0803d9
TreeHugger Robot [Fri, 13 Dec 2019 18:50:54 +0000 (18:50 +0000)]
Merge "Put userId at the end of parcel" into qt-dev
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: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-dev
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 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
Tony Mak [Tue, 10 Dec 2019 07:22:23 +0000 (07:22 +0000)]
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
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: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 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: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: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: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
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: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
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
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
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
Nick Cook [Mon, 2 Dec 2019 22:50:55 +0000 (22:50 +0000)]
Merge "docs: Delete duplicate word." into qt-dev
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
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 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: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