Commit Graph

17947 Commits

Author SHA1 Message Date
Tyler Gunn
a4a789802a Merge "Track conference start in system elapsed time." am: 3b166fba8a am: 49042dc67c
am: 55967b462c

Change-Id: I5a7561dd09405bcdc38926bd331f5ffd8019ec2f
2017-08-24 23:20:14 +00:00
Tyler Gunn
49042dc67c Merge "Track conference start in system elapsed time."
am: 3b166fba8a

Change-Id: I8b78aaa447adcc1bfce0fec8f50857daa37d0575
2017-08-24 22:58:02 +00:00
Tyler Gunn
3b166fba8a Merge "Track conference start in system elapsed time." 2017-08-24 22:24:16 +00:00
Shuo Qian
a43b382766 Merge "Add new error code in SmsManager" into oc-mr1-dev
am: 1dafcc89a5

Change-Id: I938ddabfe0d98ee1eee850ba9d6aeb857ebb748f
2017-08-24 21:44:54 +00:00
Shuo Qian
1dafcc89a5 Merge "Add new error code in SmsManager" into oc-mr1-dev 2017-08-24 21:22:31 +00:00
Yohei Yukawa
b737076a4e Merge "New haptic feedback constants" into oc-mr1-dev
am: f3b78305ff

Change-Id: I7e3009b6e54a8f443214b68d4f64470475a4acd5
2017-08-24 21:14:36 +00:00
Yohei Yukawa
262dadf870 New haptic feedback constants
This CL introduces several haptic feedback constants that are ready
to be exposed to developers.

Test: checkbuild
Fixes: 64537070
Change-Id: If54d5bc6cab4e2c405615b7a40648c74a1097ea3
2017-08-24 10:51:00 -07:00
Hall Liu
c04df54cfc Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786 am: 7754e25694
am: a7bb0ffc7d

Change-Id: Iab7c397dba3fb446e0c03cd1bab0e82de8172577
2017-08-23 17:16:04 +00:00
Hall Liu
a7bb0ffc7d Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786
am: 7754e25694

Change-Id: I2724aab757b94957dd9174e4b86c48952a59ebdc
2017-08-23 17:05:57 +00:00
Hall Liu
7754e25694 Merge "Embms API adjustments for 7/21" am: 489dcb7cca
am: 488d3bf786

Change-Id: I03ca7bd2734b5410c37b23ba2e8d33d722ad7ebf
2017-08-23 16:56:26 +00:00
Hall Liu
d5c955fcdc Embms API adjustments for 7/21
* Enforce that only one instance of each manager can be active.
* Add a death receipient for both managers to notify the app of binder
death
* Add documentation informing the app that it may not call create()
multiple times
* Fix a collision in streaming state reason codes
* Add documentation in DownloadRequest to indicate which methods should
be called by the middleware.

Change-Id: Ie15283b5c34fee736e8023dbd4f889c2ca95299e
2017-08-22 17:07:48 -07:00
Nate Fischer
0cd12a83c6 Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev
am: b2456e6194

Change-Id: I3066dd0edd6c125b2e7fdab7fc07624f4c8688a5
2017-08-22 23:01:12 +00:00
Nate Fischer
b2456e6194 Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev 2017-08-22 22:40:39 +00:00
sqian
724f621daa Add new error code in SmsManager
Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing

Test: compile/flash code; test locally
Bug: 34773406
Change-Id: I0b227e76048dd46d9c8023d37647db763e1e38e1
2017-08-22 14:51:03 -07:00
Tyler Gunn
3fa819c2f3 Track conference start in system elapsed time.
This is important so that Telecom can track the duration of the call,
which is tracked using wall clock time.

Test: Manual, unit test
Bug: 64068300
Change-Id: If642d282cd8134060acf6ffe8d81215c394d800c
2017-08-22 13:39:31 -07:00
Hall Liu
a0936c7b89 Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0 am: 0d73e03444
am: 23566e82dd

