Robert Snoeberger
debbbba792
Merge "Update Stretch Analog clock face" into qt-dev am: d7af9b8527
...
am: 808a6f3dd4
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
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
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
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
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
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
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
2019-04-16 17:38:30 -07:00
Mark Renouf
e9bc489b84
Merge "BubbleData [6/n]: Splice BubbleData into code path" into qt-dev am: 3a7a3391b7
...
am: cc19ae16d3
2019-04-16 17:33:22 -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: f8bff56ae958e9f91e4f
2019-04-16 17:21:38 -07:00
Anton Hansson
3ce635d227
Merge "Merge "Remove MiniThumbFile" into qt-dev am: 2199664e37" into qt-dev-plus-aosp
...
am: 6cb42fbd3a
2019-04-16 16:29:02 -07:00
Robert Snoeberger
808a6f3dd4
Merge "Update Stretch Analog clock face" into qt-dev
...
am: d7af9b8527
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
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
2019-04-16 16:03:54 -07:00
Andrii Kulian
2ae53beaeb
Merge "Fix extra onStop when finishing after onCreate" into qt-dev
...
am: 008483c045
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
2019-04-16 15:50:12 -07:00
Felipe Leme
bcbd28d46e
Merge "Added example for ContentCaptureService.SERVICE_META_DATA" into qt-dev
...
am: 45683e40f1
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
2019-04-16 15:35:21 -07:00
Patrick Baumann
0a3524a198
Merge "Fixes incorrect app id cleanup on failure" into qt-dev
...
am: abf224e88f
2019-04-16 15:33:02 -07:00
Steven Moreland
5e80f8b6f7
Merge "hwbinder: explicitly disallow local java binder" am: c33c224b4e am: afa3718282
...
am: 56da481874
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
2019-04-16 15:20:32 -07:00
Chalard Jean
c728f75abd
Merge "Move TrafficStats tags for the network stack constants" into qt-dev
...
am: e7ef0a61f2
2019-04-16 15:06:03 -07:00
Mark Renouf
cc19ae16d3
Merge "BubbleData [6/n]: Splice BubbleData into code path" into qt-dev
...
am: 3a7a3391b7
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
2019-04-16 14:41:37 -07: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
2019-04-16 14:34:53 -07:00
Brad Ebinger
f8bff56ae9
[automerger skipped] Merge "Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process" am: bc17e4b328
...
am: d4c5fdf4f958e9f91e4f
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
TreeHugger Robot
d7af9b8527
Merge "Update Stretch Analog clock face" into qt-dev
2019-04-16 21:20:23 +00:00
TreeHugger Robot
9c6b3fdb2f
Merge "Recovers on boot when scan of data app fails" into qt-dev
2019-04-16 21:19:33 +00:00
Andrii Kulian
153f73cbcc
Merge "Add unit tests for activity client state changes" into qt-dev
2019-04-16 21:18:18 +00:00
Andrii Kulian
008483c045
Merge "Fix extra onStop when finishing after onCreate" into qt-dev
2019-04-16 21:18:18 +00:00
Android Build Merger (Role)
6cb42fbd3a
Merge "Merge "Remove MiniThumbFile" into qt-dev am: 2199664e37" into qt-dev-plus-aosp
2019-04-16 21:17:46 +00:00
Anton Hansson
a6aab6de63
Merge "Remove MiniThumbFile" into qt-dev
...
am: 2199664e37
2019-04-16 14:17:12 -07:00
TreeHugger Robot
45683e40f1
Merge "Added example for ContentCaptureService.SERVICE_META_DATA" into qt-dev
2019-04-16 21:13:44 +00:00
Android Build Merger (Role)
aa73bdc1eb
Merge "Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs" am: 2c0e192436 am: f4efaf0c5a" into qt-dev-plus-aosp
2019-04-16 21:13:32 +00:00
Brad Ebinger
56b96fe065
Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs" am: 2c0e192436
...
am: f4efaf0c5a
2019-04-16 14:12:54 -07:00
Felipe Leme
3173de0a09
Merge "Clarified format of ContentCaptureCondition.FLAG_IS_REGEX" into qt-dev
...
am: dc868e04f9
2019-04-16 14:10:51 -07:00
Brad Ebinger
d4c5fdf4f9
Merge "Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process"
...
am: bc17e4b328
2019-04-16 14:09:33 -07:00
Brad Ebinger
f4efaf0c5a
Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs"
...
am: 2c0e192436
2019-04-16 14:04:10 -07:00
Brad Ebinger
bc17e4b328
Merge "Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process"
2019-04-16 20:56:12 +00:00
Brad Ebinger
65a95070f4
Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process
...
The ImsService was sending the deprecated IMS intents, which
should only be send using the Phone process. This was causing
GTS failures.
Bug: 130569556
Test: atest FrameworksTelephonyTests; atest GtsTelephonyTestCases
Merged-In: I06d7a8c6a43a596042cb74e3e9b88a2d9e61bed6
Change-Id: Ie844053aac9c067e66d03c02cf2b87134ee91065
2019-04-16 20:55:03 +00:00
TreeHugger Robot
abf224e88f
Merge "Fixes incorrect app id cleanup on failure" into qt-dev
2019-04-16 20:52:34 +00:00
Maggie White
945d277127
Merge "thermal: Add pulled cooling device atom and a field to Temperature atom" into qt-dev am: 509b97b973
...
am: e76271eb0b
2019-04-16 13:52:23 -07:00
Steven Moreland
56da481874
Merge "hwbinder: explicitly disallow local java binder" am: c33c224b4e
...
am: afa3718282
2019-04-16 13:51:48 -07:00
Brad Ebinger
2c0e192436
Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs"
2019-04-16 20:51:15 +00:00
Salvador Martinez
f69b37be07
Merge "Add custom title for settings dialogs" into qt-dev am: f4fc729acd
...
am: a7f99efdb2
2019-04-16 13:44:12 -07:00
Felipe Leme
6ea4934587
Merge "Grant clipboard access to the Augmented Autofill service." into qt-dev
...
am: 50a56879e5
2019-04-16 13:38:54 -07:00
Yi Jiang
9b2b4f5583
Merge "Adds unit tests in attention manager service for two interfaces: -checkAttention() -cancelAttentionCheck()" into qt-dev
2019-04-16 20:38:28 +00:00
