Chien-Yu Chen
2fd83ae977
Merge "camera: Update for enableZsl values in template" into oc-dev
...
am: 06d84c3a86
2017-04-24 22:41:49 +00:00
TreeHugger Robot
06d84c3a86
Merge "camera: Update for enableZsl values in template" into oc-dev
2017-04-24 22:36:54 +00:00
Karthik Ravi Shankar
875c8445a8
Merge changes from topic 'virtual-display-api' into oc-dev
...
am: 13ba34bf37
2017-04-24 21:39:45 +00:00
Jeff Sharkey
9652eef0b2
Merge "Even more auto-doc work." into oc-dev
...
am: 880f4f4cc2
2017-04-24 21:38:03 +00:00
TreeHugger Robot
13ba34bf37
Merge changes from topic 'virtual-display-api' into oc-dev
...
* changes:
Add command line option to set compatibility display properties
Make VR mode virtual display properties customizable
2017-04-24 21:33:59 +00:00
TreeHugger Robot
880f4f4cc2
Merge "Even more auto-doc work." into oc-dev
2017-04-24 21:33:18 +00:00
Kang Li
1a297e53dc
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
...
am: 925d3cf211
2017-04-24 21:31:25 +00:00
Kang Li
925d3cf211
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
2017-04-24 21:21:42 +00:00
Felipe Leme
bf4451aa0e
Merge "Replaced getUrl() by getWebDomain()." into oc-dev
...
am: ffef2ad2b0
2017-04-24 20:56:16 +00:00
TreeHugger Robot
ffef2ad2b0
Merge "Replaced getUrl() by getWebDomain()." into oc-dev
2017-04-24 20:45:58 +00:00
Amith Yamasani
515239fa6f
Merge "Add link to class with constants" into oc-dev
...
am: 6c0f8dc0b0
2017-04-24 20:36:12 +00:00
Jeff Sharkey
30e06bb668
Even more auto-doc work.
...
Update docs based on what new lint detector found. Add new @IntDef
to parameters or methods returning constants or flags, and add
@RequiresPermission to methods mentioning permissions.
Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I7f640f7883fcb66b911a52ae93b83f77306571ec
2017-04-24 13:20:46 -06:00
Android Build Merger (Role)
28a9a1a61e
Merge "Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b14 am: 2fb02a252c am: 526719a1a2" into oc-dev-plus-aosp
2017-04-24 19:17:37 +00:00
Android Build Merger (Role)
97cb726b08
Merge "Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev am: 8a4ff5edb5" into oc-dev-plus-aosp
2017-04-24 19:17:05 +00:00
Jakub Pawlowski
c4434b341a
Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b14 am: 2fb02a252c
...
am: 526719a1a2
2017-04-24 19:16:52 +00:00
George Mount
59a64bd58a
Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev
...
am: 8a4ff5edb5
2017-04-24 19:15:45 +00:00
Jakub Pawlowski
526719a1a2
Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b14
...
am: 2fb02a252c
2017-04-24 19:11:07 +00:00
Android Build Merger (Role)
af6b454b14
Merge "Merge "fix service binding" into oc-dev am: 4eaeb91e42" into oc-dev-plus-aosp
2017-04-24 19:10:59 +00:00
Todd Kennedy
4bb06f9d1f
Merge "fix service binding" into oc-dev
...
am: 4eaeb91e42
2017-04-24 19:10:16 +00:00
Android Build Merger (Role)
3855f370d9
Merge "Merge "Remove @TestApi annotation" into oc-dev am: 1ab9119f50" into oc-dev-plus-aosp
2017-04-24 19:09:55 +00:00
Todd Kennedy
9e76c4e9db
Merge "Remove @TestApi annotation" into oc-dev
...
am: 1ab9119f50
2017-04-24 19:09:08 +00:00
Android Build Merger (Role)
584f97470c
Merge "Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e am: 23d41ee68e am: 876ebaa8e1" into oc-dev-plus-aosp
2017-04-24 19:07:14 +00:00
Hugo Benichi
575523f2e7
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e am: 23d41ee68e
...
am: 876ebaa8e1
2017-04-24 19:06:20 +00:00
Android Build Merger (Role)
51848baf1b
Merge "Undeprecate WebView.findAddress am: 3f3354e087" into oc-dev-plus-aosp
2017-04-24 19:06:18 +00:00
Abodunrinwa Toki
52cf9e95ef
Undeprecate WebView.findAddress
...
am: 3f3354e087
2017-04-24 19:05:20 +00:00
Android Build Merger (Role)
9f17850a67
Merge changes from topic 'am-bbd64631c3584513a9a39c2ec7139a27' into oc-dev-plus-aosp
...
* changes:
Merge changes from topic 'langdet' into oc-dev am: e70ce27c448557802248
2017-04-24 19:03:16 +00:00
Abodunrinwa Toki
1f34114a61
Merge changes from topic 'langdet' into oc-dev
...
am: e70ce27c44
2017-04-24 19:01:28 +00:00
Abodunrinwa Toki
dc3a44ec33
Hide TextClassificationManager.detectLanguages API
...
am: 8557802248
2017-04-24 19:00:29 +00:00
Hugo Benichi
876ebaa8e1
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e
...
am: 23d41ee68e
2017-04-24 18:54:23 +00:00
Android Build Merger (Role)
7a98adc8fb
Merge "Merge "Remove unused network management RPCs" am: 53a122986d am: 10ebc1879b am: 8b90758b25" into oc-dev-plus-aosp
2017-04-24 18:50:43 +00:00
Robin Lee
40681387a9
Merge "Remove unused network management RPCs" am: 53a122986d am: 10ebc1879b
...
am: 8b90758b25
2017-04-24 18:46:18 +00:00
Nicolas Geoffray
a98414fe89
Drop REASON_FORCED_DEXOPT.
...
am: 9cea1d28dd
2017-04-24 18:45:55 +00:00
Robin Lee
8b90758b25
Merge "Remove unused network management RPCs" am: 53a122986d
...
am: 10ebc1879b
2017-04-24 18:39:55 +00:00
Jeff Sharkey
f25b285706
Merge "More auto-doc work." into oc-dev
...
am: 6bc03748a7
2017-04-24 18:23:35 +00:00
Amith Yamasani
ad8f086912
Add link to class with constants
...
Addresses api-council feedback
Change-Id: I2dcd526a266a2320b34c714fd91fb4a83d382d9c
Fixes: 37536012
Test: make update-api
2017-04-24 11:01:20 -07:00
Felipe Leme
4711ed9f9f
Replaced getUrl() by getWebDomain().
...
Bug: 37566507
Test: CtsAssistTestCases pass
Change-Id: I1b4dfa7259040b3b8bf1014ebb806eb7a3b36c58
2017-04-24 09:43:08 -07:00
TreeHugger Robot
8a4ff5edb5
Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev
2017-04-24 16:14:17 +00:00
Jakub Pawlowski
89e10d3eb4
Get rid of the IAdvertiserCallabck
...
Bug: 30622771
Test: none
Change-Id: I2c55f96e71cd3be67f88201ab07c91730cd85971
2017-04-24 15:42:57 +00:00
TreeHugger Robot
4eaeb91e42
Merge "fix service binding" into oc-dev
2017-04-24 15:37:51 +00:00
TreeHugger Robot
1ab9119f50
Merge "Remove @TestApi annotation" into oc-dev
2017-04-24 15:35:51 +00:00
Abodunrinwa Toki
3f3354e087
Undeprecate WebView.findAddress
...
Reverts I772961bd20bff4817a060f14a843abeceb55ac92
Until we bring back TextClassifier.getLinks
See I275a9d055ef0ab68f3ca339c37ee939257c4bd54
Test: none
Bug: 22362008
Bug: 37565246
Change-Id: I2948f22cf4c3462491f47376af48624697703969
2017-04-24 14:41:14 +00:00
Abodunrinwa Toki
e70ce27c44
Merge changes from topic 'langdet' into oc-dev
...
* changes:
Hide TextClassifier.getLinks API.
Hide TextClassificationManager.detectLanguages API
2017-04-24 14:39:51 +00:00
Nicolas Geoffray
9cea1d28dd
Drop REASON_FORCED_DEXOPT.
...
This can already be configured with the default compiler filter.
Also remove unused performDexOptIfNeeded.
bug:35794392
Test: device boots, forced dexopt works.
Change-Id: I14fc86c4783b2d7ac9cf8972b6619ba303e79659
(cherry picked from commit e103256c1f
2017-04-24 10:44:31 +00:00
Hugo Benichi
10b5024d5e
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)"
2017-04-23 23:35:53 +00:00
Robin Lee
53a122986d
Merge "Remove unused network management RPCs"
2017-04-22 21:59:57 +00:00
Jeff Sharkey
6bc03748a7
Merge "More auto-doc work." into oc-dev
2017-04-22 19:11:34 +00:00
Felipe Leme
4778d6d5d8
Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev
...
am: 7bb113566f
2017-04-22 04:28:33 +00:00
TreeHugger Robot
7bb113566f
Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev
2017-04-22 04:20:42 +00:00
Sudheer Shanka
ba16a5b5e9
Merge "Fix a spelling." into oc-dev
...
am: 1939550fba
2017-04-22 02:38:57 +00:00
TreeHugger Robot
1939550fba
Merge "Fix a spelling." into oc-dev
2017-04-22 02:32:39 +00:00
