Selim Gurun
a64ebd5727
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev am: c922c4827a
...
am: e7534f48ce
2017-04-10 16:56:06 +00:00
Selim Gurun
e7534f48ce
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
...
am: c922c4827a
2017-04-10 16:48:28 +00:00
TreeHugger Robot
c922c4827a
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
2017-04-10 16:36:48 +00:00
Andrii Kulian
4cab4b3a6a
Merge "Use feature instead of hidden config for multi-display" into oc-dev am: 72790bade5
...
am: 2d27f1c538
2017-04-08 02:07:08 +00:00
Andrii Kulian
2d27f1c538
Merge "Use feature instead of hidden config for multi-display" into oc-dev
...
am: 72790bade5
2017-04-08 02:00:57 +00:00
Andrii Kulian
72790bade5
Merge "Use feature instead of hidden config for multi-display" into oc-dev
2017-04-08 01:51:29 +00:00
Selim Gurun
ec0a1f2599
Add an API to enable disable safebrowsing in WebView
...
WebView safebrowsing can be opted in using a manifest value. However,
we also need to control individual WebViews.
Bug:37158813
Test: See change I71e813bccc2fab73d100384661128c7311dd396c
Change-Id: I647dc304787d6406691b5cbadf1c9a4f13ac5604
2017-04-07 18:46:18 -07:00
Wei Jia
66acecdb03
Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev am: e79081aeaa
...
am: 1dccc5841d
2017-04-08 00:42:54 +00:00
Wei Jia
1dccc5841d
Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev
...
am: e79081aeaa
2017-04-08 00:33:57 +00:00
TreeHugger Robot
e79081aeaa
Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev
2017-04-08 00:24:12 +00:00
Felipe Leme
d10879d146
Merge "Autofill Partitioning: support multiple SaveInfos." into oc-dev am: 5c8d88e855
...
am: 49b37310ab
2017-04-08 00:06:53 +00:00
Felipe Leme
49b37310ab
Merge "Autofill Partitioning: support multiple SaveInfos." into oc-dev
...
am: 5c8d88e855
2017-04-08 00:01:51 +00:00
TreeHugger Robot
5c8d88e855
Merge "Autofill Partitioning: support multiple SaveInfos." into oc-dev
2017-04-07 23:52:11 +00:00
Andrii Kulian
1981f5fd17
Use feature instead of hidden config for multi-display
...
Using a feature will allow app developers to find out if a
particular device supports running activities on secondary
screens before using the APIs.
Bug: 36776777
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I7121bdb782cac9df70121e9df5cbf3fcb76f4a93
2017-04-07 16:23:12 -07:00
Wei Jia
ae3e7067ef
MediaPlayer: add 2 more info notifications for playback error
...
Test: mediaplayer doesn't send error notify to client when only one track has error.
Bug: 24761723
Change-Id: I7221dfdbc6a256532186c654406bbe06de831798
2017-04-07 15:24:50 -07:00
Wei Jia
e1a76bb7b3
Merge "MediaPlayer: hide BufferingParams API" into oc-dev am: 4c2a62edb6
...
am: 2c51d55fcc
2017-04-07 22:01:05 +00:00
Wei Jia
2c51d55fcc
Merge "MediaPlayer: hide BufferingParams API" into oc-dev
...
am: 4c2a62edb6
2017-04-07 21:54:06 +00:00
TreeHugger Robot
4c2a62edb6
Merge "MediaPlayer: hide BufferingParams API" into oc-dev
2017-04-07 21:46:40 +00:00
Romain Guy
0246a298f9
Merge "Color management, the missing pieces" into oc-dev am: 7dfa16c2ef
...
am: 3eafcb2d8b
2017-04-07 18:48:57 +00:00
Ying Xu
98852767b3
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev
2017-04-07 18:47:58 +00:00
Romain Guy
3eafcb2d8b
Merge "Color management, the missing pieces" into oc-dev
...
am: 7dfa16c2ef
2017-04-07 18:41:50 +00:00
TreeHugger Robot
7dfa16c2ef
Merge "Color management, the missing pieces" into oc-dev
2017-04-07 18:34:40 +00:00
Chen Xu
a775faf40f
Merge "remove deprecated API sendDialerCode" into oc-dev am: 31fcda576f
...
am: 6fd0d2b37f
2017-04-07 16:12:54 +00:00
Chen Xu
6fd0d2b37f
Merge "remove deprecated API sendDialerCode" into oc-dev
...
am: 31fcda576f
2017-04-07 16:03:02 +00:00
Chen Xu
31fcda576f
Merge "remove deprecated API sendDialerCode" into oc-dev
2017-04-07 15:53:11 +00:00
Romain Guy
8242656f49
Color management, the missing pieces
...
Implement missing color management pieces for bitmaps:
- Bitmap.createBitmap(Bitmap src, ...) now creates a bitmap
in the same color space as the source bitmap
- Bitmap.createScaledBitmap() now creates a bitmap in the
same color space as the source bitmap
- Bitmap.createBitmap(..., ColorSpace colorSpace) to create
bitmaps in a specific color space
- Fix copy from A8 to F16
- Copying bitmaps in F16 or with a color space does not work,
it's currently a limitation in Skia
Bug: 36905374
Test: BitmapColorSpaceTest
Change-Id: I0092fe4432511db50daa3a9393389a9db05e0c2a
2017-04-07 07:56:14 -07:00
Philip P. Moltmann
8f9ae8ec8e
Merge "Change requestWait API according to request" into oc-dev am: ca687ac39a
...
am: a89137545b
2017-04-07 13:35:50 +00:00
Philip P. Moltmann
a89137545b
Merge "Change requestWait API according to request" into oc-dev
...
am: ca687ac39a
2017-04-07 13:27:33 +00:00
Esteban Talavera
89d1d31955
Merge "Add managed profile whitelist to control NotificationListenerServices"
2017-04-07 13:26:30 +00:00
TreeHugger Robot
ca687ac39a
Merge "Change requestWait API according to request" into oc-dev
2017-04-07 13:19:12 +00:00
Felipe Leme
7d5adb5b86
Autofill Partitioning: support multiple SaveInfos.
...
Bug: 35707731
Test: CtsAutoFillServiceTestCases (with new tests) pass
Change-Id: I2f234ca13c7e74f84c762473e38f938ed47f216f
2017-04-06 22:19:22 -07:00
Philip P. Moltmann
bd926258c2
resolve merge conflicts of 3c002e45dd to oc-dev-plus-aosp
...
am: d45000c1a9
2017-04-07 03:34:44 +00:00
Philip P. Moltmann
d45000c1a9
resolve merge conflicts of 3c002e45dd to oc-dev-plus-aosp
...
Test: Trivial resolution
Change-Id: Ifc41cc692406d52f508b595465f4f7469f74c6f5
2017-04-06 20:25:45 -07:00
Philip P. Moltmann
3c002e45dd
Merge "Return inet addr for discoverable printers" into oc-dev
2017-04-07 03:04:17 +00:00
Chad Brubaker
5ced04f21e
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev am: c56d782e13
...
am: 49b607a61e
2017-04-07 02:45:06 +00:00
Chad Brubaker
49b607a61e
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev
...
am: c56d782e13
2017-04-07 02:37:36 +00:00
TreeHugger Robot
c56d782e13
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev
2017-04-07 02:28:23 +00:00
Tima Vaisburd
00c8dd3d1b
Merge "Added onMovedToDisplay method to WebView" into oc-dev am: be41b61216
...
am: 0b1023a263
2017-04-07 01:32:30 +00:00
Tima Vaisburd
0b1023a263
Merge "Added onMovedToDisplay method to WebView" into oc-dev
...
am: be41b61216
2017-04-07 01:24:36 +00:00
TreeHugger Robot
be41b61216
Merge "Added onMovedToDisplay method to WebView" into oc-dev
2017-04-07 01:18:59 +00:00
Philip P. Moltmann
9b6dd2b2c1
Change requestWait API according to request
...
Test: USB Device CTSVerifier test
Change-Id: Ib55bed248d7b37c6f5f4a7be7ec2d90a7ac396c7
Fixes: 36555805
2017-04-06 18:13:53 -07:00
Dongwon Kang
c09571ba26
Merge "Add intent to intialize programs on APP installed" into oc-dev am: 9c1e85384e
...
am: 2b45152532
2017-04-06 23:39:43 +00:00
Felipe Leme
ba3918b1d8
Merge "Removed deprecated onFillRequest() method" into oc-dev am: 7a7c0ace82
...
am: 3e91021212
2017-04-06 23:32:11 +00:00
Dongwon Kang
2b45152532
Merge "Add intent to intialize programs on APP installed" into oc-dev
...
am: 9c1e85384e
2017-04-06 22:56:24 +00:00
Tima Vaisburd
134752b471
Added onMovedToDisplay method to WebView
...
Delegate the action to WebViewProvider, by default it is no-op.
Bug: 36006397
Test: There is no implementation yet to test.
Change-Id: Ib5101d3669a92ae81cfb34cc5db607c374712a3d
2017-04-06 15:50:05 -07:00
Dongwon Kang
9c1e85384e
Merge "Add intent to intialize programs on APP installed" into oc-dev
2017-04-06 22:49:50 +00:00
Romain Guy
dd2b7ccabc
Merge "Rename getIntent() to getRenderIntent()" into oc-dev am: b2bb3bf268
...
am: 98e11587f2
2017-04-06 22:47:21 +00:00
Felipe Leme
3e91021212
Merge "Removed deprecated onFillRequest() method" into oc-dev
...
am: 7a7c0ace82
2017-04-06 22:30:09 +00:00
TreeHugger Robot
7a7c0ace82
Merge "Removed deprecated onFillRequest() method" into oc-dev
2017-04-06 22:20:49 +00:00
Romain Guy
98e11587f2
Merge "Rename getIntent() to getRenderIntent()" into oc-dev
...
am: b2bb3bf268
2017-04-06 21:39:20 +00:00
