Commit Graph

93990 Commits

Author SHA1 Message Date
Kevin Hufnagle
c67e4da871 Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07
am: 12298403b0

Change-Id: I7a71cdb8fd5ecfd008d0e8257185cdd8c5366ce0
2019-09-18 17:39:27 -07:00
Kevin Hufnagle
12298403b0 Merge "docs: Add condition for hiding synth. activities" into qt-dev
am: 00537efd07

Change-Id: I1ec3fb8fea7f6b5fe292807b3951fb265a9cbb94
2019-09-18 17:32:55 -07:00
Kevin Hufnagle
00537efd07 Merge "docs: Add condition for hiding synth. activities" into qt-dev 2019-09-19 00:20:47 +00:00
TreeHugger Robot
51cf32b4f3 Merge "Camera: fix NPE from bad requestID" into qt-qpr1-dev 2019-09-18 20:54:27 +00:00
Seigo Nonaka
dbf4d68906 Merge "Do not compute outside given range in TextLine" into qt-dev am: 01082fe6ae
am: a2778ebe0d

Change-Id: I07c9f4c9a8bd9b6cdfa0f4da215d1b6f63ca9961
2019-09-18 13:30:17 -07:00
Seigo Nonaka
a2778ebe0d Merge "Do not compute outside given range in TextLine" into qt-dev
am: 01082fe6ae

Change-Id: I9d88c47a16747009fda893660fd36d325d212a40
2019-09-18 13:17:17 -07:00
TreeHugger Robot
01082fe6ae Merge "Do not compute outside given range in TextLine" into qt-dev 2019-09-18 20:05:29 +00:00
Yin-Chia Yeh
f83a966064 Camera: fix NPE from bad requestID
This avoid NPE exception and accompanying logspam from binder
callbacks.

Test: N/A
Bug: 141250131
Merged-In: I729f4905c94698c95733570abe92ca3ba9163cc5
Change-Id: I729f4905c94698c95733570abe92ca3ba9163cc5
(cherry picked from commit 67bd78ad73)
2019-09-18 18:14:16 +00:00
TreeHugger Robot
27d33b157c Merge "Passing caller package name to setBluetoothTethering" into qt-qpr1-dev 2019-09-18 00:56:12 +00:00
Winson Chung
4b15467f5f Merge "Skip updating exclusion rects unless one is set" into qt-qpr1-dev 2019-09-17 20:44:25 +00:00
Kevin Hufnagle
85bd2c62cb Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev am: 1fe99017eb
am: 1e8492c744

Change-Id: Idbc73307a0c3f4a937a2a964667f01b28aa274ce
2019-09-17 12:32:20 -07:00
Kevin Hufnagle
1e8492c744 Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev
am: 1fe99017eb

Change-Id: I13ba0297750b5b375f4874640b14b4955d17eeaa
2019-09-17 12:19:12 -07:00
Kevin Hufnagle
1fe99017eb Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev 2019-09-17 18:54:20 +00:00
Kevin Hufnagle
b8779b82bb 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
2019-09-17 18:48:39 +00:00
Seigo Nonaka
7c38cafc22 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
2019-09-16 16:12:51 -07:00
Winson Chung
687bcb7f33 Skip updating exclusion rects unless one is set
Bug: 140775753
Bug: 140701977
Bug: 140758369
Test: atest google/perf/jank/SystemUI/UbSystemUIJankTests:android.platform.systemui.tests.jank.SystemUiJankTests#testQuickSettingsPull -v
Change-Id: I824ca918d141eb88aa99b1e90adafe64ca3eb672
2019-09-16 22:41:45 +00:00
Mady Mellor
fd48588768 Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev 2019-09-16 21:55:51 +00:00
Adam Seaton
d3155ce312 Merge "Revert "don't compute outside of visible range"" into qt-dev am: e4d9618d67
am: 3d623d54f2

Change-Id: I35674ab6ab6e5773f93377e64c7de1863423e562
2019-09-14 05:48:50 -07:00
Adam Seaton
3d623d54f2 Merge "Revert "don't compute outside of visible range"" into qt-dev
am: e4d9618d67

Change-Id: I45acc1f2174f7faddfcd3e2f025e412afb8625d0
2019-09-14 05:28:23 -07:00
TreeHugger Robot
e4d9618d67 Merge "Revert "don't compute outside of visible range"" into qt-dev 2019-09-14 12:10:43 +00:00
TreeHugger Robot
d0a1ab93d4 Merge "Camera: fix NPE in buffer error callback" into qt-qpr1-dev 2019-09-14 07:46:58 +00:00
Adam Seaton
b4583e4dcd Revert "don't compute outside of visible range"
bug:141016653
This reverts commit 0a57fe099a.

