OSDN Git Service
Julia Reynolds [Wed, 26 Apr 2017 17:52:47 +0000 (17:52 +0000)]
Merge "Update app level fields when misc channel is updated" into oc-dev
am:
567947d75d
Change-Id: If11fbece3506301d400294ac5fd56ccc50228085
Julia Reynolds [Wed, 26 Apr 2017 17:43:26 +0000 (17:43 +0000)]
Merge "Update app level fields when misc channel is updated" into oc-dev
nharold [Wed, 26 Apr 2017 17:38:58 +0000 (17:38 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am:
01e368f26d am:
939528045a
am:
52dab83f7a
Change-Id: I3bf240b35c3d509c4e016ffe20519c1bda5ab0b3
nharold [Wed, 26 Apr 2017 17:31:23 +0000 (17:31 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am:
01e368f26d
am:
939528045a
Change-Id: Ic415f9f6d45f8c2477c3708c87af31ef725aa224
nharold [Wed, 26 Apr 2017 17:21:52 +0000 (17:21 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm"
am:
01e368f26d
Change-Id: I82c0bf9fe401accd6928e411739f658966ac87a6
nharold [Wed, 26 Apr 2017 17:10:32 +0000 (17:10 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm"
Android Build Merger (Role) [Wed, 26 Apr 2017 17:05:45 +0000 (17:05 +0000)]
Merge "Get rid of custom negaitve save button label am:
dc6cccb905" into oc-dev-plus-aosp
Svetoslav Ganov [Wed, 26 Apr 2017 17:04:59 +0000 (17:04 +0000)]
Get rid of custom negaitve save button label
am:
dc6cccb905
Change-Id: Ib92a9487a18c821199cc8c13b7b4353cbe5c1f99
Chen Xu [Wed, 26 Apr 2017 17:02:55 +0000 (17:02 +0000)]
Merge "Extend carrier configs for visual voicemail" am:
f4db619b0b am:
e701b7ab34
am:
a8e971b75c -s ours
Change-Id: Ib417f2a9cd1c0c446f24d65ff55d9d6a72004c6b
Chen Xu [Wed, 26 Apr 2017 16:58:07 +0000 (16:58 +0000)]
Merge "Extend carrier configs for visual voicemail" am:
f4db619b0b
am:
e701b7ab34
Change-Id: I76289584e478c2e287c6fc66f75d3771cd502729
Adrian Roos [Wed, 26 Apr 2017 16:57:20 +0000 (16:57 +0000)]
Merge "AOD: Fix layout" into oc-dev
am:
f84b208a12
Change-Id: Ifd1cc55308896a69a805d80d56f321eb272d8bf8
Adrian Roos [Wed, 26 Apr 2017 16:53:18 +0000 (16:53 +0000)]
Merge "AOD: Remove wake up fully config flag" into oc-dev
am:
ce83c81b84
Change-Id: I7295e4bb27e863dd144d1f79068f9e00a249368e
Chen Xu [Wed, 26 Apr 2017 16:51:22 +0000 (16:51 +0000)]
Merge "Extend carrier configs for visual voicemail"
am:
f4db619b0b
Change-Id: I0ae8f81fde3ca866c6be897311243b6225341296
Adrian Roos [Wed, 26 Apr 2017 16:51:13 +0000 (16:51 +0000)]
Merge "AOD: Limit visible icons on shelf" into oc-dev
am:
6b7c0e9da8
Change-Id: Ife25cd6f91ec6997267e8fdd6b82b78b4bac8223
Svetoslav Ganov [Tue, 25 Apr 2017 01:11:27 +0000 (18:11 -0700)]
Get rid of custom negaitve save button label
Removed the ability for an autofill provider to set
a custom string for the negative button. Also make
the old hidden APIs non-abstract to avoid runime
crashes for unimplemented methods.
Test: CtsAutoFillServiceTestCases pass
bug:
37649790
Change-Id: If776d26de48382eeb064bdead5d4d5fdb0ff2e7e
Adrian Roos [Wed, 26 Apr 2017 16:43:50 +0000 (16:43 +0000)]
Merge "AOD: Fix layout" into oc-dev
Adrian Roos [Wed, 26 Apr 2017 16:43:30 +0000 (16:43 +0000)]
Merge "AOD: Remove wake up fully config flag" into oc-dev
Adrian Roos [Wed, 26 Apr 2017 16:43:19 +0000 (16:43 +0000)]
Merge "AOD: Limit visible icons on shelf" into oc-dev
Chen Xu [Wed, 26 Apr 2017 16:42:09 +0000 (16:42 +0000)]
Merge "Extend carrier configs for visual voicemail"
Dongwon Kang [Wed, 26 Apr 2017 16:27:39 +0000 (16:27 +0000)]
Merge "TIF: fix documentation in TvContract" into oc-dev
am:
e1a795379d
Change-Id: Ibe63e4397fac8c1a5d0190ae10dcf4598e1fd1ca
Dongwon Kang [Wed, 26 Apr 2017 16:22:08 +0000 (16:22 +0000)]
Merge "TIF: fix documentation in TvContract" into oc-dev
Jean-Michel Trivi [Wed, 26 Apr 2017 15:33:34 +0000 (15:33 +0000)]
Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev
am:
c4a169cfb4
Change-Id: Iad6d5099e2c1b7dbeaf53cb5fcbf21ed7469b55e
Jean-Michel Trivi [Wed, 26 Apr 2017 15:26:59 +0000 (15:26 +0000)]
Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev
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
Nathan Harold [Tue, 25 Apr 2017 21:21:52 +0000 (14:21 -0700)]
Hide IpSecManager, IpSecTransform, and IpSecAlgorithm
These classes, originally planned to be part of the
public API, are not ready for public consumption.
They are planned to be un-hidden in a future release.
Bug:
37681043
Test: make update-api and make
Change-Id: I8caccd3f8455341cb56a2256354eacbadedff047
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
Adrian Roos [Tue, 25 Apr 2017 23:46:49 +0000 (16:46 -0700)]
AOD: Limit visible icons on shelf
Only show up to 5 icons on AOD1.
Change-Id: I7d962ef2a4eb5e47ab35a8bdc8f133fddfb1fd84
Test: Have more than 5 notifications, trigger ambient display, observe that at most 5 icons are visible and the rest is collapsed to dots
Fixes:
37641322
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
Adrian Roos [Tue, 25 Apr 2017 23:09:27 +0000 (16:09 -0700)]
AOD: Fix layout
Top had too much padding, while bottom had too
little. Now looking as spec'd.
Bug:
30876804
Test: Trigger Ambient Display, observe that layout matches mocks.
Change-Id: I3ef5e7fba5ca3fbb1b6e800ed11cbe9885c1830e
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
Jean-Michel Trivi [Tue, 25 Apr 2017 22:23:17 +0000 (15:23 -0700)]
Audio focus enforcement: duck automatically apps for SDK O+
Enforce automatic ducking only for apps written for an SDK target
level above 25 (N-MR1)
Test: play notification while Podcast Addict is playing, verify it pauses instead of being ducked
Bug:
37506138
Change-Id: Id7e01a92a51308bd7a3f24abc417d2434b532c12
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:28:38 +0000 (14:28 -0700)]
AOD: Remove wake up fully config flag
Fixes:
37270258
Test: Double tap, make sure device does not wake up to lockscreen, only to ambient display
Change-Id: Iaf0c3bfb5dcf566adae7f37b51c866d92bce7a1d
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
OSDN Git Service
