Commit Graph

431449 Commits

Author SHA1 Message Date
Jean-Michel Trivi
784faabf21 Merge "AudioService: fix missing CEC message on unmute after vol down" am: 4f86011710
am: 1d99b3aaa8

Change-Id: I7bf0572c66c7331e24fef67074ec82056b8c6396
2019-09-16 14:29:07 -07:00
Jean-Michel Trivi
1d99b3aaa8 Merge "AudioService: fix missing CEC message on unmute after vol down"
am: 4f86011710

Change-Id: Ife3d6e9f841ee54108cfc04048d5f8118d29aaac
2019-09-16 14:17:54 -07:00
Jean-Michel Trivi
4f86011710 Merge "AudioService: fix missing CEC message on unmute after vol down" 2019-09-16 21:04:08 +00:00
Adam Seaton
a824053914 Merge "Revert "don't compute outside of visible range"" into qt-dev am: e4d9618d67
am: 3d623d54f2

Change-Id: Ibbeec536bb1e22ec1d76d40d1c0c236df9fc1b60
2019-09-14 05:48:11 -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
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
Andy Hung
e1ea2d25b5 Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END" am: 763cb4638a
am: a52acaf833

Change-Id: I04d8440488fab320dcdd41f21d133b668602de31
2019-09-13 14:37:04 -07:00
Andy Hung
a52acaf833 Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END"
am: 763cb4638a

Change-Id: I533d9ac132547aa284a92a5a40dd74d69d080889
2019-09-13 14:29:40 -07:00
Andy Hung
763cb4638a Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END" 2019-09-13 21:18:56 +00:00
Shuo Qian
ab29db9236 Merge "Listeners of active emergency numbers" am: 7674b345a9
am: fc225eab6b

Change-Id: I842ae8f7c7820648c167f12ad15f095b1324b1d2
2019-09-13 13:37:45 -07:00
Shuo Qian
fc225eab6b Merge "Listeners of active emergency numbers"
am: 7674b345a9

Change-Id: Ie18a4c1d18ae9fb1dbddc5f9997c471873f8ba78
2019-09-13 13:24:42 -07:00
Shuo Qian
7674b345a9 Merge "Listeners of active emergency numbers" 2019-09-13 19:50:16 +00:00
Luca Stefani
f1545ec084 Merge "WindowOrientationListener: Check if proposed rotation is in range" am: eb97eab212
am: f40968bc1f

Change-Id: Ieb2f1efd467ebe5233acc05fef0d853dae0d62a6
2019-09-13 12:23:43 -07:00
Luca Stefani
f40968bc1f Merge "WindowOrientationListener: Check if proposed rotation is in range"
am: eb97eab212

Change-Id: I9179209d6817b6474114c0829ee8c0c36c93980c
2019-09-13 12:12:47 -07:00
Treehugger Robot
eb97eab212 Merge "WindowOrientationListener: Check if proposed rotation is in range" 2019-09-13 18:57:50 +00:00
Jean-Michel Trivi
91f9b5cc6f AudioService: fix missing CEC message on unmute after vol down
Group in one method sending volume / mute updates to HDMI CEC
when applicable. Use this method, maybeSendSystemAudioStatusCommand,
to avoid code duplication.
  Add missing synchronization in onUnmuteStream for stream mute check.
  When STREAM_MUSIC is unmuted, also call
maybeSendSystemAudioStatusCommand for a mute adjust, to ensure
other CEC devices' UI is in sync with the internal state.

Bug: 136977965
Test: with ATV device in system audio mode, mute with remote, then \
  press vol down on TV remote, verify TV display matches ATV UI    \
  with current volume.

Change-Id: I279a97871ba98e67f282bf148969ba41ed3f6062
2019-09-13 10:54:48 -07:00
Kweku Adams
fe1bf5d3fb Merge "Fix QuotaController constants." am: 4017f8be2f
am: 29a7524bdd