Change-Id: I5308524da670b829ef8da474bfaee5d60caa6d86
2017-08-22 19:07:06 +00:00
Hall Liu
23566e82dd Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0
am: 0d73e03444

Change-Id: I5c5a8b6247ef844f86880cf4b162527d699e2fc9
2017-08-22 18:53:34 +00:00
Hall Liu
0d73e03444 Merge "Fix lint errors in the streaming API" am: fa7e99ddf1
am: ac9893bba0

Change-Id: I0ae2ee130deb1d84cc9e343e9764f65ba46d3fd1
2017-08-22 18:44:53 +00:00
Hall Liu
fa7e99ddf1 Merge "Fix lint errors in the streaming API" 2017-08-22 17:55:06 +00:00
Nate Fischer
2b108d8609 WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing
This renames the method as follows:

 * initSafeBrowsing -> startSafeBrowsing

This also updates documentation to fix javadoc references, and to
clarify that Safe Browsing checks are not guaranteed until after
startSafeBrowsing() invokes its callback.

This does not change the method name in WebViewFactoryProvider, because
changing this would break CTS tests (since the WebView APK implements
this under the old name).

This also removes shutdownSafeBrowsing, because we found there was no
good use for this (it's meaningless for AOSP, and we were recommended to
avoid calling the underlying GMSCore API for GoogleWebView). More
significantly, there's no good place for an application to call it from.

Bug: 64331900
Test: make update-api (docs are correct)
Change-Id: Idf2b9390306052f5c5dfb92909fca4cfeec74aef
2017-08-21 18:04:28 -07:00
Hall Liu
ee19cfc386 Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.

Bug: 30981736
Test: manual, with testapps
Change-Id: If4a9a5533a235a8cc56762ab7a9e32ec89440f1d
2017-08-18 14:36:06 -07:00
Casey Burkhardt
58770c5759 Merge "Make isAccessibilityButtonSupported public" into oc-mr1-dev
am: 8e74686fb4

Change-Id: I1db829cce2962e526892ae486ff9567003051a8b
2017-08-18 00:33:16 +00:00
Casey Burkhardt
8e74686fb4 Merge "Make isAccessibilityButtonSupported public" into oc-mr1-dev 2017-08-17 23:50:43 +00:00
Hall Liu
31efc0e30a Merge "Do not throw IOException from RttCall.read()" into oc-mr1-dev
am: d33be52592

Change-Id: I9fe75eee8b3aaf8d96de20dfffbff2a0ad7e6508
2017-08-17 16:27:04 +00:00
Hall Liu
d33be52592 Merge "Do not throw IOException from RttCall.read()" into oc-mr1-dev 2017-08-17 16:17:53 +00:00
Daniel Sandler
bb143bafe2 Merge changes from topic "revert-injectors" into oc-mr1-dev
am: d33fe05c66

Change-Id: I7e66180252232f22e23e68b8aec7eedbd2bed82b
2017-08-17 14:37:54 +00:00
Daniel Sandler
d33fe05c66 Merge changes from topic "revert-injectors" into oc-mr1-dev
* changes:
  Revert "Add API to allow apps more control over instantiation"
  Revert "Add plugin to swap out recents"
2017-08-17 14:32:40 +00:00
Casey Burkhardt
02f3b807db Make isAccessibilityButtonSupported public
Bug: 62342696
Test: Builds
Change-Id: I02082f2db349181473b2a7fd367fc8892d495fc1
2017-08-17 02:50:45 -07:00
Charles He
337ee0771e Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev
am: 8b2513e439

Change-Id: Ie511c6f1034b75b4e797dbc0ca31c7c5c30f336e
2017-08-17 08:01:53 +00:00
Charles He
8b2513e439 Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev 2017-08-17 07:54:05 +00:00
Jeff Davidson
c4d573345c Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev
am: f2a70fc116

Change-Id: Ib50f88db345783ac735885880daec890efd31b76
2017-08-17 03:02:42 +00:00
Hall Liu
faeb18da84 Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41 am: c7ac478f51
am: e2f5f4b110

