OSDN Git Service
Kevin Hufnagle [Tue, 17 Sep 2019 19:32:20 +0000 (12:32 -0700)]
Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev am:
1fe99017eb
am:
1e8492c744
Change-Id: Idbc73307a0c3f4a937a2a964667f01b28aa274ce
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
TreeHugger Robot [Tue, 17 Sep 2019 16:19:23 +0000 (16:19 +0000)]
Merge "Redraw legacy navigation bar paint onLayout" into qt-qpr1-dev
TreeHugger Robot [Tue, 17 Sep 2019 08:27:13 +0000 (08:27 +0000)]
Merge "GestureNav: Fix bug in exlcusion limit device config" into qt-qpr1-dev
Mehdi Alizadeh [Mon, 16 Sep 2019 23:15:22 +0000 (23:15 +0000)]
Merge changes I41e08b86,I7760f37d into qt-qpr1-dev
* changes:
Use ShortcutInfo#rank to order Sharing Shortcuts in ShareSheet
Adds tests for AppPrediction service availability check
Mady Mellor [Mon, 16 Sep 2019 21:55:51 +0000 (21:55 +0000)]
Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev
Vinit Nayak [Fri, 13 Sep 2019 01:15:21 +0000 (18:15 -0700)]
Redraw legacy navigation bar paint onLayout
Navigation bar background wasn't being redrawn
when using legacy navigation bar.
Fixes:
140096278
Test: Open Sheets app, turn landscape, select
a cell, press the "Fx" button on buttom left,
turn portrait and observe no black bar.
Open Sheets app, turn landscape, open recents
and select sheets icon and go into split screen,
choose any other app, click on cell, press "Fx",
turn portrait, observe no black bar.
Change-Id: Ibfe1abdba87a0d66c68478ee206b992c933cd9ad
(cherry picked from commit
7ab1fb8f370cc87faafd4eda2d4c04791190b0e9)
Mehdi Alizadeh [Mon, 16 Sep 2019 18:31:09 +0000 (18:31 +0000)]
Merge "Add target type flags to set the origin of share targets" into qt-qpr1-dev
Mehdi Alizadeh [Wed, 4 Sep 2019 01:11:48 +0000 (18:11 -0700)]
Use ShortcutInfo#rank to order Sharing Shortcuts in ShareSheet
Sort based on rank only when directly fetching the targets from
ShortcutManager. Otherwise the target from AppPredictionService are
already ordered.
Bug:
140449186
Test: atest ChooserActivityTest
Test: Manual test to verify shortcuts have the same order in Launcher and ShareSheet when AppPredictionService is disabled
Change-Id: I41e08b86746c977c05acea8a5d0654083897741d
Blake Kragten [Mon, 16 Sep 2019 18:19:54 +0000 (18:19 +0000)]
Merge "L5 Metrics Addition:" into qt-qpr1-dev
Mehdi Alizadeh [Thu, 12 Sep 2019 00:54:15 +0000 (17:54 -0700)]
Adds tests for AppPrediction service availability check
Bug:
138595943
Test: atest ChooserActivityTest
Change-Id: I7760f37d3f9fee00648cea5c70e744f1da2bdeca
Philip P. Moltmann [Mon, 16 Sep 2019 17:14:54 +0000 (17:14 +0000)]
Merge "Handle "uninstall updates" in app-ops-service" into qt-qpr1-dev
TreeHugger Robot [Sun, 15 Sep 2019 23:08:48 +0000 (23:08 +0000)]
Merge "Add a carrier config to disable ping test" into qt-qpr1-dev
TreeHugger Robot [Sun, 15 Sep 2019 22:19:34 +0000 (22:19 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
TreeHugger Robot [Sun, 15 Sep 2019 16:17:03 +0000 (16:17 +0000)]
Merge "Fix touch goes to the window behide PiP" into qt-qpr1-dev
Bill Yi [Sat, 14 Sep 2019 22:58:31 +0000 (15:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib027bdb5b5eb3cb6b5645a2a89876b68f97c034d
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 14 Sep 2019 19:50:39 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
TreeHugger Robot [Sat, 14 Sep 2019 19:42:48 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
TreeHugger Robot [Sat, 14 Sep 2019 19:24:24 +0000 (19:24 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
TreeHugger Robot [Sat, 14 Sep 2019 19:19:34 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
TreeHugger Robot [Sat, 14 Sep 2019 19:14:33 +0000 (19:14 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Adam Seaton [Sat, 14 Sep 2019 12:48:50 +0000 (05:48 -0700)]
Merge "Revert "don't compute outside of visible range"" into qt-dev am:
e4d9618d67
am:
3d623d54f2
Change-Id: I35674ab6ab6e5773f93377e64c7de1863423e562
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
Bill Yi [Sat, 14 Sep 2019 10:28:11 +0000 (03:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I698ae74015e0351fbf89090e19ce7c4bf605d822
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Sep 2019 07:59:09 +0000 (00:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I286bacad06517310235f15d54447c83217cc60a4
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 14 Sep 2019 07:46:58 +0000 (07:46 +0000)]
Merge "Camera: fix NPE in buffer error callback" into qt-qpr1-dev
Bill Yi [Sat, 14 Sep 2019 07:31:54 +0000 (00:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e8591c173dec62b274e9c7a39246f4cdeea03ac
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 14 Sep 2019 06:55:49 +0000 (06:55 +0000)]
Merge "Sharesheet - log copy actions." into qt-qpr1-dev
Sooraj Sasindran [Fri, 13 Sep 2019 17:40:32 +0000 (10:40 -0700)]
Add a carrier config to disable ping test
Add a carrier config to disable ping test before data
switch to opportunistic network.
Bug:
141003010
Test: make
Merged-In: I56835e5b416685fbcf2ab2729aa6a039c7f11806
Change-Id: I56835e5b416685fbcf2ab2729aa6a039c7f11806
Bill Yi [Sat, 14 Sep 2019 01:11:53 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I52acb9c019c72c34306fb0c330afe1f1ecbf7510
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Sep 2019 01:02:56 +0000 (18:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1ca9e4ec67aafc3276375ac103d8387b0f2781c4
Auto-generated-cl: translation import
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 21:46:47 +0000 (21:46 +0000)]
Merge "Fix QuotaController constants." into qt-qpr1-dev
TreeHugger Robot [Fri, 13 Sep 2019 21:13:17 +0000 (21:13 +0000)]
Merge "RESTRICT AUTOMERGE Remove the possibility of an NPE that is being seen in " into qt-qpr1-dev
Kweku Adams [Fri, 13 Sep 2019 20:46:31 +0000 (13:46 -0700)]
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: I9210d80187e33be86b3cd56c89a198fd97f69460
Merged-In: I3e2848446b20f7258fac2d96566c96aea5715949
Merged-In: I50be8680e449bea54c2e3b8300812a00cf6567af
Alison Cichowlas [Fri, 13 Sep 2019 20:38:18 +0000 (20:38 +0000)]
Merge "Add constant for System actions in Sharesheet." into qt-qpr1-dev
Eric Laurent [Fri, 13 Sep 2019 19:28:16 +0000 (19:28 +0000)]
Merge "AudioTrack: fix default low power mode selection" into qt-qpr1-dev
Alison Cichowlas [Thu, 12 Sep 2019 19:51:19 +0000 (15:51 -0400)]
Add constant for System actions in Sharesheet.
Test: manual; compiles
Bug:
140928181
Change-Id: I66e38efbf87bed573766a17cc1401ed19e606c48
(cherry picked from commit
a2d980661cb7d02c917764bde1d426cb55bc2d88)
Merged-In: I66e38efbf87bed573766a17cc1401ed19e606c48
Andy Hung [Fri, 13 Sep 2019 17:09:09 +0000 (17:09 +0000)]
Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END" into qt-qpr1-dev
Blake Kragten [Wed, 28 Aug 2019 23:21:35 +0000 (16:21 -0700)]
L5 Metrics Addition:
Added L5 metrics to determine if L5 should be enabled or not.
Test: On device
adb shell dumpsys location
Output:
Number of CN0 reports: 149
Top 4 Avg CN0 mean (dB-Hz): 26.
100838872410307
Top 4 Avg CN0 standard deviation (dB-Hz): 1.
7702387090734562
Total number of sv status messages processed: 4202
Total number of L5 sv status messages processed: 703
Total number of sv status messages processed, where sv is used in fix: 1979
Total number of L5 sv status messages processed, where sv is used in fix: 46
Number of L5 CN0 reports: 97
L5 Top 4 Avg CN0 mean (dB-Hz): 20.
273711379041377
L5 Top 4 Avg CN0 standard deviation (dB-Hz): 2.
632911219511556
Used-in-fix constellation types: GPS GLONASS GALILEO
Output Logs: https://drive.google.com/drive/folders/1tGEolHWtF92UkJ8lxgFihIzfWLl8ChZK?usp=sharing
Bug:
137575988
Change-Id: Id306d7cc27c9410a5ad73f5a0940c25f8d795686
Merged-In: Id306d7cc27c9410a5ad73f5a0940c25f8d795686
Eric Laurent [Thu, 12 Sep 2019 02:13:08 +0000 (19:13 -0700)]
AudioTrack: fix default low power mode selection
Fix AudioAttributes flags checking logic in
shouldEnablePowerSaving() to take into account
flags that are compatible with deep buffer.
Bug:
140899988
Test: check that playback with Spotify goes to deep buffer
Change-Id: I492410b7837b15e248d61ec50dbb468e78e04524
Alison Cichowlas [Thu, 12 Sep 2019 19:57:26 +0000 (15:57 -0400)]
Sharesheet - log copy actions.
Since we've promoted Copy to a system action, out of the general list of targets, it's no longer logged with the regular share target logging.
Bug:
140928181
Test: reviewed adb logcat -b event; correct event looks like
sysui_multi_action: [757,1749,758,4,759,1]
Change-Id: I699ffe0fb7c5631c6e8535377ada36a7ce855734
Dave Mankoff [Thu, 12 Sep 2019 20:41:43 +0000 (16:41 -0400)]
RESTRICT AUTOMERGE Remove the possibility of an NPE that is being seen in
This code is not actually doing anything useful in QPR1, so best to
simply remove it.
Bug:
140950258
Test: manual
Change-Id: I53abdef77a93ad854935f79e431d9861b40c2427
Lucas Dupin [Fri, 13 Sep 2019 08:20:44 +0000 (01:20 -0700)]
[automerger skipped] Merge changes from topic "cherry-pick-dropped-sensor" into qt-r1-dev
am:
1ed27213d0 -s ours
am skip reason: change_id Ic85181abb3edd4c77c427faefa4cd6b9c35b498f with SHA1
1946d87344 is in history
Change-Id: Ifd77e79fc398dc8d0839764f9768079ae26bd391
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
TreeHugger Robot [Fri, 13 Sep 2019 04:06:48 +0000 (04:06 +0000)]
Merge "Ensure bounds animination for expanding PiP window" into qt-qpr1-dev
TreeHugger Robot [Fri, 13 Sep 2019 04:04:40 +0000 (04:04 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Fri, 13 Sep 2019 02:49:38 +0000 (19:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f3bba17344fb571b61161b31ce22324db37314c
Auto-generated-cl: translation import
Bill Yi [Fri, 13 Sep 2019 02:38:10 +0000 (19:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia6e2dfe436de60412625408a5754ec29432d2861
Auto-generated-cl: translation import
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
Andy Hung [Tue, 10 Sep 2019 21:49:46 +0000 (14:49 -0700)]
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
a527524356a9a6bc9597e4d06cee5c02cf936a68)
Hongwei Wang [Thu, 25 Jul 2019 22:14:47 +0000 (15:14 -0700)]
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
2cebfd5e5f39f7b09231562e84252f388bec3c89)
Fabian Kozynski [Thu, 12 Sep 2019 21:38:14 +0000 (21:38 +0000)]
Merge "Fix incorrect text when on Airplane Mode" into qt-qpr1-dev
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
Fabian Kozynski [Thu, 29 Aug 2019 13:47:07 +0000 (09:47 -0400)]
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
Jeff Sharkey [Thu, 12 Sep 2019 20:49:34 +0000 (13:49 -0700)]
Merge changes from topic "bp-
135269143-p" into pi-dev am:
604d91d713 am:
bf25aeaa84
am:
4dd2150e42
Change-Id: I786dd53e404aa5141a2cd81d0750a612b81e965a
Jeff Sharkey [Thu, 12 Sep 2019 20:49:24 +0000 (13:49 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
216bbc2a2e -s ours am:
06cf16b862
am:
844fa00afb
Change-Id: I6c74a68eefe3b40e11eaabafdc9d3a73de0073bb
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
Mehdi Alizadeh [Thu, 12 Sep 2019 00:23:10 +0000 (17:23 -0700)]
Add target type flags to set the origin of share targets
Bug:
140898597
Test: atest ChooserActivityTest
Change-Id: Iaab20121986f6e0ac22fc2ae2150484b9df95c54
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
Brad Stenning [Thu, 12 Sep 2019 18:24:40 +0000 (18:24 +0000)]
Merge "Fix build file such that CarSystemUi can be easily extended" into qt-qpr1-dev
Jeff Sharkey [Thu, 12 Sep 2019 18:17:03 +0000 (11:17 -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
am:
e601fa8901
Change-Id: I6505d0ef0777db0afc4523e3ef2dcb5936de98d3
Jeff Sharkey [Thu, 12 Sep 2019 18:16:55 +0000 (11:16 -0700)]
[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: Ieee0c13c03e957d626632eb257a5bb7e972213b7
Jeff Sharkey [Thu, 12 Sep 2019 18:12:58 +0000 (11:12 -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
am:
29d4d347da
Change-Id: Ic9312ce773a89c64e28655ed8de9fba3abe318e1
Jeff Sharkey [Thu, 12 Sep 2019 18:12:40 +0000 (11:12 -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
am:
e2a8e18494
Change-Id: If6e7327844a760c0174dd42f0e0bceddac1d3131
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
Govinda Wasserman [Thu, 12 Sep 2019 15:45:38 +0000 (15:45 +0000)]
Merge "Trigger doze detection using WakefulnessLifecycle" into qt-qpr1-dev
Govinda Wasserman [Thu, 5 Sep 2019 20:32:23 +0000 (16:32 -0400)]
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
Matt Pietal [Thu, 12 Sep 2019 14:37:59 +0000 (14:37 +0000)]
Merge "Resolver - Fix NGA (voice interaction) crash in resolver" into qt-qpr1-dev
Nicholas Sauer [Thu, 12 Sep 2019 13:43:15 +0000 (13:43 +0000)]
Merge "Return tasks that belong to a profile from getRunningTasks." into qt-qpr1-dev
Nicholas Sauer [Wed, 11 Sep 2019 03:23:41 +0000 (20:23 -0700)]
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
TreeHugger Robot [Thu, 12 Sep 2019 07:10:39 +0000 (07:10 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Elias Wald [Thu, 12 Sep 2019 05:45:07 +0000 (22:45 -0700)]
Merge "Add keylayout for original xbox controller" into qt-dev am:
aaaee164de
am:
0a7a87b548
Change-Id: Id975158b4e829eab3217f36a45846d86a0ae51b1