OSDN Git Service
Adrian Roos [Thu, 11 May 2017 04:34:09 +0000 (04:34 +0000)]
Merge "AOD: Notification groups on Ambient Display" into oc-dev am:
bafe438d71
am:
ec9559ddc6
Change-Id: I176adacd40cce9d0b321501e8fe8d29f1168f0d5
Colin Cross [Thu, 11 May 2017 04:22:58 +0000 (04:22 +0000)]
Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)"
Hemant Gupta [Tue, 30 Jul 2013 10:39:20 +0000 (16:09 +0530)]
Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)
Provides an interface for application to send Set Idle
and Get Idle commands to remote HID Device. Support for these
two commands was missing from existing code, so existing code
design is reused to add support for these two commands.
Without this support following mandatory PTS test cases for HID 1.0
cannot be passed, TC_HOS_HID_BV_05/06.
Test: Executed PTS tests TC_HOS_HID_BV_05/06 and confirmed if they can
pass
Bug:
34344715
Change-Id: I21f37d7638c80da99a69c38d55d741b5fb107961
(cherry picked from commit
cef9ce368c5f3d50913c37ea73d5589371faa11f)
Jason Monk [Thu, 11 May 2017 04:16:05 +0000 (04:16 +0000)]
Merge "Fix battery icon tint in QS during battery saver" into oc-dev am:
0b9e1e7f22
am:
04a1e6325a
Change-Id: I4aed481f190f3d43b9c86ff16885e3e833a57e6c
Stanley Tng [Thu, 11 May 2017 04:09:24 +0000 (04:09 +0000)]
Merge "Merge "Add Save and Restore of BluetoothOn setting" am:
bbcc641317 am:
1755a4af45 am:
6682651b2b" into oc-dev-plus-aosp
am:
4c47458094
Change-Id: I5a19fd8f898c726d8d94df7a15cfac0161fd28b0
Geoffrey Pitsch [Thu, 11 May 2017 04:02:48 +0000 (04:02 +0000)]
Merge "Fix Toast exception in NotificationManagerService" into oc-dev am:
3ee2bfd8f5
am:
92f7c861b0
Change-Id: I694b5476cdea81f751cbb15421862589e9217e3f
Andrew Sapperstein [Thu, 11 May 2017 03:58:45 +0000 (03:58 +0000)]
Merge "Update input method menu to use proper context." into oc-dev am:
2ead893b18
am:
4c0a0fc11f
Change-Id: Iaaf38af47f0421214e0a5c7316622f987ae1c4e8
Svet Ganov [Thu, 11 May 2017 03:54:10 +0000 (03:54 +0000)]
Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev am:
e59c6ef346
am:
c911e0e76f
Change-Id: I8a1f7f4eabebe3b00ee0dfe5ae502be32486b5af
Svet Ganov [Thu, 11 May 2017 03:14:09 +0000 (03:14 +0000)]
Merge "Label the close image button" into oc-dev am:
c453901d13
am:
db5beadea5
Change-Id: I580cb33fcf33120fe9b6131685b8527315535a22
Pavel Grafov [Thu, 11 May 2017 02:48:31 +0000 (02:48 +0000)]
Merge "If ENSURE_VERIFY_APPS is enforced, reject installation by default." into oc-dev am:
79cc05a6c1
am:
dbb6c2abc6
Change-Id: Ic0c137a458c91a8ce148bfd4f91f113210889510
Santos Cordon [Thu, 11 May 2017 02:12:51 +0000 (02:12 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev-plus-aosp
am:
baed8c1321 -s ours
Change-Id: Ib20ce42245c768fae31e2152ac8ec02ac886630c
Santos Cordon [Thu, 11 May 2017 01:48:18 +0000 (01:48 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)"
Adrian Roos [Thu, 11 May 2017 00:02:24 +0000 (00:02 +0000)]
Merge "Enable Always On mode by default."
Bryce Lee [Wed, 10 May 2017 23:04:38 +0000 (23:04 +0000)]
Merge "Use application context getting secondary displays." into oc-dev am:
456882b5ae
am:
356cccd67c
Change-Id: I291e1249e9e0b5a975faade4ee105b3e6711db67
Adrian Roos [Wed, 10 May 2017 22:55:58 +0000 (22:55 +0000)]
Merge "AOD: Notification groups on Ambient Display" into oc-dev
am:
bafe438d71
Change-Id: I159e4543f15c5d2f89bbfee10f77ed33aaaad7a7
Jason Monk [Wed, 10 May 2017 22:39:15 +0000 (22:39 +0000)]
Merge "Fix battery icon tint in QS during battery saver" into oc-dev
am:
0b9e1e7f22
Change-Id: Ib5608f431e8586eb3c79151bade78c9f3656ad51
Hall Liu [Wed, 10 May 2017 22:39:10 +0000 (22:39 +0000)]
Merge "Merge "Increase limit of locale pairs" am:
aa9a59ab32 am:
22ff1759d2 am:
dba95b0c94" into oc-dev-plus-aosp
am:
cae12de52a
Change-Id: I759e44a846f638e3c6ff1f8325e5f05a6e0a253f
Android Build Merger (Role) [Wed, 10 May 2017 22:34:47 +0000 (22:34 +0000)]
Merge "Merge "Add Save and Restore of BluetoothOn setting" am:
bbcc641317 am:
1755a4af45 am:
6682651b2b" into oc-dev-plus-aosp
Stanley Tng [Wed, 10 May 2017 22:32:32 +0000 (22:32 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" am:
bbcc641317 am:
1755a4af45
am:
6682651b2b
Change-Id: I6dd36520e8a0cf09c75788eda2e03b4309acea9e
Geoffrey Pitsch [Wed, 10 May 2017 22:31:09 +0000 (22:31 +0000)]
Merge "Fix Toast exception in NotificationManagerService" into oc-dev
am:
3ee2bfd8f5
Change-Id: I10a6e8958b66463762188a82ed05ca24ff538805
Jason Monk [Wed, 10 May 2017 22:16:17 +0000 (22:16 +0000)]
Merge "Disable parts of tuner from user builds" into oc-dev am:
53ae4dbf8c
am:
e3cbbb88ac
Change-Id: If4aa6ec3f1c6f9ab012c41c4def7d4d0a85630f0
Andrew Sapperstein [Wed, 10 May 2017 22:13:02 +0000 (22:13 +0000)]
Merge "Update input method menu to use proper context." into oc-dev
am:
2ead893b18
Change-Id: I1de100ecc38e0fc72506b6ecd123ea2cfb86416b
Svet Ganov [Wed, 10 May 2017 22:09:50 +0000 (22:09 +0000)]
Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev
am:
e59c6ef346
Change-Id: I3c615043966131d206967bbb7d230af9b6652f47
Jason Monk [Wed, 10 May 2017 22:09:03 +0000 (22:09 +0000)]
Merge "Update QS mobile data unavailable asset" into oc-dev am:
66c81e379e
am:
a449d85714
Change-Id: Idd820e8465a41a6970fa572e6041f491ff7de1f2
Svet Ganov [Wed, 10 May 2017 22:05:55 +0000 (22:05 +0000)]
Merge "Label the close image button" into oc-dev
am:
c453901d13
Change-Id: Ic7dcf152a9759865619129fb1f3d06dbb75e2921
Robert Greenwalt [Wed, 10 May 2017 22:05:27 +0000 (22:05 +0000)]
Merge "Merge "Update startStreaming to return status code" am:
6476ceeaee am:
a89cacebfb am:
331058a871" into oc-dev-plus-aosp
am:
07f060227d
Change-Id: Ibf7f4aed57b592373ff37f1b2b40f72f3cc25d90
Stanley Tng [Wed, 10 May 2017 22:04:24 +0000 (22:04 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" am:
bbcc641317
am:
1755a4af45
Change-Id: I6a143760d9acef0fb5f28680ca1538e346ebd81f
Pavel Grafov [Wed, 10 May 2017 21:34:27 +0000 (21:34 +0000)]
Merge "If ENSURE_VERIFY_APPS is enforced, reject installation by default." into oc-dev
am:
79cc05a6c1
Change-Id: Iaf27be8afb90c8364fa365d6d21bef61e8b7470b
TreeHugger Robot [Wed, 10 May 2017 21:18:46 +0000 (21:18 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev-plus-aosp
Stanley Tng [Wed, 10 May 2017 21:17:44 +0000 (21:17 +0000)]
Merge "Add Save and Restore of BluetoothOn setting"
am:
bbcc641317
Change-Id: Ie967141aa0d8f43750f84fdd6071c26e0a26958a
Michael Wright [Wed, 10 May 2017 18:49:06 +0000 (19:49 +0100)]
Enable Always On mode by default.
Also, add a config value for always on display availability.
Test: runtest -x tests/src/com/android/systemui/doze
Change-Id: Id5e0136a5bed0eac78ad48147b0bef8311b06986
Treehugger Robot [Wed, 10 May 2017 20:44:33 +0000 (20:44 +0000)]
Merge "Add Save and Restore of BluetoothOn setting"
Lei Yu [Wed, 10 May 2017 20:42:01 +0000 (20:42 +0000)]
Merge "Add method to get bluetooth mac"
Ahmed ElArabawy [Wed, 10 May 2017 20:37:39 +0000 (20:37 +0000)]
Merge "power hal: Use power HAL API 1.1"
Santos Cordon [Wed, 5 Apr 2017 17:31:15 +0000 (10:31 -0700)]
Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds :
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.
Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input". Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest
Bug:
36051620
Change-Id: Id728d6e7292feaa1d8de7660bc6a2ec90fa1ff3c
Bryce Lee [Wed, 10 May 2017 19:22:15 +0000 (19:22 +0000)]
Merge "Use application context getting secondary displays." into oc-dev
am:
456882b5ae
Change-Id: Ib45a340b34f11f0112c91893893f32e0a849cf93
Android Build Merger (Role) [Wed, 10 May 2017 19:00:42 +0000 (19:00 +0000)]
Merge "Merge "Increase limit of locale pairs" am:
aa9a59ab32 am:
22ff1759d2 am:
dba95b0c94" into oc-dev-plus-aosp
Jason Monk [Wed, 10 May 2017 18:59:39 +0000 (18:59 +0000)]
Merge "Fix brightness dialog background to be light" into oc-dev am:
175f53b2d6
am:
aee0dd3ab0
Change-Id: I75f50fea8b504f7058fda5e83320e172ad298649
Hall Liu [Wed, 10 May 2017 18:58:23 +0000 (18:58 +0000)]
Merge "Increase limit of locale pairs" am:
aa9a59ab32 am:
22ff1759d2
am:
dba95b0c94
Change-Id: I7135571a65625f3aa3ada7a0c1b00f08c565fce9
Jason Monk [Wed, 10 May 2017 18:54:34 +0000 (18:54 +0000)]
Merge "Disable parts of tuner from user builds" into oc-dev
am:
53ae4dbf8c
Change-Id: I7409558792e77fa16f0e4b95fdf7ae40e59ed1ed
Hall Liu [Wed, 10 May 2017 18:31:12 +0000 (18:31 +0000)]
Merge "Increase limit of locale pairs" am:
aa9a59ab32
am:
22ff1759d2
Change-Id: Ib993597558b13e9879dc56014af8529aa84c4480
Jason Monk [Wed, 10 May 2017 18:26:53 +0000 (18:26 +0000)]
Merge "Update QS mobile data unavailable asset" into oc-dev
am:
66c81e379e
Change-Id: I8feecad17a1613bd6774a6a557f8986b300c38b0
Rebecca Silberstein [Wed, 10 May 2017 18:18:52 +0000 (18:18 +0000)]
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev am:
ed285e0cd6
am:
a5b8380b03
Change-Id: I1fab5a10644d7f24a304e24f373461c72c03d9a6
Adrian Roos [Wed, 10 May 2017 18:17:36 +0000 (18:17 +0000)]
Merge "AOD: Notification groups on Ambient Display" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 18:16:10 +0000 (18:16 +0000)]
Merge "Notify ImsService Status Correctly"
Jason Monk [Wed, 10 May 2017 18:03:13 +0000 (18:03 +0000)]
Merge "Fix battery icon tint in QS during battery saver" into oc-dev
Android Build Merger (Role) [Wed, 10 May 2017 18:00:10 +0000 (18:00 +0000)]
Merge "Merge "Update startStreaming to return status code" am:
6476ceeaee am:
a89cacebfb am:
331058a871" into oc-dev-plus-aosp
Jason Monk [Wed, 10 May 2017 17:51:02 +0000 (17:51 +0000)]
Merge "Fix brightness dialog background to be light" into oc-dev
am:
175f53b2d6
Change-Id: Ic062c499bbb5a5aade5da15a6a038324e47a866e
Robert Greenwalt [Wed, 10 May 2017 17:50:17 +0000 (17:50 +0000)]
Merge "Update startStreaming to return status code" am:
6476ceeaee am:
a89cacebfb
am:
331058a871
Change-Id: Ie2bc9f47e7774a838829720379fc5865e71d2f0f
TreeHugger Robot [Wed, 10 May 2017 17:43:57 +0000 (17:43 +0000)]
Merge "Support different SIM power states"
TreeHugger Robot [Wed, 10 May 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Fix Toast exception in NotificationManagerService" into oc-dev
Andrew Sapperstein [Wed, 10 May 2017 17:35:44 +0000 (17:35 +0000)]
Merge "Update input method menu to use proper context." into oc-dev
Robert Greenwalt [Wed, 10 May 2017 17:35:34 +0000 (17:35 +0000)]
Merge "Update startStreaming to return status code" am:
6476ceeaee
am:
a89cacebfb
Change-Id: Ief49d5e046bc9a3396f16ec81a2196a2c3b9557b
Rebecca Silberstein [Wed, 10 May 2017 17:35:27 +0000 (17:35 +0000)]
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev
am:
ed285e0cd6
Change-Id: Iae9b1317dc53a8213861ff3803764f9d45758f71
TreeHugger Robot [Wed, 10 May 2017 17:21:29 +0000 (17:21 +0000)]
Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev
Jean-Michel Trivi [Wed, 10 May 2017 17:18:33 +0000 (17:18 +0000)]
Merge changes from topic 'mediaplayer_gc' into oc-dev am:
f86d68d447
am:
f92b4ec5b0
Change-Id: I80613c2fa0ded16c846a8168e44c7f3f30e15d99
Hall Liu [Wed, 10 May 2017 17:15:31 +0000 (17:15 +0000)]
Merge "Increase limit of locale pairs"
am:
aa9a59ab32
Change-Id: I4f9d25169bbd7e53c5396e944613e8c15fe4e308
Robert Greenwalt [Wed, 10 May 2017 17:11:12 +0000 (17:11 +0000)]
Merge "Update startStreaming to return status code"
am:
6476ceeaee
Change-Id: I92f8fad5bff456b158ba2afd55c3065678b0d5cf
TreeHugger Robot [Wed, 10 May 2017 17:10:31 +0000 (17:10 +0000)]
Merge "Label the close image button" into oc-dev
Lucas Dupin [Wed, 10 May 2017 17:04:15 +0000 (17:04 +0000)]
Merge "New palette picking algorithm"
Andreas Gampe [Wed, 10 May 2017 16:50:38 +0000 (16:50 +0000)]
Merge "OtaDexoptService: Add missing return" into oc-dev am:
ab516db3e6
am:
6a580bef1f
Change-Id: I3a75fb705d58211c2ecf6937b61722fa12294fd5
Jean-Michel Trivi [Wed, 10 May 2017 16:50:19 +0000 (16:50 +0000)]
Merge changes from topic 'mediaplayer_gc' into oc-dev
am:
f86d68d447
Change-Id: I01f8c26e9a61f8ed5dd6f0b3a12d245001756796
Hall Liu [Wed, 10 May 2017 16:46:18 +0000 (16:46 +0000)]
Merge "Increase limit of locale pairs"
Treehugger Robot [Wed, 10 May 2017 16:46:12 +0000 (16:46 +0000)]
Merge "Update startStreaming to return status code"
TreeHugger Robot [Wed, 10 May 2017 16:44:36 +0000 (16:44 +0000)]
Merge "If ENSURE_VERIFY_APPS is enforced, reject installation by default." into oc-dev
Andreas Gampe [Wed, 10 May 2017 16:34:58 +0000 (16:34 +0000)]
Merge "OtaDexoptService: Add missing return" into oc-dev
am:
ab516db3e6
Change-Id: I18d0be12e680424de3dfb48b0e1e6040e339204e
Jeff Sharkey [Wed, 10 May 2017 16:33:34 +0000 (16:33 +0000)]
Merge "Start building SystemApi docs again; exact output." into oc-dev am:
ab3c811678
am:
e9e899f49b
Change-Id: Ie0ef290e1b032f99cc76ab66e4999132b38d4cb3
Stanley Tng [Tue, 2 May 2017 04:27:31 +0000 (21:27 -0700)]
Add Save and Restore of BluetoothOn setting
This change will automatically save the Bluetooth On setting when
the user chooses to backup the phone settings into the cloud. This
setting is restored by the Setup Wizard (SUW) when configuring the
phone and this change will enable or disable the Bluetooth based
on this restored setting.
Bug:
35657817
Test: Manual test with Sailfish
Change-Id: Ie4518593af63f96f8c363f98941ca5260a3ec4bb
Bryce Lee [Wed, 10 May 2017 16:27:04 +0000 (16:27 +0000)]
Merge "Use application context getting secondary displays." into oc-dev
Christine Franks [Wed, 10 May 2017 16:22:27 +0000 (16:22 +0000)]
Merge "Allow ogg files to be selected as ringtones" into oc-dev am:
d44afb99c8
am:
c8ae9d5a60
Change-Id: I878d4dce0113535d43b9cdc9fb7d230bb38082b7
TreeHugger Robot [Wed, 10 May 2017 16:19:23 +0000 (16:19 +0000)]
Merge "Disable parts of tuner from user builds" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 16:16:17 +0000 (16:16 +0000)]
Merge "Update QS mobile data unavailable asset" into oc-dev
Julia Reynolds [Wed, 10 May 2017 16:11:39 +0000 (16:11 +0000)]
Merge "Rename the legacy notification channel" into oc-dev am:
0c34dc60c4
am:
45ba2ef24e
Change-Id: I9d6e61348602f8002889c4a39ff02354d2a99dfc
Jeff Sharkey [Wed, 10 May 2017 16:10:45 +0000 (16:10 +0000)]
Merge "Start building SystemApi docs again; exact output." into oc-dev
am:
ab3c811678
Change-Id: I1b45a67f2bc3e76d09f29dc59bc9a6c9dcd3d3d5
TreeHugger Robot [Wed, 10 May 2017 16:09:00 +0000 (16:09 +0000)]
Merge "Fix brightness dialog background to be light" into oc-dev
Philipp Weiß [Wed, 10 May 2017 16:08:04 +0000 (16:08 +0000)]
Merge "Implement CACert queries in SecurityController" into oc-dev am:
4c78ac9ce4
am:
47d13239c0 -s ours
Change-Id: I764b6a343522c6eceadc79182546e55d6eee9e45
Christine Franks [Wed, 10 May 2017 16:04:45 +0000 (16:04 +0000)]
Merge "Allow ogg files to be selected as ringtones" into oc-dev
am:
d44afb99c8
Change-Id: Ia99142562cd97ad5aeec2dfa40a63d80657a2c0d
Bryce Lee [Wed, 10 May 2017 16:04:32 +0000 (16:04 +0000)]
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev am:
8a698a1721
am:
537ece988a
Change-Id: Idb7c86cae2974d31a04aefec34a6ee7baeafb7ec
Daniel Sandler [Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)]
Merge "Enable notifications during an ongoing call" into oc-dev am:
b94abe5e30
am:
1201831262
Change-Id: I135fbace8fbed83532540955c4992f1be230e38d
Rebecca Silberstein [Wed, 10 May 2017 15:43:39 +0000 (15:43 +0000)]
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev
Julia Reynolds [Wed, 10 May 2017 15:42:21 +0000 (15:42 +0000)]
Merge "Rename the legacy notification channel" into oc-dev
am:
0c34dc60c4
Change-Id: I3e16fc67c83eeb711d795d0b5a72fde0525ee39d
Julia Reynolds [Wed, 10 May 2017 15:39:56 +0000 (15:39 +0000)]
Update zen introduction text am:
c12676b449
am:
966f6d716f -s ours
Change-Id: I5add8cdf9c15e6f5638f38c8d0a25592471813e0
Jean-Michel Trivi [Wed, 10 May 2017 15:30:58 +0000 (15:30 +0000)]
Merge changes from topic 'mediaplayer_gc' into oc-dev
* changes:
IAppOpsCallback has weak reference to PlayerBase
IPlayer has weak reference to PlayerBase
Jason Monk [Wed, 10 May 2017 14:39:16 +0000 (10:39 -0400)]
Fix battery icon tint in QS during battery saver
Test: visual
Change-Id: Id844604bfe0de141563781678980da774cc87ebc
Fixes:
37433416
Philipp Weiß [Wed, 10 May 2017 15:22:07 +0000 (15:22 +0000)]
Merge "Implement CACert queries in SecurityController" into oc-dev
am:
4c78ac9ce4
Change-Id: Ic4a8e36b7f14ad8ebb2b23e76ef6c38f1bc1da72
TreeHugger Robot [Wed, 10 May 2017 15:18:11 +0000 (15:18 +0000)]
Merge "OtaDexoptService: Add missing return" into oc-dev
Svet Ganov [Wed, 10 May 2017 15:11:33 +0000 (08:11 -0700)]
Revert "Fixed placemente of Autofill UI for virtual views."
This reverts commit
4745fb6b29322819fdcd21647253bfed8e508137.
Change-Id: I07c108dc53d13ff6fdd16f8f486b35d8ca9a7c58
Tomasz Wasilczyk [Wed, 10 May 2017 15:15:14 +0000 (15:15 +0000)]
Merge "Implement tune, cancel and getProgramInformation calls of ITuner."
Svet Ganov [Wed, 10 May 2017 02:10:10 +0000 (19:10 -0700)]
Label the close image button
Test: manual
bug:
38182393
Change-Id: I3a1e2e18c651b02b16c8e370b6be9ec2ed5e41e5
Jeff Sharkey [Wed, 10 May 2017 15:05:51 +0000 (15:05 +0000)]
Merge "Start building SystemApi docs again; exact output." into oc-dev
Bryce Lee [Wed, 10 May 2017 15:04:05 +0000 (15:04 +0000)]
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
am:
8a698a1721
Change-Id: I7dd30182184fc5ce6ec5e9750eaa26f174b79b38
Christine Franks [Wed, 10 May 2017 15:03:23 +0000 (15:03 +0000)]
Merge "Allow ogg files to be selected as ringtones" into oc-dev
Todd Kennedy [Wed, 10 May 2017 15:00:38 +0000 (15:00 +0000)]
Merge "Don't require BROWSABLE" into oc-dev am:
59b9a851a7
am:
857bbed067
Change-Id: I81979ec46465c22aca3a6736dd4e1e6a4b5c8c2b
Daniel Sandler [Wed, 10 May 2017 15:00:20 +0000 (15:00 +0000)]
Merge "Enable notifications during an ongoing call" into oc-dev
am:
b94abe5e30
Change-Id: I9d65601fff941d5a3764cde34f9c658ea1d2a435
Geoffrey Pitsch [Wed, 10 May 2017 14:56:50 +0000 (14:56 +0000)]
Merge "Pre-O apps can see Default Channel name." into oc-dev am:
e7fb3c9f26
am:
b6eedcc811
Change-Id: I639c8b667e83657d0bf4a25285e57548eef6c876
Julia Reynolds [Wed, 10 May 2017 14:56:21 +0000 (14:56 +0000)]
Merge "Rename the legacy notification channel" into oc-dev
Julia Reynolds [Wed, 10 May 2017 14:53:39 +0000 (14:53 +0000)]
Update zen introduction text
am:
c12676b449
Change-Id: Ibe776e22adc0fa87817d07547364ac1885e1518c
Philipp Weiß [Wed, 10 May 2017 14:46:43 +0000 (14:46 +0000)]
Merge "Implement CACert queries in SecurityController" into oc-dev
Bryce Lee [Wed, 10 May 2017 14:45:34 +0000 (14:45 +0000)]
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
Daniel Sandler [Wed, 10 May 2017 14:43:00 +0000 (14:43 +0000)]
Merge "Enable notifications during an ongoing call" into oc-dev
OSDN Git Service
