Commit Graph

416075 Commits

Author SHA1 Message Date
Ryan Mitchell
9b731aefd7 Merge "Check value in dump before printing" into qt-dev am: d8ec9971cb
am: acbf1c7668

Change-Id: I9977935168e838b6d070200e25d41439c5a962cf
2019-04-16 20:16:00 -07:00
Matt Pietal
c26ed3c801 Merge "Sharesheet - Merge EXTRA_INITIAL_INTENTS + Ranked apps" into qt-dev am: cb86e128cf
am: 3967098ee8

Change-Id: I1406ff037da221bfd4999c3bef67d07e6b400f8a
2019-04-16 20:10:44 -07:00
Michael Groover
ad26b3cf1a Merge "Grant access to device identifiers with READ_DEVICE_IDENTIFIERS appop" into qt-dev am: f636d3cde8
am: fe4f44f41f

Change-Id: I1927de7a5c49d0426b0663cb5285706223c20a80
2019-04-16 19:42:35 -07:00
Todd Kennedy
a3c03b904b Merge "Don't hold mPackages calling addPreferredActivityInternal" into qt-dev am: b33a6c6067
am: 326e17b513

Change-Id: I96b0385756a1da6a85cf2d9ffa080c299011b85b
2019-04-16 19:37:07 -07:00
Fabian Kozynski
7a1740bea7 Merge "Fix "No Service" in QS when Airplane Mode" into qt-dev am: e55986b8f9
am: c9cc35c98f

Change-Id: I12eb45b95530abd3193eb9ee8f37aac173a4e3bf
2019-04-16 19:16:40 -07:00
Jeff Sharkey
6d87a4b6e7 Merge "Handle any exception when allowing failures." into qt-dev am: ea9dd75ee0
am: 4c96a64203

Change-Id: I74e39647269a61c4c321fad501ffb8350558945a
2019-04-16 19:10:08 -07:00
Jeff Sharkey
c1d735597a Merge "Instant apps should have default view of storage?" into qt-dev am: 4aa99a78b1
am: bdd44838e9

Change-Id: If67913dde0b231de26dfe33a290cc61e9dcd33e5
2019-04-16 19:03:24 -07:00
Robert Snoeberger
debbbba792 Merge "Update Stretch Analog clock face" into qt-dev am: d7af9b8527
am: 808a6f3dd4

Change-Id: I755190f079c060280e0174e8d9ba86c39dcd3d90
2019-04-16 18:57:03 -07:00
Patrick Baumann
6bd7900fe9 Merge "Recovers on boot when scan of data app fails" into qt-dev am: 9c6b3fdb2f
am: 040ca221c9

Change-Id: I90dc3f5101083c6cc3c3d2518efa62dd65fce7d4
2019-04-16 18:50:35 -07:00
Andrii Kulian
a67552fc20 Merge "Add unit tests for activity client state changes" into qt-dev am: 153f73cbcc
am: f1bafbef0c

Change-Id: I6e89e60c90004641a3551060776a9e42d9a3437b
2019-04-16 18:24:22 -07:00
Andrii Kulian
a066582be0 Merge "Fix extra onStop when finishing after onCreate" into qt-dev am: 008483c045
am: 2ae53beaeb

Change-Id: I97c2b220c733c773649970b9c45ed03913ea338b
2019-04-16 18:17:38 -07:00
Felipe Leme
7c78373bd9 Merge "Added example for ContentCaptureService.SERVICE_META_DATA" into qt-dev am: 45683e40f1
am: bcbd28d46e

Change-Id: I5544fe837b3a1a3bdd02d21f50aa07ef7b6efc0e
2019-04-16 18:11:05 -07:00
Patrick Baumann
1641e2a2bc Merge "Fixes incorrect app id cleanup on failure" into qt-dev am: abf224e88f
am: 0a3524a198

Change-Id: I1d2562c84881f441c29212ec52ae234c34d151c8
2019-04-16 17:49:18 -07:00
Yi Jiang
ae9a17d6ca Merge "Adds unit tests in attention manager service for two interfaces: -checkAttention() -cancelAttentionCheck()" into qt-dev am: 9b2b4f5583
am: 61886126ac

Change-Id: I037389d8cc5e54818053329845fdb2a7ea335773
2019-04-16 17:43:50 -07:00
Chalard Jean
c3643acb8d Merge "Move TrafficStats tags for the network stack constants" into qt-dev am: e7ef0a61f2
am: c728f75abd

Change-Id: I4882686a86e7c6d42f4b0619b921d02619ed6d4c
2019-04-16 17:38:30 -07:00
Ryan Mitchell
acbf1c7668 Merge "Check value in dump before printing" into qt-dev
am: d8ec9971cb