Change-Id: I00442fe091dab72bb114ac77c20845de0050cb0f
2017-08-17 02:01:40 +00:00
Hall Liu
e2f5f4b110 Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41
am: c7ac478f51

Change-Id: I55f9d7e583950a5a67de8775b6c0f1640430aac8
2017-08-17 01:53:47 +00:00
Hall Liu
c7ac478f51 Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37
am: cb63a47d41

Change-Id: I16e4b79d7fd40bf5d0e500e0cb3ba9bf33113fc8
2017-08-17 01:40:58 +00:00
Hall Liu
cb63a47d41 Merge "Revert "Fix lint errors in the streaming API""
am: 42d3eadb37

Change-Id: I4229c1eb42edba2c2c7df08f87bfded5402c01c7
2017-08-17 01:30:56 +00:00
Hall Liu
42d3eadb37 Merge "Revert "Fix lint errors in the streaming API"" 2017-08-17 01:22:19 +00:00
Hall Liu
591fea2504 Revert "Fix lint errors in the streaming API"
This reverts commit e1f10cbd7f.

Change-Id: Id3666b27b0d07b0a1d4f3179f2073aa75440f2ee
2017-08-17 00:46:24 +00:00
Hall Liu
ed85bf291a Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398 am: 34639cbbab
am: e168449b32

Change-Id: Idc7b2897dc4a1bda38455d6fade54153770d176f
2017-08-16 23:59:45 +00:00
Hall Liu
e168449b32 Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398
am: 34639cbbab

Change-Id: I82cb1673fc8a066d5101bde8ae26d97ce781e253
2017-08-16 23:40:02 +00:00
Lucas Dupin
fda1152e59 Merge "API Council feedback" into oc-mr1-dev
am: 07c83d00c9

Change-Id: I115e1145b47d97b29a988133d9ec94ebe6e39637
2017-08-16 23:38:38 +00:00
Jeff Davidson
0ac6e0e22c Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public.
There is a reasonable use case for carrier apps to turn off this key
(b/64544341) so it should be visible to apps in the SDK.

Change-Id: I1a06196d4d4c7d6d06026ef74f3f1159c973f8e3
Test: TreeHugger
Fixes: 64721199
2017-08-16 23:30:36 +00:00
Hall Liu
34639cbbab Merge "Fix lint errors in the streaming API" am: b0f5d57489
am: 90b923f398

Change-Id: Ic6bd1488a735f2535e4a34fd2df4dc154a777639
2017-08-16 23:29:08 +00:00
Romain Guy
7d513b6538 Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev
am: ee3602595a

Change-Id: Iee7c4a40a545eefeeac0729a825e208fb03eb1b0
2017-08-16 23:24:55 +00:00
Hall Liu
90b923f398 Merge "Fix lint errors in the streaming API"
am: b0f5d57489

Change-Id: Ic12810c6a3c795419ff7440218ffa23bad7d8401
2017-08-16 23:16:30 +00:00
TreeHugger Robot
07c83d00c9 Merge "API Council feedback" into oc-mr1-dev 2017-08-16 22:55:52 +00:00
Hall Liu
b0f5d57489 Merge "Fix lint errors in the streaming API" 2017-08-16 22:51:13 +00:00
Hall Liu
e1f10cbd7f Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.

Bug: 30981736
Test: manual, with testapps
Change-Id: I94e1bcccea4b9f50dae4c93f247ab78058d15bb5
2017-08-16 11:33:40 -07:00
Romain Guy
010f082490 Hide shared buffer mode/auto refresh on Surface
Bug: 63858546
Test: Compile & boot

Change-Id: I34372593d4b47b143e65d30f669f883c69653f62
2017-08-16 10:02:10 -07:00
Christopher Tate
2402e4b385 Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev
am: 4b7b5a6c59

Change-Id: I6d8bb5b15b7c9b13edbb6d8b4e3a69af1d9ca17f
2017-08-15 23:50:11 +00:00
TreeHugger Robot
4b7b5a6c59 Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev 2017-08-15 23:38:40 +00:00