OSDN Git Service
Philip P. Moltmann [Wed, 26 Apr 2017 14:22:48 +0000 (14:22 +0000)]
Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
am:
dd91a5636b
Change-Id: I1b75b8e8ef125620817a1baaea0431b041871bae
Philip P. Moltmann [Wed, 26 Apr 2017 14:16:46 +0000 (14:16 +0000)]
Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
* changes:
Return all previous FillContexts onFill
Report multiple FillContext-s onSave
Wale Ogunwale [Wed, 26 Apr 2017 12:39:11 +0000 (12:39 +0000)]
Merge "Reduce use of static variables in window manager unit tests" into oc-dev
am:
0f8764485b
Change-Id: Ia10f8954ec3524cd76f0327f8edc0bb04f90915d
Wale Ogunwale [Wed, 26 Apr 2017 12:35:08 +0000 (12:35 +0000)]
Merge "Reduce use of static variables in window manager unit tests" into oc-dev
Narayan Kamath [Wed, 26 Apr 2017 12:24:13 +0000 (12:24 +0000)]
Merge "Improvements to ActivityManagerService stack dumping" am:
2529f65e87 am:
9e9270ee3d
am:
30ad6b8cee -s ours
Change-Id: Ic2ba253aabaa9f39f9825d9ab6c69d98b7ace5dc
Narayan Kamath [Wed, 26 Apr 2017 12:18:05 +0000 (12:18 +0000)]
Merge "Improvements to ActivityManagerService stack dumping" am:
2529f65e87
am:
9e9270ee3d
Change-Id: I273b307256c3bf6d2255a7c092c4985c90d26942
Narayan Kamath [Wed, 26 Apr 2017 12:12:29 +0000 (12:12 +0000)]
Merge "Improvements to ActivityManagerService stack dumping"
am:
2529f65e87
Change-Id: Iabbf138719296a882aa98261fb2c4da8bbf027cc
Narayan Kamath [Wed, 26 Apr 2017 12:01:15 +0000 (12:01 +0000)]
Merge "Improvements to ActivityManagerService stack dumping"
Michal Karpinski [Wed, 26 Apr 2017 10:15:16 +0000 (10:15 +0000)]
Merge "Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread" into oc-dev
am:
c38e2af0d1
Change-Id: I60cc10f8c1e734c5c701cf461ed1f18c3c1d10fa
Jakub Pawlowski [Wed, 26 Apr 2017 10:13:19 +0000 (10:13 +0000)]
Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev
am:
5df218c5c4 -s ours
Change-Id: Ie541540172e4e34869d37ae7f4824d055a363ef1
Michal Karpinski [Wed, 26 Apr 2017 09:44:49 +0000 (09:44 +0000)]
Merge "Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread" into oc-dev
Jakub Pawlowski [Wed, 26 Apr 2017 08:16:48 +0000 (08:16 +0000)]
Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev
* changes:
Bluetooth: expand comments on new PHY constants
Bluetooth: document status value in PHY read/update
Bluetooth: Add handler parameter to connectGatt
Get rid of the IAdvertiserCallabck
Joe Fernandez [Wed, 26 Apr 2017 05:09:28 +0000 (05:09 +0000)]
Merge "docs: Update ListView JavaDoc comments" into oc-dev
am:
bc6c82c20d
Change-Id: Iffe54d8fffee067e08d8da194fb8d3e984d46708
Joe Fernandez [Wed, 26 Apr 2017 05:06:58 +0000 (05:06 +0000)]
Merge "docs: Update ArrayAdapter JavaDoc comments" into oc-dev
am:
0de19fcf6a
Change-Id: Ic2caf678a0231344b5e26f7641b2570394ad857a
Joe Fernandez [Wed, 26 Apr 2017 04:56:06 +0000 (04:56 +0000)]
Merge "docs: Update ListView JavaDoc comments" into oc-dev
Joe Fernandez [Wed, 26 Apr 2017 04:55:33 +0000 (04:55 +0000)]
Merge "docs: Update ArrayAdapter JavaDoc comments" into oc-dev
Wale Ogunwale [Wed, 26 Apr 2017 03:29:13 +0000 (20:29 -0700)]
Reduce use of static variables in window manager unit tests
This was causing test cross-contamination since different test might
expect different states from the variables.
Bug:
37682538
Test: tons of it!
Change-Id: Ie8a1ea400695b6346d7dfa3369b5c44bb467a33d
Felipe Leme [Wed, 26 Apr 2017 03:02:50 +0000 (03:02 +0000)]
Merge "Added missing importantForAutofill values on attributes." into oc-dev
am:
6fba10b037
Change-Id: Icfe6f41e86b8b47fad7737acb83c25eff912fd93
Felipe Leme [Wed, 26 Apr 2017 02:56:04 +0000 (02:56 +0000)]
Merge "Added missing importantForAutofill values on attributes." into oc-dev
Svetoslav Ganov [Wed, 26 Apr 2017 02:16:43 +0000 (02:16 +0000)]
Make sure autofill service is backed up
am:
d8561a26da
Change-Id: I6964ccdc64621e4aab330afc2c0faa836d35dced
Svetoslav Ganov [Tue, 25 Apr 2017 22:26:03 +0000 (15:26 -0700)]
Make sure autofill service is backed up
Test: manual
bug:
36638606
Change-Id: I3367b9eb40a542267fb5d49f9a8bb7aa97ca57fa
Dongwon Kang [Wed, 26 Apr 2017 00:35:39 +0000 (00:35 +0000)]
Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev
am:
a35e4e5584
Change-Id: I44b887de9aa6ef402ba0b6ee1092fd9274ba3fcb
TreeHugger Robot [Wed, 26 Apr 2017 00:27:53 +0000 (00:27 +0000)]
Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev
Android Build Merger (Role) [Tue, 25 Apr 2017 23:58:02 +0000 (23:58 +0000)]
Merge "Merge "Add concept of implicitly exposed components" into oc-dev am:
0a4b7f5a86" into oc-dev-plus-aosp
Todd Kennedy [Tue, 25 Apr 2017 23:55:55 +0000 (23:55 +0000)]
Merge "Add concept of implicitly exposed components" into oc-dev
am:
0a4b7f5a86
Change-Id: Ib56132241de893f7afb33c8f242f342326da1dd7
Android Build Merger (Role) [Tue, 25 Apr 2017 23:55:22 +0000 (23:55 +0000)]
Merge "Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev am:
e44e9e94da" into oc-dev-plus-aosp
Wale Ogunwale [Tue, 25 Apr 2017 23:53:36 +0000 (23:53 +0000)]
Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev
am:
e44e9e94da
Change-Id: Ief515a2fb39bf69f456486e9413d0beee5f89eb5
Pankaj Kanwar [Tue, 25 Apr 2017 23:51:52 +0000 (23:51 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible." am:
3a8ad81ab4 am:
a086824e5a
am:
6f048ffab5 -s ours
Change-Id: I422b06ab7d7db5669b5aa6ae42aaadaeb8c9bb62
TreeHugger Robot [Tue, 25 Apr 2017 23:50:17 +0000 (23:50 +0000)]
Merge "Add concept of implicitly exposed components" into oc-dev
Philip P. Moltmann [Tue, 25 Apr 2017 20:33:41 +0000 (13:33 -0700)]
Return all previous FillContexts onFill
Test: CtsAutoFillServiceTestCases
Fixes:
37673341
Change-Id: I80feb5bd8d6027fb4ec2dd32f5c486dae7c6bc4c
Wale Ogunwale [Tue, 25 Apr 2017 23:47:53 +0000 (23:47 +0000)]
Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev
Pankaj Kanwar [Tue, 25 Apr 2017 23:46:17 +0000 (23:46 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible." am:
3a8ad81ab4
am:
a086824e5a
Change-Id: I2a918e4d56cbb6147c95737d7f6b156903dc5ec5
Wale Ogunwale [Tue, 25 Apr 2017 23:43:53 +0000 (16:43 -0700)]
Remove @Presubmit annotation from SettingBackupTest
Can be added back once the tests are fixed.
Bug:
37684646
Bug:
37682538
Test: This is it!
Change-Id: I3690bf91bf371a7ab6a477312a138c205cceee1c
Pankaj Kanwar [Tue, 25 Apr 2017 23:40:54 +0000 (23:40 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
am:
3a8ad81ab4
Change-Id: I54d5ac5a02b4bb0e0bd9d3f3eb2428613c40c1ec
Chris Craik [Tue, 25 Apr 2017 23:39:39 +0000 (23:39 +0000)]
Merge "Fix include" into oc-dev
am:
7e44951bb7
Change-Id: I6e7ec68d95dc12fa3d87a0e366cf924a4dba32bc
TreeHugger Robot [Tue, 25 Apr 2017 23:32:07 +0000 (23:32 +0000)]
Merge "Fix include" into oc-dev
Pankaj Kanwar [Tue, 25 Apr 2017 23:30:51 +0000 (23:30 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
Peng Xu [Tue, 25 Apr 2017 23:29:14 +0000 (23:29 +0000)]
Merge "Return correct value at initDataInjection and avoid crash" into oc-dev
am:
1c5b71ec1f
Change-Id: I9f416adafc27287833ecd8ce5357c782f10c3e80
Chris Craik [Tue, 25 Apr 2017 23:26:58 +0000 (23:26 +0000)]
Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev
am:
db8f2fc025
Change-Id: I970274dae5ac4b9164040a63ed5f8dd6a8e93084
TreeHugger Robot [Tue, 25 Apr 2017 23:18:19 +0000 (23:18 +0000)]
Merge "Return correct value at initDataInjection and avoid crash" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 23:15:47 +0000 (23:15 +0000)]
Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev
Makoto Onuki [Tue, 25 Apr 2017 22:48:57 +0000 (22:48 +0000)]
Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev
am:
781c8cb65e
Change-Id: I8417adc402df33b30b310ea87a27e1669fb5dad6
Winson Chung [Tue, 25 Apr 2017 22:45:31 +0000 (22:45 +0000)]
Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev
am:
5b4e16c3a5
Change-Id: Ib9464540206d4c851529e0b0920ac8751c6401dd
TreeHugger Robot [Tue, 25 Apr 2017 22:42:02 +0000 (22:42 +0000)]
Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev
Hall Liu [Tue, 25 Apr 2017 22:40:15 +0000 (22:40 +0000)]
Merge "Add Error specifiers to the API." am:
4c4a55a67b am:
f729fccde9
am:
65030630fd
Change-Id: I9cf24d0ee8e8f94072fe2213ef17bb51240e1f8f
TreeHugger Robot [Tue, 25 Apr 2017 22:38:49 +0000 (22:38 +0000)]
Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev
Felipe Leme [Tue, 25 Apr 2017 22:26:46 +0000 (15:26 -0700)]
Added missing importantForAutofill values on attributes.
Fixes:
37677115
Test: manual verification compiling an app using it
Change-Id: Iaa2650c7354e8c1c476cb3803d40104ae6fc864a
Hall Liu [Tue, 25 Apr 2017 22:32:02 +0000 (22:32 +0000)]
Merge "Add Error specifiers to the API." am:
4c4a55a67b
am:
f729fccde9
Change-Id: I91d077af7f001853df99d4ae4ba7da611c1dea09
Eino-Ville Talvala [Tue, 25 Apr 2017 22:31:56 +0000 (22:31 +0000)]
Merge "Camera: Update docs for new auto-generation features" into oc-dev
am:
f879357cae
Change-Id: Idb95ad2b2b811dbe2fc765f5b190eed122ea9f05
Android Build Merger (Role) [Tue, 25 Apr 2017 22:28:06 +0000 (22:28 +0000)]
Merge "Merge "Add VisualVoicemailService" am:
8c6925a88f am:
ac78d9ae25 am:
6c65be4d3e -s ours" into oc-dev-plus-aosp
Chen Xu [Tue, 25 Apr 2017 22:25:51 +0000 (22:25 +0000)]
Merge "Add VisualVoicemailService" am:
8c6925a88f am:
ac78d9ae25
am:
6c65be4d3e -s ours
Change-Id: I54b1dc2a5d08607325d5c2b60ac1bec115070716
Jeff Sharkey [Tue, 25 Apr 2017 22:25:09 +0000 (22:25 +0000)]
Merge "Fix some issues found by new doclava linter." into oc-dev
am:
a00c7c0a99
Change-Id: I940b5ab896e4638e8178868acb65d79c078adbbe
Philip P. Moltmann [Tue, 25 Apr 2017 18:57:37 +0000 (11:57 -0700)]
Report multiple FillContext-s onSave
To make life easier the reponseId is not part of the FillResponse.
Test: CtsAutofillServiceTestCases (added test for multiple Contexts)
Change-Id: If09e00b7267d293e4234a7a9837ad88d73af1b24
Fixes:
36481649
Hall Liu [Tue, 25 Apr 2017 22:17:14 +0000 (22:17 +0000)]
Merge "Add Error specifiers to the API."
am:
4c4a55a67b
Change-Id: Ia720a230e0f7f7070ca7194dbcfce294a66a3574
TreeHugger Robot [Tue, 25 Apr 2017 22:11:43 +0000 (22:11 +0000)]
Merge "Camera: Update docs for new auto-generation features" into oc-dev
Jeff Sharkey [Tue, 25 Apr 2017 22:10:56 +0000 (22:10 +0000)]
Merge "Fix some issues found by new doclava linter." into oc-dev
Chen Xu [Tue, 25 Apr 2017 22:10:21 +0000 (22:10 +0000)]
Merge "Add VisualVoicemailService" am:
8c6925a88f
am:
ac78d9ae25
Change-Id: I541ad952ccab5a466e9d26c11478cc18fa69ddc0
Chen Xu [Tue, 25 Apr 2017 22:04:07 +0000 (22:04 +0000)]
Merge "Add VisualVoicemailService"
am:
8c6925a88f
Change-Id: I248baea501c4e1a47981e3aecfe476f89440f0af
Hall Liu [Tue, 25 Apr 2017 22:03:41 +0000 (22:03 +0000)]
Merge "Add Error specifiers to the API."
Chen Xu [Tue, 25 Apr 2017 21:54:51 +0000 (21:54 +0000)]
Merge "Add VisualVoicemailService"
Seigo Nonaka [Tue, 25 Apr 2017 21:48:20 +0000 (21:48 +0000)]
Merge "Font provider cleaning ups." into oc-dev
am:
5313eee98a
Change-Id: I5e6f0c61ca46a85e3ef19f8de3cb742b6a2ff91b
Seigo Nonaka [Tue, 25 Apr 2017 21:40:35 +0000 (21:40 +0000)]
Merge "Font provider cleaning ups." into oc-dev
Eugene Susla [Tue, 25 Apr 2017 21:37:40 +0000 (21:37 +0000)]
Merge "Remove underscore from Companion service name" into oc-dev
am:
885b5f4466
Change-Id: Id04a3668155fbf02b10d1965c2d2eccea5707754
Fan Zhang [Tue, 25 Apr 2017 21:29:54 +0000 (21:29 +0000)]
Merge "Add tests for iconSpaceReserved attribute in Preference" into oc-dev
am:
105f55ee8f
Change-Id: I6bce8383ae88bb5bba9a2425dc4357967d473647
Adrian Roos [Tue, 25 Apr 2017 21:27:41 +0000 (21:27 +0000)]
Merge "ImmersiveCling: Allow interacting with underlying view" into oc-dev
am:
afad82ba85
Change-Id: Id525991f0b51529055199cb3e5f77434a7a0c989
TreeHugger Robot [Tue, 25 Apr 2017 21:26:09 +0000 (21:26 +0000)]
Merge "Remove underscore from Companion service name" into oc-dev
Wale Ogunwale [Tue, 25 Apr 2017 21:16:00 +0000 (21:16 +0000)]
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev
am:
3ce611f1b4
Change-Id: I1dd4284b58c901d89ac82853712d17ffc0e86c0a
TreeHugger Robot [Tue, 25 Apr 2017 21:07:48 +0000 (21:07 +0000)]
Merge "Add tests for iconSpaceReserved attribute in Preference" into oc-dev
Adrian Roos [Tue, 25 Apr 2017 21:07:16 +0000 (21:07 +0000)]
Merge "ImmersiveCling: Allow interacting with underlying view" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 20:58:33 +0000 (20:58 +0000)]
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev
Jerry Zhang [Tue, 25 Apr 2017 20:57:33 +0000 (20:57 +0000)]
Merge "Reorder USB_STATE updates so config_changed is not replaced." into oc-dev
am:
27e5ec0bb7
Change-Id: Id7017f4432c8b3a6471e8d12a0afead4d31639fe
Rob Carr [Tue, 25 Apr 2017 20:55:27 +0000 (20:55 +0000)]
Merge "WindowManager: Take care with Surface lifetime during relayout to invisible." into oc-dev
am:
b8bb3f7137
Change-Id: Iceb64847b920939ac2ddfd49e3d7e8b35e5f6a4f
TreeHugger Robot [Tue, 25 Apr 2017 20:49:38 +0000 (20:49 +0000)]
Merge "Reorder USB_STATE updates so config_changed is not replaced." into oc-dev
Wale Ogunwale [Tue, 25 Apr 2017 20:47:59 +0000 (20:47 +0000)]
Merge "Fixed issue with turn-screen-on activities" into oc-dev
am:
26ba9f8833
Change-Id: I0194fb251723808346fb7684835a7c60081ae2ae
Christopher Tate [Tue, 25 Apr 2017 20:45:29 +0000 (20:45 +0000)]
Merge "Clear default-browser state when it's uninstalled" into oc-dev
am:
6338cd8155
Change-Id: I950d2540bf88f7e28f17653780fb19ccdb83016d
Rob Carr [Tue, 25 Apr 2017 20:44:17 +0000 (20:44 +0000)]
Merge "WindowManager: Take care with Surface lifetime during relayout to invisible." into oc-dev
Chris Craik [Tue, 25 Apr 2017 20:41:32 +0000 (13:41 -0700)]
Fix include
Bug:
35387665
Test: builds with HWUI_ENABLE_OPENGL_VALIDATION := false
Dependency on gl3.h was added while that header was auto-included for
error checking purposes. Add the include to enable us to disable gl
error checking.
Change-Id: Ic969da716e2323f8e42d20da8fd0a6fa653f9775
Jason Monk [Tue, 25 Apr 2017 20:42:12 +0000 (20:42 +0000)]
Merge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev
am:
21fb35048f
Change-Id: I03b206841f221e965cc39c1db6e82dabe9cd14de
TreeHugger Robot [Tue, 25 Apr 2017 20:36:53 +0000 (20:36 +0000)]
Merge "Fixed issue with turn-screen-on activities" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 20:35:55 +0000 (20:35 +0000)]
Merge "Clear default-browser state when it's uninstalled" into oc-dev
Todd Kennedy [Tue, 25 Apr 2017 18:11:40 +0000 (11:11 -0700)]
Add concept of implicitly exposed components
Implicitly exposed components are those that can still be accessed
via generic startActivity() calls. However, they cannot be started
by specifying a package or component. Additionally, package info
can't be obtained if the package only has implicitly shared
components.
Change-Id: I404a4dff87559cfeee6ad78f7dcc7f5d849d6869
Fixes: b_37343345
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Chris Craik [Tue, 25 Apr 2017 20:21:36 +0000 (13:21 -0700)]
Fix ViewOverlay#onDescendantInvalidated
Fixes:
37307001
Test: android.view.ViewInvalidateTest
Also removes damageChildInParent, since it's not called anywhere.
Change-Id: Ic81d4465e4828c5826957ace2c44ac263b4662bd
Makoto Onuki [Tue, 25 Apr 2017 20:26:21 +0000 (13:26 -0700)]
DeviceAdminService must be protected with BIND_DEVICE_ADMIN.
Bug:
37625902
Bug:
36226832
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest
Change-Id: I0bee75d758b565c6587d0e9cabf63bec351a0669
TreeHugger Robot [Tue, 25 Apr 2017 20:27:18 +0000 (20:27 +0000)]
Merge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev
pkanwar [Thu, 19 Jan 2017 20:24:19 +0000 (12:24 -0800)]
Create Public API which exposes if the device is in a state where simultaneous
voice and data are possible.
BUG:
32912296
Test: Not required.
Change-Id: If603aa37c774157f0a3af12ca4ac6bafad94340d
Merged-In: If603aa37c774157f0a3af12ca4ac6bafad94340d
Jakub Pawlowski [Tue, 25 Apr 2017 20:06:17 +0000 (20:06 +0000)]
Merge "Bluetooth: expand comments on new PHY constants" am:
bdeb8539e8 am:
3e56fdba72
am:
adc97e1c33
Change-Id: Ifcc1efc1cc2b99065e04e96b2aaff13a87b868b3
Android Build Merger (Role) [Tue, 25 Apr 2017 20:03:01 +0000 (20:03 +0000)]
Merge "Merge "Bluetooth: Add handler parameter to connectGatt" am:
1f4e111808 am:
41eae807ef am:
36ceeb548e" into oc-dev-plus-aosp
Jakub Pawlowski [Tue, 25 Apr 2017 20:01:57 +0000 (20:01 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt" am:
1f4e111808 am:
41eae807ef
am:
36ceeb548e
Change-Id: Icf0d3001d2ec25c7f5aad6c6789fdac1b58078bc
Jakub Pawlowski [Fri, 21 Apr 2017 11:26:12 +0000 (04:26 -0700)]
Bluetooth: expand comments on new PHY constants
Bug:
37544152
Test: the all-knowing eyes of the reviewers
Change-Id: I8f5a756a204fe90960700e1dc42f64824d3b844a
(cherry picked from commit
60c7dac77533163ed951dee09ec7b42a49bdf54a)
Jakub Pawlowski [Tue, 25 Apr 2017 15:07:11 +0000 (08:07 -0700)]
Bluetooth: document status value in PHY read/update
Bug:
37544152
Test: none
Change-Id: I2bac468f833c73cd282b1dac80b6553917996604
(cherry picked from commit
e55c4469771f9f88626b362aa7b7226c4f424ed7)
Jakub Pawlowski [Fri, 21 Apr 2017 10:49:00 +0000 (03:49 -0700)]
Bluetooth: Add handler parameter to connectGatt
Bug:
37544152
Test: sl4a GattReadTest GattWriteTest
Change-Id: I043dfefaafe9f3700418f2c855c52aac3644310f
(cherry picked from commit
4eab49652e48159fd37f827d30b822f2f187551e)
Jakub Pawlowski [Wed, 19 Apr 2017 12:44:34 +0000 (05:44 -0700)]
Get rid of the IAdvertiserCallabck
Bug:
30622771
Test: none
Change-Id: I2c55f96e71cd3be67f88201ab07c91730cd85971
(cherry picked from commit
89e10d3eb4a4728ffdb5a5eba76d772d28bcb855)
Ta-wei Yen [Tue, 25 Apr 2017 19:58:17 +0000 (19:58 +0000)]
Merge "Add getVisualVoicemailSettings()" into oc-dev
am:
1c35554c5f
Change-Id: I16718e6b6fb135fbd7e7d19258e43d740a9e1fda
Jakub Pawlowski [Tue, 25 Apr 2017 19:56:43 +0000 (19:56 +0000)]
Merge "Bluetooth: expand comments on new PHY constants" am:
bdeb8539e8
am:
3e56fdba72
Change-Id: I092b69b4e9f3ebd9a29b5c31e76de37035d20843
Jakub Pawlowski [Tue, 25 Apr 2017 19:54:54 +0000 (19:54 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt" am:
1f4e111808
am:
41eae807ef
Change-Id: I5192fa676a27f6627c94984d5e689dc1ddd1d000
Android Build Merger (Role) [Tue, 25 Apr 2017 19:53:29 +0000 (19:53 +0000)]
Merge "Merge "Remove a11y web flags and associated settings" into oc-dev am:
cd68c334ba" into oc-dev-plus-aosp
Phil Weaver [Tue, 25 Apr 2017 19:52:07 +0000 (19:52 +0000)]
Merge "Remove a11y web flags and associated settings" into oc-dev
am:
cd68c334ba
Change-Id: I6fab530bcbc9524e5ca7cb851cce4ac807594e5b
Jakub Pawlowski [Tue, 25 Apr 2017 19:51:38 +0000 (19:51 +0000)]
Merge "Bluetooth: document status value in PHY read/update" am:
06abc2c404 am:
3d95c68d2e
am:
6260ea5ab7
Change-Id: I5d45b8a8a33394d7e50479a4a4a920c59e999965
Jakub Pawlowski [Tue, 25 Apr 2017 19:50:30 +0000 (19:50 +0000)]
Merge "Bluetooth: expand comments on new PHY constants"
am:
bdeb8539e8
Change-Id: I5c2308f357ec419d5644ec57a014b2237e22e0aa
Jakub Pawlowski [Tue, 25 Apr 2017 19:48:19 +0000 (19:48 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt"
am:
1f4e111808
Change-Id: I878bfa78c10de91b3b1b83c00bc94ccc4aa77a27