Change-Id: If2e03e2fac92e07d37968a749c33ecc8e245b8ad
2019-09-13 10:52:40 -07:00
Tao Bao
d4897c7dbf Merge "Add nullability anotations" am: 7e3b406f26
am: 8123e5cc50

Change-Id: Id776e88e7669f78d845c77b80ad1d671efa08f71
2019-09-13 10:41:54 -07:00
Madhava Srinivasan
0e7175db88 Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService" am: 4efb0c510d
am: a40f432ac6

Change-Id: Ia4c92888f5ddc2e01a8b9025bdec0b00afb8c539
2019-09-13 10:38:05 -07:00
Tobias Thierer
63522e8f02 Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test." am: 414d53442e
am: 80809d6d5a

Change-Id: I938bdb6cf443f97895427e71f75e11f15ae5e7e8
2019-09-13 10:33:02 -07:00
Kweku Adams
29a7524bdd Merge "Fix QuotaController constants."
am: 4017f8be2f

Change-Id: I51d77968eeb3eede4f216d9dc968ab37bfdf10f0
2019-09-13 10:31:30 -07:00
Andy Hung
f1588f2694 SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END
Test: SoundPoolApplication, SoundPoolOggTest, Games
Bug: 139787914
Bug: 139788416
Bug: 140579743
Bug: 140779732
Merged-In: I83b9b1d61b65dcc4a73d676e1f8be1e022c70302
Change-Id: I83b9b1d61b65dcc4a73d676e1f8be1e022c70302
(cherry picked from commit a527524356)
2019-09-13 10:30:02 -07:00
Tao Bao
8123e5cc50 Merge "Add nullability anotations"
am: 7e3b406f26

Change-Id: I65423d6c48c93396dff54adf3f8c661ae2788686
2019-09-13 10:28:21 -07:00
Madhava Srinivasan
a40f432ac6 Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService"
am: 4efb0c510d

Change-Id: Ic60d7d5bf75288f9f6cdf02d414bf69dbfe74159
2019-09-13 10:24:22 -07:00
Tobias Thierer
80809d6d5a Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test."
am: 414d53442e

Change-Id: Ic1a47ff497442bf740fa251c0c3429bdb15eb81d
2019-09-13 10:18:42 -07:00
Treehugger Robot
4017f8be2f Merge "Fix QuotaController constants." 2019-09-13 17:14:40 +00:00
Tao Bao
7e3b406f26 Merge "Add nullability anotations" 2019-09-13 17:04:12 +00:00
Treehugger Robot
4efb0c510d Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService" 2019-09-13 16:58:19 +00:00
Tobias Thierer
414d53442e Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test." 2019-09-13 16:56:06 +00:00
Lucas Dupin
6d4ac2689b Merge changes from topic "cherry-pick-dropped-sensor" into qt-r1-dev
am: 1ed27213d0

Change-Id: I3b4c99f626149f3d5b68be8b0e0862f6f7fc2240
2019-09-13 01:20:46 -07:00
TreeHugger Robot
1ed27213d0 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
2019-09-13 05:26:35 +00:00
Shuo Qian
e6f0e85516 Listeners of active emergency numbers
1) Introduce a new signature-level system permission allowing system apps to listen the
 active emergency number, placed by calls or texts.

2) Add PhoneStateListener API surface to provide a mechanism to listen the
outgoing call emergency number or outgoing sms emergency number.

Bug: 135204580
Test: atest
Change-Id: I6e6bce6d4b97d492ca20302002911f9daa20767e
Merged-In: I6e6bce6d4b97d492ca20302002911f9daa20767e
(cherry picked from commit 7a1eb6d56b)
2019-09-13 03:16:17 +00:00
Kweku Adams
24cbc741d5 Fix QuotaController constants.
1. QuotaController wasn't using the updated constants on system start.
It would only use the updated constants if they were changed after
system start.
2. Updating ACTIVE limits to more workable numbers.

