OSDN Git Service
Bernardo Rufino [Mon, 30 Sep 2019 11:12:52 +0000 (04:12 -0700)]
Merge "Don't consider tasks with INITIALIZING top activity as visible" into qt-dev
am:
0a252361dd
Change-Id: I077cf0c3e82ddcec213b50b5efdba97699a7ed0d
Anna Malova [Mon, 30 Sep 2019 11:08:44 +0000 (04:08 -0700)]
Merge "[WebView] Minor javadoc fix for WebSettings." into qt-dev
am:
63c65616ae
Change-Id: I3ee0487212dfb139da111e9a7314dc781db66b63
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:38:34 +0000 (19:38 -0700)]
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am:
0e8f1fa5e9 -s ours
am:
c6a2982b86 -s ours
am skip reason: change_id Ie95555856afdd56728125f7e60b6a78cf9fc0e58 with SHA1
873e19f63f is in history
Change-Id: I8c9e309eae92633cb6193f147f81d109cc812d7c
Suprabh Shukla [Sat, 28 Sep 2019 02:31:55 +0000 (19:31 -0700)]
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev
am:
b036952896
Change-Id: Ieb5d9cc6e8aee976069c7ebd0b8d01db9982d886
Suprabh Shukla [Sat, 28 Sep 2019 02:31:51 +0000 (19:31 -0700)]
DO NOT MERGE revoke certain app-ops on suspend
am:
873e19f63f
Change-Id: I2447a90e4935e53fc0d55510bb50938fdaea23fa
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
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
Evan Laird [Tue, 24 Sep 2019 23:14:05 +0000 (19:14 -0400)]
DO NOT MERGE Allow for HTML styling in mobile data type content descriptions
This CL implements a (somewhat hacky) way to enable HTML attributes in
the mobile data type content description strings. This way we can use
some basic styling in the Quick Settings cellular data tile which uses
it in a TextView.
We do this by assuming that the content description is valid, escaped
HTML, and send two separate CharSequences to all of the listeners, all
of which can then decide if they need the regular content description or
the prettified version.
Test: atest SystemUITests; system ui demo mode
Bug:
141177147
Change-Id: Idf387111b0cdc34ad3762eac0ec6c2b484b393e3
Merged-In: Idf387111b0cdc34ad3762eac0ec6c2b484b393e3
Kevin Hufnagle [Tue, 24 Sep 2019 22:06:18 +0000 (15:06 -0700)]
Merge "docs: Modernized AccessibilityNodeProvider example" into qt-dev
am:
e49cbb3a5d
Change-Id: I24a281dd7194ea5c731ecc02371734fe1fa315f8
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 23:08:03 +0000 (16:08 -0700)]
Merge "docs: List BIOMETRIC_WEAK in setPasswordQuality()" into qt-dev
am:
2a082b1e9e
Change-Id: I74d42b68ebed97c2db3a179e92ba3196ffc7a04f
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:39:50 +0000 (15:39 -0700)]
Merge "docs: Fixed link to material design for ScrollView" into qt-dev
am:
80b543b45a
Change-Id: Ic7cc4494a88e6feaedf85626270ed1e8057189f5
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
Santos Cordon [Thu, 19 Sep 2019 15:08:30 +0000 (08:08 -0700)]
Merge "Acquire display suspend blocker for DozeService" into qt-dev
am:
576a6f4ac5
Change-Id: I75471698513cfc72c87f0149d4da891d7156fa3b
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:32:55 +0000 (17:32 -0700)]
Merge "docs: Add condition for hiding synth. activities" into qt-dev
am:
00537efd07
Change-Id: I1ec3fb8fea7f6b5fe292807b3951fb265a9cbb94
Kevin Hufnagle [Thu, 19 Sep 2019 00:20:47 +0000 (00:20 +0000)]
Merge "docs: Add condition for hiding synth. activities" into qt-dev
Seigo Nonaka [Wed, 18 Sep 2019 20:17:17 +0000 (13:17 -0700)]
Merge "Do not compute outside given range in TextLine" into qt-dev
am:
01082fe6ae
Change-Id: I9d88c47a16747009fda893660fd36d325d212a40
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 19:19:12 +0000 (12:19 -0700)]
Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev
am:
1fe99017eb
Change-Id: I13ba0297750b5b375f4874640b14b4955d17eeaa
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)
Adam Seaton [Sat, 14 Sep 2019 12:28:23 +0000 (05:28 -0700)]
Merge "Revert "don't compute outside of visible range"" into qt-dev
am:
e4d9618d67
Change-Id: I45acc1f2174f7faddfcd3e2f025e412afb8625d0
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
TreeHugger Robot [Fri, 13 Sep 2019 05:26:35 +0000 (05:26 +0000)]
Merge changes from topic "cherry-pick-dropped-sensor" into qt-r1-dev
* changes:
Fix issue where notif wouldn't HUN
Assume sensors perform prox check
Lucas Dupin [Mon, 9 Sep 2019 21:06:55 +0000 (14:06 -0700)]
Fix issue where notif wouldn't HUN
DozeSensors and DozeTriggers have code that perform proximity
checks in slightly different ways. DozeSensors was updated as
part of ag/
9185335 bug DozeTriggers wasn't.
Bug:
9185335
Fixes:
140701062
Bug:
138765669
Test: partially cover prox, send notification, look at screen
Change-Id: Ic85181abb3edd4c77c427faefa4cd6b9c35b498f
Merged-In: Ic85181abb3edd4c77c427faefa4cd6b9c35b498f
Lucas Dupin [Wed, 7 Aug 2019 22:55:00 +0000 (15:55 -0700)]
Assume sensors perform prox check
Assume that doze sensors will be prox gated.
Not doing so would be a bad idea anyway since the device would wake
up way more often than it should and drain battery.
Another improvement on this CL is that regular DozeSensors prox
checks are trying to use a binned brightness sensor instead.
Fixes:
138765669
Test: atest DozeSensorsTest DozeTriggersTest
Test: single tap from AOD (observe no re-registration of lift)
Test: 'reach' from AOD (observe no re-registration of lift)
Test: receive notification with prox covered or unobstructed
Change-Id: I1961ff9b16480ba1a60c397570494dd7acb4802d
(cherry picked from commit
f40bd8fbb65c896c824fe3f1a5be857bbe8ae281)
Merged-In: I1961ff9b16480ba1a60c397570494dd7acb4802d
Jeff Sharkey [Thu, 12 Sep 2019 20:32:28 +0000 (13:32 -0700)]
Merge changes from topic "bp-
135269143-p" into pi-dev am:
604d91d713
am:
bf25aeaa84
Change-Id: Iedf8e18ed3c3c555d40534d6a00a47faff376c63
Jeff Sharkey [Thu, 12 Sep 2019 20:32:18 +0000 (13:32 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
216bbc2a2e -s ours
am:
06cf16b862
Change-Id: Iba3e9f517e08cce3c6453ba3d0f6152552c23dbf
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 18:02:54 +0000 (11:02 -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:
0b712aaf6e
Change-Id: I6456bb9766d9c14fcd5beb3c69b24ced02605ed8
Jeff Sharkey [Thu, 12 Sep 2019 18:02:46 +0000 (11:02 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5 am:
fc095efde0 am:
e89348b54b -s ours am:
01787e9e4d -s ours
am:
fde3c88071
Change-Id: Icdc48f2731ec5e5097595f5a0cc3917aa2583540
Jeff Sharkey [Thu, 12 Sep 2019 17:59:26 +0000 (10:59 -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:
b3c4ddb61e
Change-Id: I4fbf580a4e5d17c8ceb7fcd9176a048f9accfc19
Jeff Sharkey [Thu, 12 Sep 2019 17:59:01 +0000 (10:59 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c am:
37e2229257 am:
bba6744ff4 -s ours am:
2ccbb35723 -s ours
am:
79c2faf372
Change-Id: Ic3f1646d160f539faae4507c736dd3f5ce394616
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:38:12 +0000 (22:38 -0700)]
Merge "Add keylayout for original xbox controller" into qt-dev
am:
aaaee164de
Change-Id: I7514aca0526045e4f0ed295775cc86b016e2f339
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 23:13:10 +0000 (16:13 -0700)]
Merge changes from topic "bp-
135269143-q" into qt-dev
am:
660c3b11c7
Change-Id: Ia33da8f677ecaaa07e3d9adc1a00f0289798d011
Jeff Sharkey [Wed, 11 Sep 2019 23:13:02 +0000 (16:13 -0700)]
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am:
0e66ea6f32
Change-Id: I111fcc77d1e0c8b8065f5476fc2a0e75bf88f2a2
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.
Seigo Nonaka [Wed, 11 Sep 2019 21:59:43 +0000 (14:59 -0700)]
Merge "don't compute outside of visible range" into qt-dev
am:
3a477180f4
Change-Id: I40a39895abd22f191333bfe29d5d3142532dd761
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
Jared Henderson [Wed, 11 Sep 2019 16:27:55 +0000 (09:27 -0700)]
Merge "Update Xbox BT controller mapping for new FW" into qt-dev
am:
1f978f5a8f
Change-Id: I0eb40c78586f0593615fe6f0ab3e7c985c563fbf
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
Varun Shah [Wed, 11 Sep 2019 06:29:10 +0000 (23:29 -0700)]
Merge "Use language tags to store Configuration's locale list." into qt-dev
am:
6dfa267f91
Change-Id: Ia7f30abab7396bc36eb2d69990129143601b028b
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 02:07:08 +0000 (19:07 -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:
69561082c5 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: I7a11006386d200b0da8eb0e3b27741e1efedb473
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:40:02 +0000 (18:40 -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:
8a7c7cf04c -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: I2a6ea0a79ee30b3f40597b25ea9d4e936d24147a
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:27:14 +0000 (18:27 -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:
a36fc3bb2c -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
efdcff2452 is in history
Change-Id: Ifdfc5a0d8f73cbd1338b53651cf8d293a2625726
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
Zongheng Wang [Wed, 11 Sep 2019 01:15:58 +0000 (18:15 -0700)]
Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into qt-dev
am:
4e4b2875d5
Change-Id: I370cf06dd4cf268663a062b0b0d7cd4dea6dd0e2
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:29:07 +0000 (12:29 -0700)]
Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev
am:
dd67a548b2
Change-Id: I0aaee5386c85bf33b292cfa9241c3a0c62dedd29