Wale Ogunwale
0cc85cd5f4
Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp
...
am: cd6eae6cce
2018-03-24 04:54:12 +00:00
Erik Kline
17d4e7fa69
Merge "Merge "Pass all relevant resolver info to netd" am: 76f64641bb am: 3ce3bc4582" into pi-dev-plus-aosp
...
am: 361e903c66
2018-03-24 04:29:06 +00:00
Robert Carr
cfc0ddf1df
Merge "Fix SurfaceView Background" into pi-dev am: e3d2c41344
...
am: beb2540414
2018-03-24 04:00:58 +00:00
Felipe Leme
d3d26f04aa
Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev am: 0049ec1410
...
am: abd29040bb
2018-03-24 02:51:01 +00:00
Felipe Leme
d6878276d9
Merge "Properly set input type on autofill compat mode." into pi-dev am: 352da45bbb
...
am: be541db705
2018-03-24 02:06:48 +00:00
Todd Kopriva
56a99d5ff6
Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev am: ba22b7f4fd
...
am: 1e72ce692a
2018-03-24 01:44:05 +00:00
Android Build Merger (Role)
cd6eae6cce
Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp
2018-03-24 01:22:24 +00:00
Wale Ogunwale
21315b15b7
Merge "Don't show unsupported sdk warning in test harness." into pi-dev
...
am: 444885b10d
2018-03-24 01:21:39 +00:00
Android Build Merger (Role)
361e903c66
Merge "Merge "Pass all relevant resolver info to netd" am: 76f64641bb am: 3ce3bc4582" into pi-dev-plus-aosp
2018-03-24 01:17:12 +00:00
Erik Kline
2b708b55a9
Merge "Pass all relevant resolver info to netd" am: 76f64641bb
...
am: 3ce3bc4582
2018-03-24 01:16:37 +00:00
Robert Carr
beb2540414
Merge "Fix SurfaceView Background" into pi-dev
...
am: e3d2c41344
2018-03-24 01:12:02 +00:00
Erik Kline
3ce3bc4582
Merge "Pass all relevant resolver info to netd"
...
am: 76f64641bb
2018-03-24 01:07:10 +00:00
Evan Rosky
1069c90060
Merge "Added TestApi for default focus highlight" into pi-dev am: 87f9818319
...
am: a6afc381c9
2018-03-24 00:54:19 +00:00
Felipe Leme
abd29040bb
Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev
...
am: 0049ec1410
2018-03-24 00:53:12 +00:00
Felipe Leme
be541db705
Merge "Properly set input type on autofill compat mode." into pi-dev
...
am: 352da45bbb
2018-03-24 00:03:23 +00:00
Treehugger Robot
76f64641bb
Merge "Pass all relevant resolver info to netd"
2018-03-23 23:41:11 +00:00
Todd Kopriva
1e72ce692a
Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev
...
am: ba22b7f4fd
2018-03-23 23:36:28 +00:00
Wale Ogunwale
444885b10d
Merge "Don't show unsupported sdk warning in test harness." into pi-dev
2018-03-23 23:32:54 +00:00
TreeHugger Robot
e3d2c41344
Merge "Fix SurfaceView Background" into pi-dev
2018-03-23 23:21:04 +00:00
TreeHugger Robot
0049ec1410
Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev
2018-03-23 23:18:27 +00:00
Richard Ledley
6a29d0772d
Merge "Add flag to control blocking Smart Replies for apps targeting an Android version below P." into pi-dev
...
am: 525b182864
2018-03-23 23:16:18 +00:00
Evan Rosky
a6afc381c9
Merge "Added TestApi for default focus highlight" into pi-dev
...
am: 87f9818319
2018-03-23 23:01:19 +00:00
Robert Berry
a0696a6f9c
Merge "Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev am: 73b7722c13" into pi-dev-plus-aosp
...
am: 2220061b45
2018-03-23 22:55:30 +00:00
TreeHugger Robot
352da45bbb
Merge "Properly set input type on autofill compat mode." into pi-dev
2018-03-23 22:49:25 +00:00
John Reck
477ea0674c
Merge "Add isPivotSet/resetPivot" into pi-dev am: 6045d66aa2
...
am: 530d626b81
2018-03-23 22:14:45 +00:00
Android Build Merger (Role)
ba22b7f4fd
Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev
2018-03-23 22:11:57 +00:00
Todd Kopriva
1057fc37f5
Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev
...
am: 5b0a4eea8d
2018-03-23 22:11:38 +00:00
TreeHugger Robot
525b182864
Merge "Add flag to control blocking Smart Replies for apps targeting an Android version below P." into pi-dev
2018-03-23 22:07:15 +00:00
TreeHugger Robot
87f9818319
Merge "Added TestApi for default focus highlight" into pi-dev
2018-03-23 22:04:04 +00:00
Zach Johnson
588db43a43
Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev am: 5bdf063537
...
am: 31595b3156
2018-03-23 21:59:45 +00:00
Todd Kopriva
5b0a4eea8d
Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev
2018-03-23 21:48:55 +00:00
Amith Yamasani
78f3b26d6c
Merge "Merge "Provide app launch count in UsageStats" into pi-dev am: 8808edb063" into pi-dev-plus-aosp
...
am: b2312dc99b
2018-03-23 21:32:26 +00:00
Robert Berry
175f666461
Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev
...
am: 73b7722c13
2018-03-23 21:31:58 +00:00
Richard Ledley
4069f7a167
Add flag to control blocking Smart Replies for apps targeting an Android version below P.
...
Bug: 73802997
Test: atest SmartReplyConstantsTest
Change-Id: Id340cba09da7931ff6a4689802b3a5f594852a72
(cherry picked from commit 28944cbdcf
2018-03-23 21:14:27 +00:00
Felipe Leme
ec150609e4
Fixed AutofillServiceHelper.assertValid() so it throws the right exception.
...
Test: atest FillResponseTest SaveInfoTest
Bug: 76097200
Change-Id: Id643007e2d038cc6948cdb8d66c5454048d5f632
2018-03-23 14:09:02 -07:00
John Reck
530d626b81
Merge "Add isPivotSet/resetPivot" into pi-dev
...
am: 6045d66aa2
2018-03-23 21:07:52 +00:00
Felipe Leme
c380e18e31
Properly set input type on autofill compat mode.
...
Test: atest CtsAutoFillServiceTestCases:android.autofillservice.cts.VirtualContainerActivityTest#testAutofillSync\
CtsAutoFillServiceTestCases:android.autofillservice.cts.VirtualContainerActivityCompatModeTest#testAutofillSync
Fixes: 76173462
Change-Id: Ie400ed5d4426febc34b02f68d6be4d86bc11034f
2018-03-23 14:04:23 -07:00
TreeHugger Robot
4efdab2a74
Merge "HIDD: Address API Review concerns" into pi-dev
2018-03-23 21:03:34 +00:00
Zach Johnson
31595b3156
Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev
...
am: 5bdf063537
2018-03-23 21:03:04 +00:00
Amith Yamasani
980b453e17
Merge "Provide app launch count in UsageStats" into pi-dev
...
am: 8808edb063
2018-03-23 20:49:16 +00:00
Robert Carr
386fd70434
Fix SurfaceView Background
...
When refactoring to not use global transaction when setting
position I failed to account for the forwarding done by the
background wrapper.
Bug: 76099976
Bug: 76110573
Test: Manual. go/wm-smoke
Change-Id: I2cff8e571f12e69cefbd1ea35538fd71beaf1ec4
2018-03-23 13:48:48 -07:00
Hansong Zhang
5755fab7a2
Merge "Hearing Aid Profile: set and get activeDevice" into pi-dev am: 9753e774ce
...
am: a84feb191f
2018-03-23 20:30:01 +00:00
Alice Sheng
226c7f7e18
Merge "Add setting for disabling swap." into pi-dev am: 7384995cf8
...
am: 6036a2b5bf
2018-03-23 20:08:08 +00:00
TreeHugger Robot
73b7722c13
Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev
2018-03-23 20:03:45 +00:00
Hansong Zhang
a84feb191f
Merge "Hearing Aid Profile: set and get activeDevice" into pi-dev
...
am: 9753e774ce
2018-03-23 20:02:44 +00:00
Kurt Marcinkiewicz
f8765db34d
Merge "Allow specifying a network for SNTP time sync" into pi-dev am: 991b971acb
...
am: 98be440cfc
2018-03-23 20:00:05 +00:00
Alice Sheng
6036a2b5bf
Merge "Add setting for disabling swap." into pi-dev
...
am: 7384995cf8
2018-03-23 19:47:06 +00:00
Kurt Marcinkiewicz
98be440cfc
Merge "Allow specifying a network for SNTP time sync" into pi-dev
...
am: 991b971acb
2018-03-23 19:40:39 +00:00
John Reck
6045d66aa2
Merge "Add isPivotSet/resetPivot" into pi-dev
2018-03-23 19:26:50 +00:00
TreeHugger Robot
5bdf063537
Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev
2018-03-23 19:18:41 +00:00