Reason for revert: CL is implicated in https://b.corp.google.com/issues/141016653

Change-Id: I39954226cb8971ee17e367692b3fd0e29871ad48
2019-09-13 22:09:30 +00:00
Hongwei Wang
f0b5fb17fb Ensure bounds animination for expanding PiP window
The internal animation type maybe reset at the end of RecentsAnimation
following the repro path in bug comments. Ensure BOUNDS animation type
if we know for certain that we're expanding / collpasing the PiP window

Added also last reported multi-window and PiP mode in dumpsys. This is
for internal debug purpose only.

Bug: 137849660
Test: Manually, see b/137849660#comment9
Test: dumpsys activity -v all
Change-Id: I0b7d102ccb4bc27dd0e432d1022bc12a42a0c36d
Merged-In: I0b7d102ccb4bc27dd0e432d1022bc12a42a0c36d
(cherry picked from commit 2cebfd5e5f)
2019-09-12 21:55:46 +00:00
Priyank Singh
3228b57d8e Status bar background color should not be transparent.
Bug: 130431689
Test: Manual
Change-Id: Ida8788f2d758eedaf5db0139f81a65402ba0b88b
2019-09-11 23:46:26 +00:00
Jeff Sharkey
da99669780 RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 0e66ea6f32
am: 71765a75d1

Change-Id: I83961bb6bdffa90583d28e416a98cb0efd62fb32
2019-09-11 16:20:00 -07:00
Jeff Sharkey
71765a75d1 RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am: 0e66ea6f32

Change-Id: I111fcc77d1e0c8b8065f5476fc2a0e75bf88f2a2
2019-09-11 16:13:02 -07:00
Bryan Ferris
660c3b11c7 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.
2019-09-11 22:59:15 +00:00
Mady Mellor
a5813e0e3d qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 126945401
Bug: 128932906
Bug: 129158983
Bug: 130237686
Bug: 130250809
Bug: 130442248
Bug: 131267438
Bug: 131609280
Bug: 131692350
Bug: 131849856
Bug: 133444037
Bug: 134064116
Bug: 134064858
Bug: 134070807
Bug: 134077101
Bug: 134090085
Bug: 134155107
Bug: 134423445
Bug: 134512898
Bug: 134514210
Bug: 134514227
Bug: 134734945
Bug: 134960381
Bug: 134989736
Bug: 135214687
Bug: 135280077
Bug: 135472021
Bug: 135475155
Bug: 135487618
Bug: 135488406
Bug: 135518045
Bug: 135633218
Bug: 136034310
Bug: 136150954
Bug: 136199542
Bug: 136538998
Bug: 137201711
Bug: 137213469
Bug: 137214359
Bug: 137214536
Bug: 137233453
Bug: 137876221
Bug: 138301618
Bug: 138445026
Bug: 138659213
Bug: 138749133
Bug: 138799651
Bug: 138801505
Bug: 138941969
Bug: 139002444
Bug: 139025304
Bug: 139816141
Change-Id: Ia7364529ea58070c8d45ecd726ab6ac7d34f2abe
Merged-In: Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755
Merged-In: Ic3a4ba793db7f1361678ef51c411d9eab85d9b85
2019-09-11 22:42:54 +00:00
Seigo Nonaka
643e29bd93 Merge "don't compute outside of visible range" into qt-dev am: 3a477180f4
am: f4dd720828

Change-Id: Ied3c4bcbd5d772d3573788fd678aca50e3442923
2019-09-11 15:12:38 -07:00
Seigo Nonaka
f4dd720828 Merge "don't compute outside of visible range" into qt-dev
am: 3a477180f4

Change-Id: I40a39895abd22f191333bfe29d5d3142532dd761
2019-09-11 14:59:43 -07:00
TreeHugger Robot
3a477180f4 Merge "don't compute outside of visible range" into qt-dev 2019-09-11 21:38:08 +00:00
Seigo Nonaka
0a57fe099a don't compute outside of visible range
Bug: 140632678
Test: manually done
Test: TreeHugger
Change-Id: I646851973b3816bf9ba32dfe26748c0345a5a081
2019-09-11 11:28:34 -07:00
Varun Shah
667db1bea5 Merge "Use language tags to store Configuration's locale list." into qt-dev am: 6dfa267f91
am: 6947f255e4

Change-Id: Ic1954896252b758e8360c7fdf7cdeddb184bab03
2019-09-10 23:36:07 -07:00
Varun Shah
6947f255e4 Merge "Use language tags to store Configuration's locale list." into qt-dev
am: 6dfa267f91