Bug: 137166468
Test: atest com.android.server.job.controllers.QuotaControllerTest
Change-Id: I3e2848446b20f7258fac2d96566c96aea5715949
2019-09-12 18:43:45 -07:00
Lucas Dupin
19ef3004c1 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
2019-09-13 01:27:11 +00:00
Madhava Srinivasan
154e0193ce Honor HDMI_CONTROL_ENABLED setting in AudioService
This change updates how AudioService is updated of changes to Hdmi Cec
status (enable/disable) and availablity.

Bug: 138956107
Bug: 138373017
Test: Android TV STB: make; flashall;Volume -/+; HDMI control enable/disable.
Change-Id: Iaf83a45206be076858e13d113ba772ed5c59ef60
Merged-In: Iaf83a45206be076858e13d113ba772ed5c59ef60
2019-09-12 22:14:59 +00:00
Lucas Dupin
9bab4a2624 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 f40bd8fbb6)
Merged-In: I1961ff9b16480ba1a60c397570494dd7acb4802d
2019-09-12 21:04:53 +00:00
Jeff Sharkey
a5ead731e2 Merge changes from topic "bp-135269143-p" into pi-dev am: 604d91d713 am: bf25aeaa84
am: 4dd2150e42

Change-Id: Idc0c7d724190b78f8e22e2cbb674f9044a8b4e61
2019-09-12 13:48:32 -07:00
Jeff Sharkey
31c00e40db [automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 216bbc2a2e -s ours am: 06cf16b862
am: 844fa00afb

Change-Id: I8a03a1670ee8aceaa50b123f9b1201e9c4957fd7
2019-09-12 13:48:20 -07:00
Jeff Sharkey
4dd2150e42 Merge changes from topic "bp-135269143-p" into pi-dev am: 604d91d713
am: bf25aeaa84

Change-Id: Iedf8e18ed3c3c555d40534d6a00a47faff376c63
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

Change-Id: Iba3e9f517e08cce3c6453ba3d0f6152552c23dbf
2019-09-12 13:32:18 -07:00
Jeff Sharkey
bf25aeaa84 Merge changes from topic "bp-135269143-p" into pi-dev
am: 604d91d713

Change-Id: I4732eced6b91fd0f7a3e83197f4fcbf63b9c977d
2019-09-12 13:24:04 -07:00
Jeff Sharkey
06cf16b862 [automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am: 216bbc2a2e -s ours
am skip reason: subject contains skip directive

Change-Id: I34ab810a0ce6c747236b6e0660b0f69b8e12d4a1
2019-09-12 13:23:56 -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
Mathieu Chartier
fb05e52a9d Merge "Remove android.permission.PermissionManager from blacklist" am: cbc3d5d0ea
am: e52e78ba8e

Change-Id: I7fc80407feedfaf72e58eb1d537b1b332fdf21f0
2019-09-12 11:51:33 -07:00
Mathieu Chartier
e52e78ba8e Merge "Remove android.permission.PermissionManager from blacklist"
am: cbc3d5d0ea

Change-Id: I5407e6770a4d28430fca6b1ef7adebe8bde46e88
2019-09-12 11:36:07 -07:00
Mathieu Chartier
cbc3d5d0ea Merge "Remove android.permission.PermissionManager from blacklist" 2019-09-12 18:20:14 +00:00
Jeff Sharkey
97a4be8898 [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

Change-Id: If4209781fdbac2dcc28cc36d2064b74e59ac7fe6
2019-09-12 11:17:57 -07:00
Jeff Sharkey
2c00ea16c3 [automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: f683c688d5 am: fc095efde0 am: e89348b54b -s ours am: 01787e9e4d -s ours am: fde3c88071
am: 422dd005cd

Change-Id: Ia9e48a0899c7dd5bad4bf5508ab7cb453ac8e201
2019-09-12 11:17:50 -07:00