Adam Lesinski
085abab5ba
Merge changes I7d2b7e50,I784406a6 into oc-dev
...
am: 76831f7e39
2017-04-24 23:31:26 +00:00
TreeHugger Robot
76831f7e39
Merge changes I7d2b7e50,I784406a6 into oc-dev
...
* changes:
AAPT2: Allow truncating of package names
AAPT2: Make BinaryResourceParser more lenient
2017-04-24 23:26:06 +00:00
Felipe Leme
8ecd9c47f7
Merge "Minor fixes on Autofill Framework:" into oc-dev
...
am: 0fe852080e
2017-04-24 23:20:34 +00:00
Felipe Leme
0fe852080e
Merge "Minor fixes on Autofill Framework:" into oc-dev
2017-04-24 23:10:52 +00:00
Etan Cohen
1945f3ad2e
Merge "[AWARE] Remove match style API" into oc-dev
...
am: 2be0a532bf
2017-04-24 23:07:42 +00:00
Felipe Leme
85d1c2d290
Minor fixes on Autofill Framework:
...
- Removed default implementation of onProvideAutofillVirtualStructure() that
was using accessibility API (it's useless because without the View calling
AutofillManager.notifyViewEntered(), it would never be triggered).
- Fixed obsolete TODOs.
- Removed obsolete service class name constant.
- Removed unused debug constant.
Fixes: 37078783
Fixes: 33197203
Bug: 33802548
Bug: 35956626
Test: CtsAutoFillServiceTestCases pass
Merged-In: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
Change-Id: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
2017-04-24 16:01:12 -07:00
Etan Cohen
2be0a532bf
Merge "[AWARE] Remove match style API" into oc-dev
2017-04-24 22:59:26 +00:00
Ruben Brunk
80e2f403d2
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
...
am: d8f13bbc3d
2017-04-24 22:53:53 +00:00
Ruben Brunk
d8f13bbc3d
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
2017-04-24 22:49:10 +00:00
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
Jeff Sharkey
8ec71a639b
Merge "Bunch of new API lint rules." into oc-dev
...
am: 57b999605c
2017-04-24 22:25:17 +00:00
Jeff Sharkey
57b999605c
Merge "Bunch of new API lint rules." into oc-dev
2017-04-24 22:18:56 +00:00
Wale Ogunwale
f8b513e652
Merge "Fixed transition animation from pipable activities" into oc-dev
...
am: 3fc176913a
2017-04-24 21:51:51 +00:00
TreeHugger Robot
3fc176913a
Merge "Fixed transition animation from pipable activities" into oc-dev
2017-04-24 21:46:33 +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
Julia Reynolds
521f6b46f2
Merge "Don't allow devs to create blocked channels" into oc-dev
...
am: 10e7275965
2017-04-24 21:27:39 +00:00
Julia Reynolds
b61659e291
Merge "Don't consider uri empty a valid sound" into oc-dev
...
am: db5f5c3a17
2017-04-24 21:25:55 +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
Julia Reynolds
10e7275965
Merge "Don't allow devs to create blocked channels" into oc-dev
2017-04-24 21:17:16 +00:00
Julia Reynolds
db5f5c3a17
Merge "Don't consider uri empty a valid sound" into oc-dev
2017-04-24 21:17:02 +00:00
Santos Cordon
291b09ec4b
Merge "Clean up ImageReader when VrMode is disabled." into oc-dev
...
am: 5d1c65971f
2017-04-24 21:10:09 +00:00
TreeHugger Robot
5d1c65971f
Merge "Clean up ImageReader when VrMode is disabled." into oc-dev
2017-04-24 21:01:07 +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
Eugene Susla
6417845d9f
Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev
...
am: e4964118c6
2017-04-24 20:42:10 +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
Robert Carr
657dcd0202
Merge "Prevent leak of AppWindowTokens." into oc-dev
...
am: 53845068f4
2017-04-24 20:34:18 +00:00
TreeHugger Robot
e4964118c6
Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev
2017-04-24 20:31:06 +00:00
TreeHugger Robot
6c0f8dc0b0
Merge "Add link to class with constants" into oc-dev
2017-04-24 20:29:00 +00:00
TreeHugger Robot
53845068f4
Merge "Prevent leak of AppWindowTokens." into oc-dev
2017-04-24 20:24:20 +00:00
Pankaj Kanwar
0d5c062d97
Merge "Provide an API to make USSD calls and read the responses." am: f02b7b7ba6 am: 4ef0e826c4
...
am: b12a7c8058
2017-04-24 20:16:43 +00:00
Pankaj Kanwar
b12a7c8058
Merge "Provide an API to make USSD calls and read the responses." am: f02b7b7ba6
...
am: 4ef0e826c4
2017-04-24 20:09:56 +00:00
Pankaj Kanwar
4ef0e826c4
Merge "Provide an API to make USSD calls and read the responses."
...
am: f02b7b7ba6
2017-04-24 20:04:05 +00:00
Pankaj Kanwar
f02b7b7ba6
Merge "Provide an API to make USSD calls and read the responses."
2017-04-24 19:52:33 +00:00
Amith Yamasani
3a3fdfa53b
Merge "Check bluetooth app id instead of uid" into oc-dev
...
am: 094996a2b3
2017-04-24 19:35:08 +00:00
Glen Kuhne
19bdb91fb7
Merge "Wifi Metrics STA event list" into oc-dev
...
am: 9870d0bef7
2017-04-24 19:33:02 +00:00
Pankaj Kanwar
5e4296bad9
Merge "Update USSD API docs per API review comments." into oc-dev
...
am: c2d54af521
2017-04-24 19:30:58 +00:00
Yang Ni
c6606b843a
Merge "Validates Intrinsic Blur only takes 2D Allocations" into oc-dev
...
am: 4d23f258d4
2017-04-24 19:28:55 +00:00
Brad Ebinger
0109e15888
Merge "Whitelist PHONE_STATE to wakeup apps" into oc-dev
...
am: 41bf42a1c7
2017-04-24 19:26:56 +00:00
Geoffrey Pitsch
7561c3fb53
Merge "Hide secondary text for Default channel if not blocked" into oc-dev
...
am: 9226516cef
2017-04-24 19:23:30 +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
