drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
313,880 Commits 1 Branch 0 Tags
Commit Graph

16431 Commits

Author SHA1 Message Date
Selim Gurun
e7534f48ce Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev 
am: c922c4827a

Change-Id: If6d26b4e0965f4a889ab97a9753b682d4a36885b
 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
2d27f1c538 Merge "Use feature instead of hidden config for multi-display" into oc-dev 
am: 72790bade5

Change-Id: I557c1b47e960ff2b7715dc71827ac200a21952db
 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
1dccc5841d Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev 
am: e79081aeaa

Change-Id: Ia96dc51f195e6bb42fb64acca3b33225eff01cfc
 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
49b37310ab Merge "Autofill Partitioning: support multiple SaveInfos." into oc-dev 
am: 5c8d88e855

Change-Id: Ia363ebbbf73514936776b7b0a9ca7ba0f65bf1bc
 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
2c51d55fcc Merge "MediaPlayer: hide BufferingParams API" into oc-dev 
am: 4c2a62edb6

Change-Id: Ib1b36bf7efe6aea88fa3f370e6e20d897c98b734
 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
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

Change-Id: I258ae87aeb739f3df1d1aef00fb055861c757111
 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
6fd0d2b37f Merge "remove deprecated API sendDialerCode" into oc-dev 
am: 31fcda576f

Change-Id: Ia1ca68529e16deaa990d07b651592a9a80806531
 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
a89137545b Merge "Change requestWait API according to request" into oc-dev 
am: ca687ac39a

Change-Id: I19a3ca83efc1934448e1044b9be74087f89dd030
 2017-04-07 13:27:33 +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
d45000c1a9 resolve merge conflicts of 3c002e45dda1 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
49b607a61e Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev 
am: c56d782e13

Change-Id: I14d241e63ead50651ca21aa1d28bce3ba019b5fc
 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
0b1023a263 Merge "Added onMovedToDisplay method to WebView" into oc-dev 
am: be41b61216

Change-Id: Ib119a90509998347b6ad26862ddfdb2d5299fb42
 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
2b45152532 Merge "Add intent to intialize programs on APP installed" into oc-dev 
am: 9c1e85384e

Change-Id: I806f2287b78670d3bcb8eef05c37e4581ad68985
 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
Felipe Leme
3e91021212 Merge "Removed deprecated onFillRequest() method" into oc-dev 
am: 7a7c0ace82

Change-Id: I538be771db63f10a6383495147c32848fabe55cd
 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

Change-Id: I10652933266e3eb976244de9e7b1ddeab4fe7c87
 2017-04-06 21:39:20 +00:00
TreeHugger Robot
b2bb3bf268 Merge "Rename getIntent() to getRenderIntent()" into oc-dev 2017-04-06 21:34:17 +00:00
Kang Li
461959d71f Merge "Add a service to rank apps for ResolverActivity." into oc-dev 
am: 5a0ee44ce5

Change-Id: I36f8664480f8741dd4d755cfcc3cfa95d8e3d1ba
 2017-04-06 20:37:09 +00:00
Chad Brubaker
df9bd4f7b3 Add UPDATE_TZDATA to config updater intents 
Change-Id: I5fcd011e0ab030ebf1aa40818a05853117cc6811
Fixes: 36977046
Test: checkbuild
 2017-04-06 13:35:23 -07:00
TreeHugger Robot
5a0ee44ce5 Merge "Add a service to rank apps for ResolverActivity." into oc-dev 2017-04-06 20:25:47 +00:00
Chad Brubaker
878331631e Merge "Expose ConfigUpdater Intents in SystemApi" into oc-dev 
am: 6de4ea56f7

Change-Id: Ibdf483d6b40ac30f78e3e6e4a024c7da2354831d
 2017-04-06 20:09:06 +00:00
TreeHugger Robot
6de4ea56f7 Merge "Expose ConfigUpdater Intents in SystemApi" into oc-dev 2017-04-06 19:40:25 +00:00
Romain Guy
1cf7b4fcb3 Rename getIntent() to getRenderIntent() 
Bug: 37077433
Test: compile and ColorSpaceTests
Change-Id: I8eb1fa6136582eaac1d509ebfef7f67b0fffe1aa
 2017-04-06 12:37:03 -07:00
Philip P. Moltmann
7e01895e69 Return inet addr for discoverable printers 
... by extending the RecommendationInfo to store the inet addresses not
just the count. Thankfully the recommendation plugins already contained
all the printers, not only the count.

Also expose the print service state as system APIs as they will be used
by the default print service.

Bug: 35765644
Test: Ran AddPrinterActivity on network that had printers to discover
Change-Id: I929a177adb75f6848848ba30a472cf0343d2e67e
 2017-04-06 11:54:53 -07:00
Kang Li
38a6da6473 Add a service to rank apps for ResolverActivity. 
bug: 36952725,30982298

Test: used PTP before and after this fix.

Change-Id: I5b249af2dd0d9fe32d1e524e8d2675c863e92b5b
 2017-04-06 18:08:14 +00:00
Rob Carr
1f3a56ef7e Merge "WindowManager.LayoutParams: Expose privateFlags for CTS" into oc-dev 
am: 0b504559ee

Change-Id: I784b58f59acf7ed91e37d70e57c076734814aa9e
 2017-04-06 18:07:50 +00:00
Rob Carr
0b504559ee Merge "WindowManager.LayoutParams: Expose privateFlags for CTS" into oc-dev 2017-04-06 18:00:55 +00:00
Chad Brubaker
19f98d9707 Expose ConfigUpdater Intents in SystemApi 
The Intents are are in the android namespace and should have been
exposed as SystemApi, but were not previously.

Since there are no classes in the framework that reference these Intents
this adds android.os.ConfigUpdate to have them all in one place.

Test: builds
Change-Id: I2086945301f06b28b491ec876652c37e97315e8c
Fixes: 35252508
Fixes: 35266806
Fixes: 35266833
Fixes: 35271111
(cherry picked from commit 987b0fc4a57c8b8246b12069a5db06693bc3eea6)
 2017-04-06 17:18:13 +00:00
Wei Jia
f3d93a0f69 MediaPlayer: hide BufferingParams API 
Test: compiles
Bug: 36280094
Change-Id: I52f3e71fb0e090ac48711bbb8ea7cbdf8db00074
 2017-04-06 10:09:05 -07:00
Chad Brubaker
57a9464831 Merge "Allow permissions to be runtime-only." into oc-dev 
am: 941e9e2b38

Change-Id: I2b1b3a53e6609cc335b4efa9084e603986f58bbe
 2017-04-06 16:54:50 +00:00
Chad Brubaker
941e9e2b38 Merge "Allow permissions to be runtime-only." into oc-dev 2017-04-06 16:44:11 +00:00