OSDN Git Service
Evan Laird [Mon, 7 Oct 2019 23:30:51 +0000 (16:30 -0700)]
[automerger skipped] Force FGS notifications to show for a minimum time
am:
3b8c4743f6 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1
5136eefeb3 is in history
Change-Id: I5ad32c66fa4502e232b802241789977252ddec8e
TreeHugger Robot [Mon, 7 Oct 2019 23:04:14 +0000 (23:04 +0000)]
Merge "Force FGS notifications to show for a minimum time" into qt-dev
TreeHugger Robot [Mon, 7 Oct 2019 20:14:31 +0000 (20:14 +0000)]
Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev
Kevin Hufnagle [Mon, 7 Oct 2019 19:35:38 +0000 (19:35 +0000)]
Merge "docs: Edited sharedUserId deprecation message" into qt-dev
Evan Laird [Mon, 5 Aug 2019 21:11:54 +0000 (17:11 -0400)]
Force FGS notifications to show for a minimum time
It's possible for a service to do a start/stop foreground and cause a
couple of things to happen:
NotificationManagerService will enqueue a EnqueueNotificationRunnable,
post a PostNotificationRunnable (for the startForeground), and then also
enqueue a CancelNotificationRunnable. There is some racy behavior here
in that the cancel runnable can get triggered in between enqueue and
post runnables. If the cancel happens first, then
NotificationListenerServices will never get the message.
This behavior is technically allowed, however for foreground services we
want to ensure that there is a minmum amount of time that notification
listeners are aware of the foreground service so that (for instance) the
FGS notification can be shown.
This CL does two things to mitigate this problem:
1. Introduce checking in the CancelNotificationRunnable such that it
will not cancel until after PostNotificationRunnable has finished
executing.
2. Introduce a NotificationLifetimeExtender method that will allow a
lifetime extender to manage the lifetime of a notification that has been
enqueued but not inflated yet.
Bug:
119041698
Test: atest NotificationManagerServiceTest
Test: atest ForegroundServiceNotificationListenerTest
Change-Id: I0680034ed9315aa2c05282524d48faaed066ebd0
Merged-In: I0680034ed9315aa2c05282524d48faaed066ebd0
Alan Stokes [Mon, 7 Oct 2019 14:41:57 +0000 (14:41 +0000)]
Merge "Revert new app installed notification doc" into qt-dev
Evan Laird [Fri, 4 Oct 2019 18:18:59 +0000 (14:18 -0400)]
Force FGS notifications to show for a minimum time
It's possible for a service to do a start/stop foreground and cause a
couple of things to happen:
NotificationManagerService will enqueue a EnqueueNotificationRunnable,
post a PostNotificationRunnable (for the startForeground), and then also
enqueue a CancelNotificationRunnable. There is some racy behavior here
in that the cancel runnable can get triggered in between enqueue and
post runnables. If the cancel happens first, then
NotificationListenerServices will never get the message.
This behavior is technically allowed, however for foreground services we
want to ensure that there is a minmum amount of time that notification
listeners are aware of the foreground service so that (for instance) the
FGS notification can be shown.
This CL does two things to mitigate this problem:
1. Introduce checking in the CancelNotificationRunnable such that it
will not cancel until after PostNotificationRunnable has finished
executing.
2. Introduce a NotificationLifetimeExtender method that will allow a
lifetime extender to manage the lifetime of a notification that has been
enqueued but not inflated yet.
Bug:
119041698
Test: atest NotificationManagerServiceTest
Test: atest ForegroundServiceLifetimeExtenderTest
Change-Id: I0680034ed9315aa2c05282524d48faaed066ebd0
Merged-In: I0680034ed9315aa2c05282524d48faaed066ebd0
Kevin Hufnagle [Fri, 4 Oct 2019 19:49:00 +0000 (19:49 +0000)]
docs: Edited sharedUserId deprecation message
Test: make ds-docs -j32
Bug:
142139123
Change-Id: I3485785126f268c76f81f760fc19e0506929b272
Philip P. Moltmann [Fri, 4 Oct 2019 18:23:30 +0000 (18:23 +0000)]
Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev
Bryan Ferris [Fri, 4 Oct 2019 17:42:36 +0000 (17:42 +0000)]
Merge "Only allow INSTALL_ALLOW_TEST from shell or root" into qt-dev
Ricky Wai [Fri, 4 Oct 2019 15:10:17 +0000 (16:10 +0100)]
Revert new app installed notification doc
Bug:
111214100
Test: Able to compile
Change-Id: Id4fdabf0e8c69074eb8cb5838ab11d9d5f030093
Kun Niu [Tue, 2 Jul 2019 00:59:25 +0000 (17:59 -0700)]
add java_api_finder plugin to mainline module Media to generate java APIs used by Media.
Bug:
129294170
Test: m updatable-media RUN_ERROR_PRONE=true |& tee media_error_prone.out
Change-Id: I3cdfe5e00394c6ff7b9c857f63a5e45ac79f8d24
(cherry picked from commit
6eff1d439b472b6114bc11f3a50c70ca7c68add7)
Merged-In: I3cdfe5e00394c6ff7b9c857f63a5e45ac79f8d24
Svet Ganov [Tue, 24 Sep 2019 04:32:08 +0000 (21:32 -0700)]
Update PermissionChecker usages to avoid unnecessary attribution.
We had accidental usages of the PermissionChecker for cases where no
private data was provided to the app but the checkPermission API on
the latter also did blame data access on the app. The PermissionChecker
was designed to handle IPC calls and not for generic API checks.
To avoid future accidental incorrect PermissionChecker usages this
change renames the existing APIs of the latter to clearly indicate
that they should be used for data delivery and also adds sibling
methods for doing the same permission checks for preflight purposes.
Also the documentation is improved to furhter assist developers.
In addition, this change fixes accidental permission checker usages
that blame when they should not by using the new preflight flavor
of the permission check APIs.
Test:
atest com.android.settingslib.location.RecentLocationAppsTest
atest CtsPermissionTestCases
added: LocationAccessCheckTest#notificationOnlyForAccessesSinceFeatureWasEnabled
added: LocationAccessCheckTest#noNotificationIfFeatureDisabled
added: LocationAccessCheckTest#noNotificationIfBlamerNotSystemOrLocationProvider
added: LocationAccessCheckTest#testOpeningLocationSettingsDoesNotTriggerAccess
bug:
141028068
Merged-In: I65c71569d0dd8a40bc6fecabb22c5373dd6e806e
Change-Id: I65c71569d0dd8a40bc6fecabb22c5373dd6e806e
Seigo Nonaka [Wed, 2 Oct 2019 17:30:08 +0000 (10:30 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am:
4ce901e405 am:
b51c7bb175 am:
af62f3a7b3 -s ours
am:
86ddd9eb6a -s ours
am skip reason: subject contains skip directive
Change-Id: Ie6db3a3499cb02ef1bd34232a4ca8fb362b18e7d
Seigo Nonaka [Wed, 2 Oct 2019 17:10:34 +0000 (10:10 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am:
4ce901e405 am:
b51c7bb175
am:
af62f3a7b3 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifb67887f4b1a5860dca2569e57a74911efde801d
Seigo Nonaka [Wed, 2 Oct 2019 16:59:45 +0000 (09:59 -0700)]
RESTRICT AUTOMERGE Do not compute outside given range in TextLine am:
4ce901e405
am:
b51c7bb175
Change-Id: I6770f4b1a884020c374a75f67eb762b2c2bfd538
Sterling Huber [Wed, 2 Oct 2019 16:33:57 +0000 (09:33 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev
am:
e352c1f2bc -s ours
am skip reason: subject contains skip directive
Change-Id: Id51032f27a8325444290483a9a30da49da8ac2e2
Seigo Nonaka [Wed, 2 Oct 2019 16:33:53 +0000 (09:33 -0700)]
RESTRICT AUTOMERGE Do not compute outside given range in TextLine
am:
4ce901e405
Change-Id: I739746d80a8dd29998a67c1d9aaa2d3f804ac57c
Sterling Huber [Wed, 2 Oct 2019 15:51:19 +0000 (15:51 +0000)]
Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev
Seigo Nonaka [Mon, 16 Sep 2019 21:49:49 +0000 (14:49 -0700)]
RESTRICT AUTOMERGE
Do not compute outside given range in TextLine
This is second attempt of I646851973b3816bf9ba32dfe26748c0345a5a081
which breaks various layout test on application.
The empty string must be also handled by the TextLine since it
retrieves the default line height from the empty string.
Bug:
140632678
Test: StaticLayoutTest
Test: Manually done
Change-Id: I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735
Seigo Nonaka [Mon, 16 Sep 2019 21:49:49 +0000 (14:49 -0700)]
RESTRICT AUTOMERGE
Do not compute outside given range in TextLine
This is second attempt of I646851973b3816bf9ba32dfe26748c0345a5a081
which breaks various layout test on application.
The empty string must be also handled by the TextLine since it
retrieves the default line height from the empty string.
Bug:
140632678
Test: StaticLayoutTest
Test: Manually done
Change-Id: I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735
TreeHugger Robot [Mon, 30 Sep 2019 17:09:15 +0000 (17:09 +0000)]
Merge "Use NotoSansMyanmar (pure Unicode) fonts" into qt-dev
Kevin Hufnagle [Mon, 30 Sep 2019 16:10:39 +0000 (16:10 +0000)]
Merge "docs: Added link to multi-window drag how-to guide" into qt-dev
Bernardo Rufino [Mon, 30 Sep 2019 11:00:13 +0000 (11:00 +0000)]
Merge "Don't consider tasks with INITIALIZING top activity as visible" into qt-dev
Anna Malova [Mon, 30 Sep 2019 10:54:16 +0000 (10:54 +0000)]
Merge "[WebView] Minor javadoc fix for WebSettings." into qt-dev
Suprabh Shukla [Sat, 28 Sep 2019 02:31:47 +0000 (19:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev
am:
0e8f1fa5e9 -s ours
am skip reason: subject contains skip directive
Change-Id: I53678027aa329651d6d6c9652aee847ee36b9b30
TreeHugger Robot [Sat, 28 Sep 2019 02:15:10 +0000 (02:15 +0000)]
Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev
TreeHugger Robot [Sat, 28 Sep 2019 02:08:05 +0000 (02:08 +0000)]
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev
Kevin Hufnagle [Fri, 27 Sep 2019 23:51:27 +0000 (23:51 +0000)]
docs: Added link to multi-window drag how-to guide
Test: make ds-docs -j32
Bug:
71008103
Change-Id: Ifcc50920cf3828697add018d1d3a6a827c7c9f98
Anna Malova [Wed, 25 Sep 2019 11:19:27 +0000 (12:19 +0100)]
[WebView] Minor javadoc fix for WebSettings.
No change to logic.
Test: N/A
Bug:
132394762
Change-Id: I957b0d8a03cd937b38611e32f6c012b01a6ad7da
Todd Kennedy [Fri, 20 Sep 2019 20:45:15 +0000 (13:45 -0700)]
Only allow INSTALL_ALLOW_TEST from shell or root
Bug:
141169173
Test: Manual. App can't be installed as test-only
Change-Id: Ib6dcca7901aa549d620448c0165c22270a3042be
Kevin Hufnagle [Tue, 24 Sep 2019 21:18:39 +0000 (21:18 +0000)]
Merge "docs: Modernized AccessibilityNodeProvider example" into qt-dev
Kevin Hufnagle [Mon, 23 Sep 2019 22:45:45 +0000 (22:45 +0000)]
Merge "docs: List BIOMETRIC_WEAK in setPasswordQuality()" into qt-dev
Kevin Hufnagle [Fri, 20 Sep 2019 22:14:46 +0000 (22:14 +0000)]
Merge "docs: Fixed link to material design for ScrollView" into qt-dev
Kevin Hufnagle [Wed, 18 Sep 2019 01:52:45 +0000 (01:52 +0000)]
docs: Fixed link to material design for ScrollView
Test: make ds-docs -j32
Bug:
141024886
Change-Id: I69d05cdf99d91f74143454c78c000128d1da42ce
TreeHugger Robot [Thu, 19 Sep 2019 14:50:10 +0000 (14:50 +0000)]
Merge "Acquire display suspend blocker for DozeService" into qt-dev
Bernardo Rufino [Thu, 29 Aug 2019 18:12:28 +0000 (19:12 +0100)]
Don't consider tasks with INITIALIZING top activity as visible
To fix b/
130645908, tasks with top activities in INITIALIZING state were
considered visible. This allowed apps to circumvent background activity
launch restriction by starting 2 activities when in a background stack.
The first activity will remain in INITIALIZING state (since it's in the
bg), so the second launch is permitted since top activity is
INITIALIZING.
Removing '|| topActivity.isState(INITIALIZING)' removes the
vulnerability and curiously still allow the legitimate use case of the
bug linked above to work, i.e. the test in ag/
7088262 still passes. This
is because of 2 reasons:
1) Grace period introduced in ag/
7638265.
2) Allow bg activity starts to put activity on top of bg task (instead of
fg’ing it) in ag/
7190176.
I verified (2) by removing the grace period check, reverting the linked
CL and verifying that the test failed.
This essentially reverts ag/
7090415.
Test: atest BackgroundActivityLaunchTest \
RootWindowContainerTests \
WmTests:ActivityStarterTests \
CtsWindowManagerDeviceTestCases:ActivityStarterTests
Bug:
138583650
Bug:
130645908
Change-Id: Iee4ba841c6c83888b55c5cb55fffc949048d2030
Kevin Hufnagle [Thu, 19 Sep 2019 00:20:47 +0000 (00:20 +0000)]
Merge "docs: Add condition for hiding synth. activities" into qt-dev
TreeHugger Robot [Wed, 18 Sep 2019 20:05:29 +0000 (20:05 +0000)]
Merge "Do not compute outside given range in TextLine" into qt-dev
Kevin Hufnagle [Tue, 17 Sep 2019 18:54:20 +0000 (18:54 +0000)]
Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev
Kevin Hufnagle [Fri, 13 Sep 2019 02:18:44 +0000 (02:18 +0000)]
docs: Add condition for hiding synth. activities
If an app doesn't have a launcher activity enabled by default, a
synthesized activity isn't created for that app.
Test: make ds-docs -j32
Bug:
140968734
Change-Id: I2fe8666ee8cde479f404e43c622f03891d96c38f
Suprabh Shukla [Mon, 16 Sep 2019 20:20:22 +0000 (13:20 -0700)]
DO NOT MERGE revoke certain app-ops on suspend
Revoking an apps authorizations to use camera and record or play audio
while suspended. Appops watchers will also be notified of this change to
re-evaluate privileges at the time of suspension.
Test: atest FrameworksServicesTests:SuspendPackagesTest
atest GtsSuspendAppsTestCases
Bug:
138636979
Change-Id: Ie95555856afdd56728125f7e60b6a78cf9fc0e58
Merged-In: Ic5fb1807deceabfd956b666fa76f8bcc94020ac3
Suprabh Shukla [Fri, 13 Sep 2019 00:35:22 +0000 (17:35 -0700)]
DO NOT MERGE revoke certain app-ops on suspend
Revoking an apps authorizations to use camera and record or play audio
while suspended. Appops watchers will also be notified of this change to
re-evaluate privileges at the time of suspension.
Test: atest FrameworksServicesTests:SuspendPackagesTest
Bug:
138636979
Change-Id: Ie95555856afdd56728125f7e60b6a78cf9fc0e58
Merged-In: Ie95555856afdd56728125f7e60b6a78cf9fc0e58
Merged-In: Ic5fb1807deceabfd956b666fa76f8bcc94020ac3
Seigo Nonaka [Mon, 16 Sep 2019 21:49:49 +0000 (14:49 -0700)]
Do not compute outside given range in TextLine
This is second attempt of I646851973b3816bf9ba32dfe26748c0345a5a081
which breaks various layout test on application.
The empty string must be also handled by the TextLine since it
retrieves the default line height from the empty string.
Bug:
140632678
Test: StaticLayoutTest
Test: Manually done
Change-Id: I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735
Kevin Hufnagle [Sat, 24 Aug 2019 01:04:09 +0000 (01:04 +0000)]
docs: Modernized AccessibilityNodeProvider example
Uses a delegate and more realistic method contents. Also added
language switcher for Kotlin-based and Java-based code.
Test: make ds-docs -j32
Bug:
138849874
Change-Id: Id31cf944f4adab2f09cf5004d68434b445da6eeb
Santos Cordon [Thu, 1 Aug 2019 17:33:20 +0000 (18:33 +0100)]
Acquire display suspend blocker for DozeService
If DozeService explicitly requests the display state to be on,
then PowerManager needs to acquire the display suspend blocker even
while in DOZE mode to prevent the system from constantly trying
to suspend.
Bug:
138195405
Test: atest PowerManagerServiceTest
Change-Id: I05f5b86789ced084d0814480b2fe89d74f96a54e
(cherry picked from commit
d9701abf0482d644551657124a315ee1e6638e85)
Jungshik Shin [Mon, 16 Sep 2019 05:57:31 +0000 (22:57 -0700)]
Use NotoSansMyanmar (pure Unicode) fonts
Revert Myanmar fonts to those on Android P.
Instead NotoSansMyanmar*-ZawDecode (Unicode-Zawgyi hybrid) fonts,
go back to NotoSansMyanmar and NotoSansMyanmarUI (pure Unicode) fonts.
Bug:
141019225
Change-Id: Ib2494b9b5cb148f598e69271c5676e7104f66ae3
TreeHugger Robot [Sat, 14 Sep 2019 12:10:43 +0000 (12:10 +0000)]
Merge "Revert "don't compute outside of visible range"" into qt-dev
Adam Seaton [Fri, 13 Sep 2019 22:08:30 +0000 (22:08 +0000)]
Revert "don't compute outside of visible range"
bug:
141016653
This reverts commit
0a57fe099a55ab3a7583b229fa7cfb905d6106f3.
Reason for revert: CL is implicated in https://b.corp.google.com/issues/
141016653
Change-Id: I39954226cb8971ee17e367692b3fd0e29871ad48
Jeff Sharkey [Thu, 12 Sep 2019 20:24:04 +0000 (13:24 -0700)]
Merge changes from topic "bp-
135269143-p" into pi-dev
am:
604d91d713
Change-Id: I4732eced6b91fd0f7a3e83197f4fcbf63b9c977d
Jeff Sharkey [Thu, 12 Sep 2019 20:23:56 +0000 (13:23 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am:
216bbc2a2e -s ours
am skip reason: subject contains skip directive
Change-Id: I34ab810a0ce6c747236b6e0660b0f69b8e12d4a1
Jeff Sharkey [Thu, 12 Sep 2019 19:59:29 +0000 (19:59 +0000)]
Merge changes from topic "bp-
135269143-p" into pi-dev
* changes:
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
Jeff Sharkey [Tue, 16 Jul 2019 22:50:42 +0000 (16:50 -0600)]
RESTRICT AUTOMERGE
Strict SQLiteQueryBuilder needs to be stricter.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change offers setStrictGrammar() to prevent this by outright
blocking subqueries in WHERE and HAVING clauses, and by requiring
that GROUP BY and ORDER BY clauses be composed only of valid columns.
This change also offers setStrictColumns() to require that all
untrusted column names are valid, such as those in ContentValues.
Relaxes to always allow aggregation operators on returned columns,
since untrusted callers can always calculate these manually.
Bug:
135270103
Bug:
135269143
Test: atest android.database.sqlite.cts.SQLiteQueryBuilderTest
Test: atest FrameworksCoreTests:android.database.sqlite.SQLiteTokenizerTest
Exempt-From-Owner-Approval: already approved in downstream branch
Change-Id: I6290afd19c966a8bdca71c377c88210d921a9f25
Jeff Sharkey [Thu, 12 Sep 2019 17:49:27 +0000 (10:49 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am:
f8a2d069b4 am:
f6aa7b8d8f am:
8acb456949 -s ours
am:
fd58ea607e -s ours
am skip reason: subject contains skip directive
Change-Id: I046483ec092ef5b4bbc9f736184d328f954974c7
Jeff Sharkey [Thu, 12 Sep 2019 17:49:22 +0000 (10:49 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5 am:
fc095efde0 am:
e89348b54b -s ours
am:
01787e9e4d -s ours
am skip reason: subject contains skip directive
Change-Id: I412ec10b29cb494e473bbfe8f50385676f50a00c
Jeff Sharkey [Thu, 12 Sep 2019 17:41:38 +0000 (10:41 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am:
7633a081ab am:
b0054f0518 am:
c97dfb57a8 -s ours
am:
40a236db41 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia508b84e09af199cd841d37c89a41c722d63a101
Jeff Sharkey [Thu, 12 Sep 2019 17:41:24 +0000 (10:41 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c am:
37e2229257 am:
bba6744ff4 -s ours
am:
2ccbb35723 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib655f9d604bfecbd6be64b1e4cfe9996a58fcbaa
Jeff Sharkey [Thu, 12 Sep 2019 17:31:54 +0000 (10:31 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am:
f8a2d069b4 am:
f6aa7b8d8f
am:
8acb456949 -s ours
am skip reason: subject contains skip directive
Change-Id: Id9934307cef63a331bb1fad3ba4fddee11393d98
Jeff Sharkey [Thu, 12 Sep 2019 17:31:49 +0000 (10:31 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5 am:
fc095efde0
am:
e89348b54b -s ours
am skip reason: subject contains skip directive
Change-Id: I80528a71e90049489b85b5c95baf93cbd3a17808
Jeff Sharkey [Thu, 12 Sep 2019 17:27:55 +0000 (10:27 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am:
7633a081ab am:
b0054f0518
am:
c97dfb57a8 -s ours
am skip reason: subject contains skip directive
Change-Id: I6467326680d2164bb4e2a9e54dc22cc490e2492d
Jeff Sharkey [Thu, 12 Sep 2019 17:27:37 +0000 (10:27 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c am:
37e2229257
am:
bba6744ff4 -s ours
am skip reason: subject contains skip directive
Change-Id: I8711dac1ad4d2512d64dc489d87ffd4a18c0ebd6
Jeff Sharkey [Thu, 12 Sep 2019 17:18:26 +0000 (10:18 -0700)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am:
f8a2d069b4
am:
f6aa7b8d8f
Change-Id: I466630af8385d6da164196f2420d040b2aa6e2ac
Jeff Sharkey [Thu, 12 Sep 2019 17:18:22 +0000 (10:18 -0700)]
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5
am:
fc095efde0
Change-Id: I9bbeb106c1abe977439420d8005f33f5a7c1eaa1
Jeff Sharkey [Thu, 12 Sep 2019 17:14:15 +0000 (10:14 -0700)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am:
7633a081ab
am:
b0054f0518
Change-Id: I491c415de567d0375296f293fcbb35ee21413ce6
Jeff Sharkey [Thu, 12 Sep 2019 17:14:00 +0000 (10:14 -0700)]
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c
am:
37e2229257
Change-Id: I3d7696be9733e40f31c160a77505c4e96ca05b5e
Jeff Sharkey [Thu, 12 Sep 2019 17:06:14 +0000 (10:06 -0700)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
am:
f8a2d069b4
Change-Id: If9534450fac2cd9b328f105be73f53c92ab14dbd
Jeff Sharkey [Thu, 12 Sep 2019 17:06:09 +0000 (10:06 -0700)]
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
am:
f683c688d5
Change-Id: I64ae89ecc92127de21503fbcfdd34c60a6f620bc
Jeff Sharkey [Thu, 12 Sep 2019 17:02:13 +0000 (10:02 -0700)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
am:
7633a081ab
Change-Id: Ia3853da8933c8c21fe06acad79059a3589eeb835
Jeff Sharkey [Thu, 12 Sep 2019 17:02:05 +0000 (10:02 -0700)]
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am:
92e5e5e45c
Change-Id: I2e0a5c5cd35f9abcf362d3db4514e1bbd6bd7035
Jeff Sharkey [Thu, 12 Sep 2019 16:33:21 +0000 (16:33 +0000)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
Jeff Sharkey [Thu, 12 Sep 2019 16:33:13 +0000 (16:33 +0000)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
Elias Wald [Thu, 12 Sep 2019 05:20:48 +0000 (05:20 +0000)]
Merge "Add keylayout for original xbox controller" into qt-dev
Jeff Sharkey [Thu, 18 Jul 2019 00:51:28 +0000 (18:51 -0600)]
RESTRICT AUTOMERGE
Enable stricter SQLiteQueryBuilder options.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change starts using setStrictColumns() and setStrictGrammar()
on SQLiteQueryBuilder to block this class of attacks. This means we
now need to define the projection mapping of valid columns, which
consists of both the columns defined in the public API and columns
read internally by DownloadInfo.Reader.
We're okay growing sAppReadableColumnsSet like this, since we're
relying on our trusted WHERE clause to filter away any rows that
don't belong to the calling UID.
Remove the legacy Lexer code, since we're now internally relying on
the robust and well-tested SQLiteTokenizer logic.
Bug:
135270103,
135269143
Test: cts-tradefed run cts -m CtsAppTestCases -t android.app.cts.DownloadManagerTest
Change-Id: Iec1e8ce18dc4a9564318e0473d9d3863c8c2988a
Bryan Ferris [Wed, 11 Sep 2019 22:59:15 +0000 (22:59 +0000)]
Merge changes from topic "bp-
135269143-q" into qt-dev
* changes:
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
TreeHugger Robot [Wed, 11 Sep 2019 21:38:08 +0000 (21:38 +0000)]
Merge "don't compute outside of visible range" into qt-dev
Siarhei Vishniakou [Wed, 11 Sep 2019 21:03:01 +0000 (22:03 +0100)]
Add keylayout for original xbox controller
We are still missing a key layout for the original xbox controller with
product id 02dd. Add the missing layout here.
Bug:
140808513
Test: manual test by plugging in the actual joystick and using the
custom tester app
Change-Id: Ib84e3ac04ff58f890ce7743423cc9b869af347db
Kevin Hufnagle [Wed, 11 Sep 2019 01:14:09 +0000 (01:14 +0000)]
docs: List BIOMETRIC_WEAK in setPasswordQuality()
Also converted curly quotes to straight in one of the notes.
Test: make ds-docs -j32
Bug:
135089189
Change-Id: I146fb7eec5da48496467a1bc7706f9d87dc339f7
Seigo Nonaka [Fri, 6 Sep 2019 23:34:07 +0000 (16:34 -0700)]
don't compute outside of visible range
Bug:
140632678
Test: manually done
Test: TreeHugger
Change-Id: I646851973b3816bf9ba32dfe26748c0345a5a081
TreeHugger Robot [Wed, 11 Sep 2019 16:14:10 +0000 (16:14 +0000)]
Merge "Update Xbox BT controller mapping for new FW" into qt-dev
Jared Henderson [Wed, 21 Aug 2019 22:37:59 +0000 (15:37 -0700)]
Update Xbox BT controller mapping for new FW
The Xbox controller (product id 0x02fd) is going to have a new firmware
update this fall that sends a different keycode (316/BUTTON_MODE) for
the Xbox button. The goal is to enable the Xbox button to make it to
apps on all Android versions -- with our without a controller-specific
key mapping file.
Unfortunately, the new Vendor_045e_Product_02fd.kl key mapping file
that was added to Android Q maps the pre-firmware-update
Xbox key code (172) to BUTTON_MODE, yet it makes no mention of key 316.
This results in apps getting a raw 316 scan code instead of
a BUTTON_MODE KeyEvent when using a controller with the latest firmware
on Android Q.
The fix is to add an additional key mapping for 316 that *also* maps to
BUTTON_MODE. With both mappings in place, both pre and post
firmware-updated controllers will get the correct behavior for the
Xbox button on Android Q.
Test: AFAIK, no CTS tests exist for Xbox controller key mappings;
we'll need to add some at a later date. I was unable to test this
change because I'm unable to write to the system directory on any
of my devices, but I know that mapping 316 to BUTTON_MODE will
fix the issue.
Signed-off-by: Jared Henderson <jaredh.microsoft@gmail.com>
Bug:
139512030
Bug:
140808513
Merged-In: I8600ea79a0aa8557267d6ca712e5d56680e7a98b
Change-Id: I8600ea79a0aa8557267d6ca712e5d56680e7a98b
TreeHugger Robot [Wed, 11 Sep 2019 06:05:23 +0000 (06:05 +0000)]
Merge "Use language tags to store Configuration's locale list." into qt-dev
Zongheng Wang [Wed, 11 Sep 2019 01:55:09 +0000 (18:55 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
1f9309bd11 am:
a376239229 -s ours am:
aee078eae7 -s ours
am:
870474af0c -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: I5c210241a714fc4064e8f83cc35e77315616337e
Zongheng Wang [Wed, 11 Sep 2019 01:41:23 +0000 (18:41 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
1f9309bd11 am:
a376239229 -s ours
am:
aee078eae7 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: Ifb20decfdf6a48b599931f87a733e97013538888
Zongheng Wang [Wed, 11 Sep 2019 01:30:59 +0000 (18:30 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
02046b4f2c -s ours
am:
a6c49f091d -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: Iebe662b90075b9fcc0fdeabcd6424b84355b05fb
Zongheng Wang [Wed, 11 Sep 2019 01:30:55 +0000 (18:30 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
1f9309bd11
am:
a376239229 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
02046b4f2c is in history
Change-Id: I3cc4d873250f924af768b37e97338024ee236e6e
Zongheng Wang [Wed, 11 Sep 2019 01:21:53 +0000 (18:21 -0700)]
[automerger skipped] Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev
am:
20d46e4bf1 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
efdcff2452 is in history
Change-Id: I695edafa45fc296fff1b84d786c8a804f5996934
Zongheng Wang [Wed, 11 Sep 2019 01:20:49 +0000 (18:20 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one
am:
02046b4f2c -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: I6003b908b417a8bb1d687b5eafe2f2646f63e814
Zongheng Wang [Wed, 11 Sep 2019 01:16:49 +0000 (18:16 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose one
am:
1f9309bd11
Change-Id: I142d2737f6444b5148963c1ca7af84e8cf0eded3
TreeHugger Robot [Wed, 11 Sep 2019 00:46:54 +0000 (00:46 +0000)]
Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev
TreeHugger Robot [Wed, 11 Sep 2019 00:46:08 +0000 (00:46 +0000)]
Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into qt-dev
Jeff Sharkey [Tue, 16 Jul 2019 22:50:42 +0000 (16:50 -0600)]
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change offers setStrictGrammar() to prevent this by outright
blocking subqueries in WHERE and HAVING clauses, and by requiring
that GROUP BY and ORDER BY clauses be composed only of valid columns.
This change also offers setStrictColumns() to require that all
untrusted column names are valid, such as those in ContentValues.
Relaxes to always allow aggregation operators on returned columns,
since untrusted callers can always calculate these manually.
Bug:
135270103,
135269143
Test: atest android.database.sqlite.cts.SQLiteQueryBuilderTest
Test: atest FrameworksCoreTests:android.database.sqlite.SQLiteTokenizerTest
Change-Id: I0dacb53170ce573a2fe103cbff455782bfdb5d41
Varun Shah [Tue, 10 Sep 2019 18:41:00 +0000 (14:41 -0400)]
Use language tags to store Configuration's locale list.
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.
Bug:
140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Merged-In: I53946ed4e31de0ffe9c84875c391a7dec6f5375a
Change-Id: Idaae690f79a5c680ad0059a52be62160d9dfb5e7
Colin Cross [Tue, 10 Sep 2019 19:18:48 +0000 (19:18 +0000)]
Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev
Varun Shah [Tue, 10 Sep 2019 18:30:47 +0000 (18:30 +0000)]
Revert "Use language tags to store Configuration's locale list."
This reverts commit
ff43f4e6a62bf04742bdcb205ba932de00e4da7c.
Reason for revert: b/
140813780
Change-Id: Id5988b9ec959ca9b294f6bd5caa30c8156238d0a
Jeff Sharkey [Tue, 16 Jul 2019 22:50:42 +0000 (16:50 -0600)]
RESTRICT AUTOMERGE
Strict SQLiteQueryBuilder needs to be stricter.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change offers setStrictGrammar() to prevent this by outright
blocking subqueries in WHERE and HAVING clauses, and by requiring
that GROUP BY and ORDER BY clauses be composed only of valid columns.
This change also offers setStrictColumns() to require that all
untrusted column names are valid, such as those in ContentValues.
Relaxes to always allow aggregation operators on returned columns,
since untrusted callers can always calculate these manually.
Bug:
135270103,
135269143
Test: cts-tradefed run cts -m CtsDatabaseTestCases -t android.database.sqlite.cts.SQLiteQueryBuilderTest
Change-Id: I6290afd19c966a8bdca71c377c88210d921a9f25
Jeff Sharkey [Thu, 18 Jul 2019 00:51:28 +0000 (18:51 -0600)]
RESTRICT AUTOMERGE
Enable stricter SQLiteQueryBuilder options.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change starts using setStrictColumns() and setStrictGrammar()
on SQLiteQueryBuilder to block this class of attacks. This means we
now need to define the projection mapping of valid columns, which
consists of both the columns defined in the public API and columns
read internally by DownloadInfo.Reader.
We're okay growing sAppReadableColumnsSet like this, since we're
relying on our trusted WHERE clause to filter away any rows that
don't belong to the calling UID.
Remove the legacy Lexer code, since we're now internally relying on
the robust and well-tested SQLiteTokenizer logic.
Bug:
135270103
Bug:
135269143
Test: atest DownloadProviderTests
Test: atest CtsAppTestCases:android.app.cts.DownloadManagerTest
Change-Id: Iec1e8ce18dc4a9564318e0473d9d3863c8c2988a
Varun Shah [Tue, 10 Sep 2019 16:51:37 +0000 (16:51 +0000)]
Merge "Use language tags to store Configuration's locale list." into qt-dev
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one
When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.
Bug:
138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Varun Shah [Sun, 8 Sep 2019 08:31:31 +0000 (01:31 -0700)]
Use language tags to store Configuration's locale list.
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.
Bug:
140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Change-Id: Id0e63ae4a7be578d1e93838b371320f86a787e0e
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one
When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.
Bug:
138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df