Android Build Merger (Role)
03b1d52088
Merge "In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32 am: 0368be4523" into nyc-mr2-dev-plus-aosp
2017-01-03 11:17:25 +00:00
Ivan Podogov
bf3e524976
In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32
...
am: 0368be4523
Change-Id: I677252c7b488637ca1b24595b9d5dba09d77b06b
2017-01-03 11:16:31 +00:00
Ivan Podogov
43dc6e795c
In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32
...
am: 41f3188f73
Change-Id: Iab790f80b2ca9c810bb6f1d15783ab48d0f04569
2017-01-03 11:16:31 +00:00
Ivan Podogov
57f7c2db57
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
...
am: 34624a5d83
Change-Id: I43d92809b076e64ac0677303977c2950b556734b
2017-01-03 11:08:39 +00:00
Ivan Podogov
2dd60e81ad
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
...
am: 34624a5d83
Change-Id: If251197924b6f2f7b1970c614b5ceccc70edef4a
2017-01-03 11:08:32 +00:00
Ivan Podogov
41f3188f73
In permission review mode, always request user's consent to toggle BT.
...
am: d2d32b1f32
Change-Id: I85808eba60ad76b7492803c2cca643161521067a
2017-01-03 11:08:32 +00:00
Ivan Podogov
0368be4523
In permission review mode, always request user's consent to toggle BT.
...
am: d2d32b1f32
Change-Id: I89a4c24cf0bd4154ca87f04e41b2cc64c49b39b2
2017-01-03 11:08:29 +00:00
Ivan Podogov
34624a5d83
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
2017-01-03 11:00:53 +00:00
dongwan0605.kim
03c9afadab
QS: Fix QuickQS visibility at non-first page
...
When user collapsed QSPanel at non-first page, QuickQS always remained
View.Visible. When user canceled collapsing, QQS remained clickable
although invisible to user(alpha = 0).
QQS must be non-clickable when user cancels collapsing at non-first page.
Test: QSPanel > 2nd page > Cancel collapsing while collapse QSPanel
> Verify invisible QQS is non-clickable
Change-Id: I4c1f195a3faec8e89bb073443f6345f4faddf781
2017-01-03 06:47:17 +00:00
Yohann Roussel
b1453a95ca
Fix LOCAL_SDK_VERSION of 3 multidex apks
...
Test: Install the apks on KitKat device
Change-Id: I2e7d7cd4406cdc59bc81cff280c96bb616af012c
2017-01-02 21:53:04 +01:00
Donghyun Cho
d12655b851
Merge "CEC: Revive a standby handler"
2017-01-02 09:52:49 +00:00
Donghyun Cho
afd26a2507
CEC: Revive a standby handler
...
When a device is going into standby state, every CEC message is supposed
to be handled by HdmiCecStandbyModeHandler. But the messages were
blocked by address allocation check and just buffered. This change
revives the standby handler so that the device can handle messages
properly during standby mode.
Bug: 30184027, Bug: 31873357, Bug: 33095971
Test: One touch play with chromecast works well during standby mode
Change-Id: I3315fdaee346838c6a2c68bad0ac64b94ab9723c
2017-01-02 17:04:15 +09:00
Donghyun Cho
6561845b56
CEC: Ignore audio status update when system audio mode is off
...
Bug: 32052505
Test: Simulate receiving <Report Audio Status> while SAM is off
Change-Id: I9121928fc5a588f412b392fcfe76608391d92ad4
(cherry picked from commit 46b86aada358947869365ba9b06adcecbbc83c0f)
2017-01-02 07:59:01 +00:00
Donghyun Cho
3680b73cbc
Merge "Use AlertDialog for MediaRouteControllerDialog"
2017-01-02 04:52:37 +00:00
Donghyun Cho
86165e354c
Use AlertDialog for MediaRouteControllerDialog
...
Rather than using custom layout for MediaRouteControllerDialog, use
AlertDialog to lay out inner views and buttons properly. Also, obtain
the media route icon from the current theme and animate it if necessary.
Bug: 33253732
Test: Launched the dialog and verified.
Change-Id: I4bec689ce808285e084fc9a90820b429e63e765a
2017-01-02 11:21:08 +09:00
Nick Kralevich
564e802a7c
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5bed am: 7099984f4c
...
am: 5a35ec90bf
Change-Id: Ia485c5cadc25a3e83a881132faacd6a0be104877
2017-01-01 23:08:31 +00:00
Nick Kralevich
5a35ec90bf
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5bed
...
am: 7099984f4c
Change-Id: Ie88a0c43d9426c12319cc942015838e46d0bb8a1
2017-01-01 22:59:55 +00:00
Nick Kralevich
7099984f4c
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4
...
am: 4400fb5bed
Change-Id: I2d0f491b2f5f814aa92749a2f5d1130393cd1a83
2017-01-01 22:51:23 +00:00
Nick Kralevich
4400fb5bed
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"
...
am: 9156ccdbb4
Change-Id: I1501dce93ba090237831bf4c777cea13870f393d
2017-01-01 22:43:20 +00:00
Treehugger Robot
9156ccdbb4
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"
2017-01-01 22:28:37 +00:00
TreeHugger Robot
d837ed2c99
Merge "Fix getLineExtent for hyphen width."
2016-12-31 04:10:02 +00:00
Ivan Podogov
d57df642d7
Fix profiles broken by ag/1751147 am: 5297dba712 am: 72d9008700
...
am: 0ad19476cb
Change-Id: I6e69bac35f1d3ec78b64287f4faa86103357e136
2016-12-30 23:22:36 +00:00
Ivan Podogov
0ad19476cb
Fix profiles broken by ag/1751147 am: 5297dba712
...
am: 72d9008700
Change-Id: Ic4760a5c931bf6b8340e9ebc96b08fec938d2421
2016-12-30 23:15:00 +00:00
Ivan Podogov
72d9008700
Fix profiles broken by ag/1751147
...
am: 5297dba712
Change-Id: I9c0a4ead26f60b601847c1ba73e6b492a3611880
2016-12-30 23:07:32 +00:00
Ivan Podogov
5297dba712
Fix profiles broken by ag/1751147
...
Change-Id: Ifa92819df8e63355a3979ea0f1a20a0363b6cd45
2016-12-30 22:22:38 +00:00
Martijn Coenen
917aa3e61e
Merge "Remove obsolete calls to IPCThreadState/ProcessState."
2016-12-30 13:01:18 +00:00
Bill Yi
82a42d5465
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 7ad5111905 -s ours
...
am: 1efc31d6a6 -s ours
Change-Id: I8a050bf598ec6de7a6d0138bba5bf0dd313821b3
2016-12-30 10:48:22 +00:00
Bill Yi
8f9a3154c7
Import translations. DO NOT MERGE am: 9ab6fa68cf -s ours
...
am: f4822f1045 -s ours
Change-Id: Idaa57f558ae4bd4ea7286d9f39626aa47a3c0737
2016-12-30 10:47:16 +00:00
Bill Yi
9be5a182e1
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 54c62db71b -s ours
...
am: 3b16104048 -s ours
Change-Id: I664ce258c449ded2c4cb2f399c08f4a746ea4d00
2016-12-30 10:46:15 +00:00
Bill Yi
ee5f14edf9
Import translations. DO NOT MERGE am: 84cd5cbca0 -s ours
...
am: 5eba8f8978 -s ours
Change-Id: I4fc286b2adfdf79b5f13bf4c318ad0d895e0ee6f
2016-12-30 10:43:14 +00:00
Bill Yi
1efc31d6a6
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 7ad5111905 -s ours
Change-Id: I486d8669bdf005a5d9e9864cc22a3cbb9406d03c
2016-12-30 10:30:45 +00:00
Bill Yi
f4822f1045
Import translations. DO NOT MERGE
...
am: 9ab6fa68cf -s ours
Change-Id: Id16fd88bbc5e818a450da694558961077b2c3520
2016-12-30 10:30:41 +00:00
Bill Yi
3b16104048
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 54c62db71b -s ours
Change-Id: I891c8e0150f073696f2c62d4514b5d94bae250a8
2016-12-30 10:29:00 +00:00
Bill Yi
5eba8f8978
Import translations. DO NOT MERGE
...
am: 84cd5cbca0 -s ours
Change-Id: I551ce75f7294003f492f884b905b0da75d904ad7
2016-12-30 10:28:55 +00:00
TreeHugger Robot
9e390fb5d1
Merge "Import translations. DO NOT MERGE"
2016-12-30 10:21:20 +00:00
TreeHugger Robot
5a7c05a26a
Merge "Import translations. DO NOT MERGE"
2016-12-30 10:20:33 +00:00
TreeHugger Robot
7ad5111905
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2016-12-30 10:20:05 +00:00
TreeHugger Robot
54c62db71b
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2016-12-30 10:19:38 +00:00
TreeHugger Robot
4ae65bc8e3
Merge "Import translations. DO NOT MERGE"
2016-12-30 10:11:23 +00:00
Bill Yi
4e583acc33
Import translations. DO NOT MERGE
...
Change-Id: I3aeecfcbcf1a8c6c0cb1ca92982ac43ec4d87480
Auto-generated-cl: translation import
2016-12-30 00:22:37 -08:00
Bill Yi
84cd5cbca0
Import translations. DO NOT MERGE
...
Change-Id: Iaff41f85806a9f7041ddb069130afc741300151a
Auto-generated-cl: translation import
2016-12-29 21:29:31 -08:00
Bill Yi
9ab6fa68cf
Import translations. DO NOT MERGE
...
Change-Id: Ied8ca4b5bbae1d9092a6df5acade12feb7d25517
Auto-generated-cl: translation import
2016-12-29 21:20:35 -08:00
Bill Yi
32230c6ef9
Import translations. DO NOT MERGE
...
Change-Id: I3258f0d63f194f3dbea148e5b4d94483d3fa0514
Auto-generated-cl: translation import
2016-12-29 20:26:33 -08:00
Bill Yi
9d12c30cf3
Import translations. DO NOT MERGE
...
Change-Id: I04e28a1f58f5ae00b8ba6e5187a7319d25157302
Auto-generated-cl: translation import
2016-12-29 20:03:02 -08:00
Rob Carr
d32ca5fb52
Merge "Do not wait for configuration when it won't change."
2016-12-30 02:01:57 +00:00
Robert Carr
4a3258fa1d
Do not wait for configuration when it won't change.
...
When updating orientation the configuration won't change
if we are rotating 180 degrees. It seems previously there were
redundant calls to setNewConfiguration et. al. clearing this flag.
Those aren't happening anymore, so it doesn't get cleared, leaving
the screen frozen.
Test: Manual repro of bug steps.
Bug: 33956442
Change-Id: I01c612a6d7f920ad7abf64aa97558bebde6bb49c
2016-12-29 17:58:54 -08:00
Jiaquan He
fd1f1e0186
Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev am: e606e999a7
...
am: 0ca3a65ffd
Change-Id: Iec66672797b99467c94694fe9620db8ce8cc967e
2016-12-30 01:55:50 +00:00
Jiaquan He
5303427bc6
Cut the Grid-based Recents title if it's too long. am: 8f34df423d
...
am: e7d2311593
Change-Id: I91f090f72790bf77480a4bd393c1e1bf1c1ff8ca
2016-12-30 01:54:38 +00:00
Jiaquan He
0ca3a65ffd
Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev
...
am: e606e999a7
Change-Id: I41ad3efd4d06cbf60d517889d3cbb38eb6db5aef
2016-12-30 01:23:54 +00:00
Jiaquan He
e7d2311593
Cut the Grid-based Recents title if it's too long.
...
am: 8f34df423d
Change-Id: I941f6d96bd6dab4c3bf6c09e5dbf4b136407a055
2016-12-30 01:23:48 +00:00