Change-Id: I0cb6c1bec55e8490681e161100ef8522aebd91e3
2019-04-16 17:34:41 -07:00
Mark Renouf
e9bc489b84 Merge "BubbleData [6/n]: Splice BubbleData into code path" into qt-dev am: 3a7a3391b7
am: cc19ae16d3

Change-Id: If037030b0bd77e82d592c958d8e22e374ad07a99
2019-04-16 17:33:22 -07:00
Matt Pietal
3967098ee8 Merge "Sharesheet - Merge EXTRA_INITIAL_INTENTS + Ranked apps" into qt-dev
am: cb86e128cf

Change-Id: If9cd2c04032131ebe4e0b8f4b82ca4ee3a83a701
2019-04-16 17:29:25 -07:00
Brad Ebinger
8790a10d4f [automerger skipped] Merge "Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process" am: bc17e4b328 am: d4c5fdf4f9 -s ours
am: f8bff56ae9 -s ours
am skip reason: change_id I06d7a8c6a43a596042cb74e3e9b88a2d9e61bed6 with SHA1 58e9f91e4f is in history

Change-Id: I17752a7661e18fcc6423142be864a8b5b9944df1
2019-04-16 17:21:38 -07:00
Michael Groover
fe4f44f41f Merge "Grant access to device identifiers with READ_DEVICE_IDENTIFIERS appop" into qt-dev
am: f636d3cde8

Change-Id: Iaef33e9974a0ca2dcc74649b6e082d7d15704138
2019-04-16 17:18:55 -07:00
Todd Kennedy
326e17b513 Merge "Don't hold mPackages calling addPreferredActivityInternal" into qt-dev
am: b33a6c6067

Change-Id: I73c0ae9ed9df61acde669029d0b0c532af350f5a
2019-04-16 17:13:15 -07:00
Fabian Kozynski
c9cc35c98f Merge "Fix "No Service" in QS when Airplane Mode" into qt-dev
am: e55986b8f9

Change-Id: Ifbfe0e38dedfb2c2a0cb2c20e8eef1b282fda530
2019-04-16 16:58:09 -07:00
Jeff Sharkey
4c96a64203 Merge "Handle any exception when allowing failures." into qt-dev
am: ea9dd75ee0

Change-Id: I48fc8615630c9eeb379d8870ef82d0014aa5204d
2019-04-16 16:52:35 -07:00
Jeff Sharkey
bdd44838e9 Merge "Instant apps should have default view of storage?" into qt-dev
am: 4aa99a78b1

Change-Id: Id59f1c1405b873f43b06b50be0c102ce9a0b290e
2019-04-16 16:40:04 -07:00
Anton Hansson
3ce635d227 Merge "Merge "Remove MiniThumbFile" into qt-dev am: 2199664e37" into qt-dev-plus-aosp
am: 6cb42fbd3a

Change-Id: I1640bcf0f355ed3ec41f41107e8e5e772657dd09
2019-04-16 16:29:02 -07:00
Robert Snoeberger
808a6f3dd4 Merge "Update Stretch Analog clock face" into qt-dev
am: d7af9b8527

Change-Id: I51e921570356643fd1cc9fe4c81751e9097ea182
2019-04-16 16:18:31 -07:00
Patrick Baumann
040ca221c9 Merge "Recovers on boot when scan of data app fails" into qt-dev
am: 9c6b3fdb2f

Change-Id: I25988b024177af15fc87c1c003dc8a3ef1086161
2019-04-16 16:10:38 -07:00
Andrii Kulian
f1bafbef0c Merge "Add unit tests for activity client state changes" into qt-dev
am: 153f73cbcc

Change-Id: I8d843d99025dac74f13d83224eacfdeca682a69c
2019-04-16 16:03:54 -07:00
Andrii Kulian
2ae53beaeb Merge "Fix extra onStop when finishing after onCreate" into qt-dev
am: 008483c045

Change-Id: I3981baeae3179677f1f80fd9db43cf6443940519
2019-04-16 15:55:45 -07:00
Brad Ebinger
ae9fde481c Merge "Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs" am: 2c0e192436 am: f4efaf0c5a" into qt-dev-plus-aosp
am: aa73bdc1eb

Change-Id: Iad9a1caa9d7e4cd6cae2dd59c9987a1b804a2e95
2019-04-16 15:50:12 -07:00
Felipe Leme
bcbd28d46e Merge "Added example for ContentCaptureService.SERVICE_META_DATA" into qt-dev
am: 45683e40f1

