Fabian Kozynski
4e63d9e9e0
Fix incorrect text when on Airplane Mode
...
Only generate missing sim text if there are no CarrierName present AND
no sims READY. This was an issue when airplane mode with WFC.
Also, replace using mCarrierGroups[0] for its text when the sims are
missing. Instead use a different view that is made visible when all the
QSCarrierGroups should be invisible.
Test: manual, using APM
Test: atest
Fixes: 139556559
Change-Id: I9d83b0eb2a21b786d50c243903bf32b6e761dc77
Merged-In: I9d83b0eb2a21b786d50c243903bf32b6e761dc77
2019-09-12 20:54:29 +00:00
Jeff Sharkey
d274ec8859
Merge changes from topic "bp-135269143-p" into pi-dev am: 604d91d713 am: bf25aeaa84
...
am: 4dd2150e42
2019-09-12 13:49:34 -07:00
Jeff Sharkey
a94619ab62
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 216bbc2a2e -s ours am: 06cf16b862
...
am: 844fa00afb
2019-09-12 13:49:24 -07:00
Jeff Sharkey
4dd2150e42
Merge changes from topic "bp-135269143-p" into pi-dev am: 604d91d713
...
am: bf25aeaa84
2019-09-12 13:32:28 -07:00
Jeff Sharkey
844fa00afb
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 216bbc2a2e -s ours
...
am: 06cf16b862
2019-09-12 13:32:18 -07:00
Jeff Sharkey
bf25aeaa84
Merge changes from topic "bp-135269143-p" into pi-dev
...
am: 604d91d713
2019-09-12 13:24:04 -07:00
Jeff Sharkey
06cf16b862
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
...
am: 216bbc2a2e
2019-09-12 13:23:56 -07:00
Mehdi Alizadeh
06955f6f7d
Add target type flags to set the origin of share targets
...
Bug: 140898597
Test: atest ChooserActivityTest
Change-Id: Iaab20121986f6e0ac22fc2ae2150484b9df95c54
2019-09-12 13:21:18 -07:00
Jeff Sharkey
604d91d713
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.
2019-09-12 19:59:29 +00:00
Jeff Sharkey
216bbc2a2e
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
2019-09-12 19:59:17 +00:00
Brad Stenning
c2327e547b
Merge "Fix build file such that CarSystemUi can be easily extended" into qt-qpr1-dev
2019-09-12 18:24:40 +00:00
Jeff Sharkey
d8f7098a7e
[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
...
am: e601fa8901
2019-09-12 11:17:03 -07:00
Jeff Sharkey
7b18a9a650
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: f683c688d5 am: fc095efde0 am: e89348b54b -s ours am: 01787e9e4d -s ours am: fde3c88071
...
am: 422dd005cd
2019-09-12 11:16:55 -07:00
Jeff Sharkey
4181f7daf7
[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
...
am: 29d4d347da
2019-09-12 11:12:58 -07:00
Jeff Sharkey
0481a6494f
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c am: 37e2229257 am: bba6744ff4 -s ours am: 2ccbb35723 -s ours am: 79c2faf372
...
am: e2a8e18494
2019-09-12 11:12:40 -07:00
Jeff Sharkey
e601fa8901
[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
2019-09-12 11:02:54 -07:00
Jeff Sharkey
422dd005cd
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: f683c688d5 am: fc095efde0 am: e89348b54b -s ours am: 01787e9e4d -s ours
...
am: fde3c88071
2019-09-12 11:02:46 -07:00
Jeff Sharkey
29d4d347da
[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
2019-09-12 10:59:26 -07:00
Jeff Sharkey
e2a8e18494
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c am: 37e2229257 am: bba6744ff4 -s ours am: 2ccbb35723 -s ours
...
am: 79c2faf372
2019-09-12 10:59:01 -07:00
Jeff Sharkey
0b712aaf6e
[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am: f8a2d069b4 am: f6aa7b8d8f am: 8acb456949 -s ours
...
am: fd58ea607e
2019-09-12 10:49:27 -07:00
Jeff Sharkey
fde3c88071
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: f683c688d5 am: fc095efde0 am: e89348b54b -s ours
...
am: 01787e9e4d
2019-09-12 10:49:22 -07:00
Jeff Sharkey
b3c4ddb61e
[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 7633a081ab am: b0054f0518 am: c97dfb57a8 -s ours
...
am: 40a236db41
2019-09-12 10:41:38 -07:00
Jeff Sharkey
79c2faf372
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c am: 37e2229257 am: bba6744ff4 -s ours
...
am: 2ccbb35723
2019-09-12 10:41:24 -07:00
Jeff Sharkey
fd58ea607e
[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am: f8a2d069b4 am: f6aa7b8d8f
...
am: 8acb456949
2019-09-12 10:31:54 -07:00
Jeff Sharkey
01787e9e4d
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: f683c688d5 am: fc095efde0
...
am: e89348b54b
2019-09-12 10:31:49 -07:00
Jeff Sharkey
40a236db41
[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 7633a081ab am: b0054f0518
...
am: c97dfb57a8
2019-09-12 10:27:55 -07:00
Jeff Sharkey
2ccbb35723
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c am: 37e2229257
...
am: bba6744ff4
2019-09-12 10:27:37 -07:00
Jeff Sharkey
8acb456949
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am: f8a2d069b4
...
am: f6aa7b8d8f
2019-09-12 10:18:26 -07:00
Jeff Sharkey
e89348b54b
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: f683c688d5
...
am: fc095efde0
2019-09-12 10:18:22 -07:00
Jeff Sharkey
c97dfb57a8
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 7633a081ab
...
am: b0054f0518
2019-09-12 10:14:15 -07:00
Jeff Sharkey
bba6744ff4
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c
...
am: 37e2229257
2019-09-12 10:14:00 -07:00
Jeff Sharkey
f6aa7b8d8f
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
...
am: f8a2d069b4
2019-09-12 10:06:14 -07:00
Jeff Sharkey
fc095efde0
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
...
am: f683c688d5
2019-09-12 10:06:09 -07:00
Jeff Sharkey
b0054f0518
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
...
am: 7633a081ab
2019-09-12 10:02:13 -07:00
Jeff Sharkey
37e2229257
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
...
am: 92e5e5e45c
2019-09-12 10:02:05 -07:00
Jeff Sharkey
f8a2d069b4
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
2019-09-12 16:33:21 +00:00
Jeff Sharkey
7633a081ab
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
2019-09-12 16:33:13 +00:00
Govinda Wasserman
17f9fb422c
Merge "Trigger doze detection using WakefulnessLifecycle" into qt-qpr1-dev
2019-09-12 15:45:38 +00:00
Govinda Wasserman
3fcd71785e
Trigger doze detection using WakefulnessLifecycle
...
Previously, doze detection used StatusBarStateController, which only
provides a signal at the end of the doze transition. This resulted in
the handles only animating away once the screen was already off. Using
the WakefulnessLifecycle allows for a callback when the transition
begins instead.
Test: Tested locally
BUG:137742178
Change-Id: I289ef5b5081fa96b1c8e82c4373c7654e8df80cb
Merged-In: I289ef5b5081fa96b1c8e82c4373c7654e8df80cb
2019-09-12 10:42:34 -04:00
Matt Pietal
636ae6a386
Merge "Resolver - Fix NGA (voice interaction) crash in resolver" into qt-qpr1-dev
2019-09-12 14:37:59 +00:00
Nicholas Sauer
912c2ae506
Merge "Return tasks that belong to a profile from getRunningTasks." into qt-qpr1-dev
2019-09-12 13:43:15 +00:00
Nicholas Sauer
d6b44523fe
Return tasks that belong to a profile from getRunningTasks.
...
See also ag/9307763
bug: 140813306
Test: cts-tradefed run cts-dev -m CtsPermissionTestCases -t android.permission.cts.NoActivityRelatedPermissionTest#testGetTask
Test: cts-tradefed run cts-dev -m CtsWindowManagerDeviceTestCases
Test: cts-tradefed run cts-dev -m CtsAppTestCases
Change-Id: I6809c459af7442a306ccdd81bc036ad81d02030a
Merged-In: I6809c459af7442a306ccdd81bc036ad81d02030a
2019-09-12 07:18:54 +00:00
TreeHugger Robot
76a8d1c24f
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-12 07:10:39 +00:00
Joanne Chung
f799459903
Prevent flicker when typing any character for filter.
...
Bug: 138261589
Test: atest CtsAutoFillServiceTestCases
Test: manually.
Change-Id: I20320412c24a6a1b04e4f1bb006e3b40f8e9771f
(cherry picked from commit a7180cd863
2019-09-12 05:52:38 +00:00
Elias Wald
16a9a90a56
Merge "Add keylayout for original xbox controller" into qt-dev am: aaaee164de
...
am: 0a7a87b548
2019-09-11 22:45:07 -07:00
Elias Wald
0a7a87b548
Merge "Add keylayout for original xbox controller" into qt-dev
...
am: aaaee164de
2019-09-11 22:38:12 -07:00
Bill Yi
4fcadcc88a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I004aff6240edec1b80fd2226a612d93a6eb4aaca
2019-09-11 22:34:53 -07:00
Elias Wald
aaaee164de
Merge "Add keylayout for original xbox controller" into qt-dev
2019-09-12 05:20:48 +00:00
Eric Laurent
2fedc55920
SoundTriggerHelper: fix state after audioserver death
...
Make sure mRecognitionRequested is reset when a failure
condition disables all recognitions: A stale value would
prevent from registering call and power state listeners
and properly update the states.
Also:
- In isRecognitionAllowed(), read current call and power
states directly from services if listeners are not registered.
- Also add missing null checks on mModule at various places.
Bug: 139268184
Test: repro steps in the bug
Change-Id: I763130b4d491a1a6a9e0756c7a18943e406ce73e
2019-09-12 01:37:15 +00:00
Jeff Sharkey
f683c688d5
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
2019-09-11 23:52:37 +00:00