Change-Id: Ia7f30abab7396bc36eb2d69990129143601b028b
2019-09-10 23:29:10 -07:00
Jeff Sharkey
0e66ea6f32 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
2019-09-10 21:16:10 +00:00
Varun Shah
5e67462971 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
2019-09-10 19:53:57 +00:00
Colin Cross
18bf694f3c Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev
am: dd67a548b2

Change-Id: I0aaee5386c85bf33b292cfa9241c3a0c62dedd29
2019-09-10 12:29:07 -07:00
Colin Cross
dd67a548b2 Merge "Revert "Use language tags to store Configuration's locale list."" into qt-dev 2019-09-10 19:18:48 +00:00
Varun Shah
68cdb74d91 Revert "Use language tags to store Configuration's locale list."
This reverts commit ff43f4e6a6.

Reason for revert: b/140813780

Change-Id: Id5988b9ec959ca9b294f6bd5caa30c8156238d0a
2019-09-10 18:30:47 +00:00
Mark Renouf
1c25fc531f Removes strong ref to Activity from RequestFinishCallback
This change eliminates the strong reference from
RequestFinishCallback to Activity.

Bug: 139782368
Test: Open then finish an activity within an ongoing app process
      Observe the Activity instance is no longer strongly reachable
      in the app process after onDestroy() completes.

Change-Id: I13e9707e96721a2d491629147337aaedc3473651
2019-09-10 14:08:36 -04:00
Jeff Sharkey
13f49c4259 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
2019-09-10 11:07:32 -07:00
Varun Shah
ec466c0a8e Merge "Use language tags to store Configuration's locale list." into qt-dev
am: bdfd7d6adb

Change-Id: I2ed88e4ce5bd3a00cc9ea951815c17c57a6599a2
2019-09-10 10:10:25 -07:00
Varun Shah
ee3d800165 Fix bootloop issue with UsageStatsService.
am: 669d886cdc

Change-Id: Iab6f4086aa2bd2b5709f499b85ce79359cd76829
2019-09-10 10:10:20 -07:00
Varun Shah
bdfd7d6adb Merge "Use language tags to store Configuration's locale list." into qt-dev 2019-09-10 16:51:37 +00:00
Anthony Hugh
6f5eadc0d3 Refactor PermissionManager.SPLIT_PERMISSIONS
Creating a SystemConfig from a non-system process is taking 500+ ms.
This CL instead exposes the needed split permissions from system_server
to optimize performance.

Tested locally and creating PermissionManager / retrieving SystemConfig
is now less than 1 ms.

Bug: 139828734
Bug: 139485700
Fixes: 139828734
Test: Added systrace / logs to PermissionController app and traced
runtime of onGrantDefaultRoles().

Merged-In: I111403e8dae3bc2b0acafc32e61aa5cd890fea29
Change-Id: I111403e8dae3bc2b0acafc32e61aa5cd890fea29
(cherry picked from commit f69c71e25889d8a9d66da05ee0f386d7fb626c6c)
2019-09-09 15:49:04 -07:00
Varun Shah
ff43f4e6a6 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
2019-09-09 22:41:54 +00:00
Varun Shah
669d886cdc Fix bootloop issue with UsageStatsService.
When the configurations are being read from the proto file, if a
duplicate locale is found in the list, an exception is thrown from
LocaleList which causes the UsageStatsService to crash. Instead, we'll
now log a WTF if duplicate locales are found when parsing the
configuration proto and not add the duplicate locale to the list.

Bug: 140197723
Test: atest UsageStatsDatabaseTest
Change-Id: Ie178b3cfdd45e6771a7c0e4bb42e47f79b5c30cc
(cherry picked from commit 5d9031dbee)
2019-09-09 22:41:22 +00:00
Yin-Chia Yeh
3b93a85b6a Camera: fix NPE in buffer error callback
Check if the error stream has been removed first.
Also move some code in submitCaptureRequest so that access to
mConfiguredOutputs is within scope of mInterfaceLock, which
matches all other places accessing mConfiguredOutputs in the file.

Test: Camera CTS
Bug: 140374093, 140527066
Change-Id: I84921eb3a555f67a006548865f34502ab978e33b
2019-09-09 14:59:59 -07:00
Beverly
dcc5cfc561 Fix zen alarms only mode check
Also fixes setting the consolidated zen policy logging.

Fixes: 140329813
Test: android.app.cts.NotificationManagerTest#testTotalSilenceOnlyMuteStreams
Test: android.app.cts.NotificationManagerTest#testAlarmsOnlyMuteStreams
Change-Id: I43d503ac23d7b0b141930d77cb76f1f589b22525
2019-09-06 17:25:47 +00:00
Blake Kragten
cf1268a5f5 Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev 2019-09-06 17:03:30 +00:00