Change-Id: Ia2fb61d4a54a0aae64e94c41ebdc27d0bb45f02c
2019-04-16 15:49:35 -07:00
Felipe Leme
c83f9d7d7c Merge "Clarified format of ContentCaptureCondition.FLAG_IS_REGEX" into qt-dev am: dc868e04f9
am: 3173de0a09

Change-Id: Ie679eb49d16a5e8b4418f24110d09d2a15c74081
2019-04-16 15:35:21 -07:00
Patrick Baumann
0a3524a198 Merge "Fixes incorrect app id cleanup on failure" into qt-dev
am: abf224e88f

Change-Id: If0f5922696b2030642209efa777ad4582445ff90
2019-04-16 15:33:02 -07:00
Steven Moreland
5e80f8b6f7 Merge "hwbinder: explicitly disallow local java binder" am: c33c224b4e am: afa3718282
am: 56da481874

Change-Id: I11c1692f06a7cd1e3514c00c6a309b097303dab0
2019-04-16 15:29:20 -07:00
Yi Jiang
61886126ac Merge "Adds unit tests in attention manager service for two interfaces: -checkAttention() -cancelAttentionCheck()" into qt-dev
am: 9b2b4f5583

Change-Id: I1bd75ddc203bc247ddf38a3012edd5ec1696447c
2019-04-16 15:20:32 -07:00
TreeHugger Robot
d8ec9971cb Merge "Check value in dump before printing" into qt-dev 2019-04-16 22:06:24 +00:00
Chalard Jean
c728f75abd Merge "Move TrafficStats tags for the network stack constants" into qt-dev
am: e7ef0a61f2

Change-Id: I9b648ed6c687d56db61a54570c7880c51c1bae51
2019-04-16 15:06:03 -07:00
TreeHugger Robot
cb86e128cf Merge "Sharesheet - Merge EXTRA_INITIAL_INTENTS + Ranked apps" into qt-dev 2019-04-16 21:53:27 +00:00
TreeHugger Robot
f636d3cde8 Merge "Grant access to device identifiers with READ_DEVICE_IDENTIFIERS appop" into qt-dev 2019-04-16 21:52:56 +00:00
TreeHugger Robot
b33a6c6067 Merge "Don't hold mPackages calling addPreferredActivityInternal" into qt-dev 2019-04-16 21:46:33 +00:00
Mark Renouf
cc19ae16d3 Merge "BubbleData [6/n]: Splice BubbleData into code path" into qt-dev
am: 3a7a3391b7

Change-Id: I3db2c0049a7e493f3f2933fe344b9a9cbc938d58
2019-04-16 14:46:03 -07:00
Android Build Merger (Role)
90c483abf7 Merge "Merge "Grant clipboard access to the Augmented Autofill service." into qt-dev am: 50a56879e5 am: 6ea4934587" 2019-04-16 21:42:40 +00:00
Felipe Leme
4fb1e57f8f Merge "Grant clipboard access to the Augmented Autofill service." into qt-dev am: 50a56879e5
am: 6ea4934587

Change-Id: I00dc672816d7966dc62172ab02e7ff14fbd3f721
2019-04-16 14:41:37 -07:00
TreeHugger Robot
e55986b8f9 Merge "Fix "No Service" in QS when Airplane Mode" into qt-dev 2019-04-16 21:40:33 +00:00
Android Build Merger (Role)
e49cc0e126 Merge "Merge "Move music icon to secondary row" into qt-dev am: 83ee7d1fa7 am: 332b34dd3e" 2019-04-16 21:35:26 +00:00
Lucas Dupin
6f26a11e74 Merge "Move music icon to secondary row" into qt-dev am: 83ee7d1fa7
am: 332b34dd3e

Change-Id: I3edc2c12ad4dbc3376c80fe7c2e47520a467f2d8
2019-04-16 14:34:53 -07:00
Jeff Sharkey
ea9dd75ee0 Merge "Handle any exception when allowing failures." into qt-dev 2019-04-16 21:34:27 +00:00
Jeff Sharkey
4aa99a78b1 Merge "Instant apps should have default view of storage?" into qt-dev 2019-04-16 21:34:07 +00:00
Brad Ebinger
f8bff56ae9 [automerger skipped] Merge "Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process" am: bc17e4b328
am: d4c5fdf4f9 -s ours
am skip reason: change_id I06d7a8c6a43a596042cb74e3e9b88a2d9e61bed6 with SHA1 58e9f91e4f is in history

Change-Id: Iddb063cb5e0644aa967715b10d41152c92302d23
2019-04-16 14:30:37 -07:00
TreeHugger Robot
cf34a400e6 Merge "Don't call into pm with appops lock held" 2019-04-16 21:29:34 +00:00