OSDN Git Service

android-x86/frameworks-base.git
7 years agoresolve merge conflicts of e6b6653da899 to nyc-mr2-dev-plus-aosp
Robert Greenwalt [Tue, 3 Jan 2017 19:48:04 +0000 (19:48 +0000)]
resolve merge conflicts of e6b6653da899 to nyc-mr2-dev-plus-aosp
am: 5f0dad0e64

Change-Id: Icbd5899dd0c8a35be4c290b3aeab29d46c64e1c0

7 years agoresolve merge conflicts of e6b6653da899 to nyc-mr2-dev-plus-aosp
Robert Greenwalt [Tue, 3 Jan 2017 19:35:37 +0000 (11:35 -0800)]
resolve merge conflicts of e6b6653da899 to nyc-mr2-dev-plus-aosp

Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac

7 years agoMerge "Set background of DrawerLayout to statusBarColor"
Lei Yu [Tue, 3 Jan 2017 19:10:04 +0000 (19:10 +0000)]
Merge "Set background of DrawerLayout to statusBarColor"

7 years agoMerge "Don't check for monitoring CA certs in cryptkeeper"
Robin Lee [Tue, 3 Jan 2017 18:43:48 +0000 (18:43 +0000)]
Merge "Don't check for monitoring CA certs in cryptkeeper"

7 years agoMerge "Fix out of bounds memory read in GIFMovie.cpp"
TreeHugger Robot [Tue, 3 Jan 2017 18:17:58 +0000 (18:17 +0000)]
Merge "Fix out of bounds memory read in GIFMovie.cpp"

7 years agoMerge "Add IMEI_NOT_ACCEPTED disconnect cause" am: 43ced5941e
Robert Greenwalt [Tue, 3 Jan 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause" am: 43ced5941e
am: 14a5b810b6

Change-Id: Ib7a87a5028975e8f55dd6ba311cde78a3c1c2460

7 years agoMerge "Add IMEI_NOT_ACCEPTED disconnect cause"
Robert Greenwalt [Tue, 3 Jan 2017 17:32:59 +0000 (17:32 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
am: 43ced5941e

Change-Id: I5457b80932f4bb155bf136fc4e05199f04ca7e7c

7 years agoMerge "Add IMEI_NOT_ACCEPTED disconnect cause"
Robert Greenwalt [Tue, 3 Jan 2017 17:26:58 +0000 (17:26 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"

7 years agoMerge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be am: 56812a0146...
dongwan0605.kim [Tue, 3 Jan 2017 16:34:00 +0000 (16:34 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be am: 56812a0146 am: 852fb2b1f1
am: 29d656dbe1

Change-Id: Ibfa95306964670aa10618bc5aa377a0a1bb6ab06

7 years agoMerge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be am: 56812a0146
dongwan0605.kim [Tue, 3 Jan 2017 16:27:27 +0000 (16:27 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be am: 56812a0146
am: 852fb2b1f1

Change-Id: Ide5e7c588eb1707015ac33a13fb9788e80617587

7 years agoMerge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be
dongwan0605.kim [Tue, 3 Jan 2017 16:17:28 +0000 (16:17 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be
am: 56812a0146

Change-Id: If8d2963ed44e49e3b33b73a82378b2af32ba4676

7 years agoMerge "QS: Fix QuickQS visibility at non-first page"
dongwan0605.kim [Tue, 3 Jan 2017 16:09:21 +0000 (16:09 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page"
am: fce04dc0be

Change-Id: I83100ac5c1f4d896d96d2ff12d0ad59eba8b533b

7 years agoFix out of bounds memory read in GIFMovie.cpp
Leon Scroggins III [Tue, 3 Jan 2017 16:02:03 +0000 (11:02 -0500)]
Fix out of bounds memory read in GIFMovie.cpp

Test: TODO (to be separately uploaded to CTS)

When decoding a GIF image, do not attempt to copy an index if it is out
of range.

BUG:33897722
Change-Id: I8c8ca69b00bf1f655e62bbe1798b9a47bf6699be

7 years agoMerge "QS: Fix QuickQS visibility at non-first page"
Treehugger Robot [Tue, 3 Jan 2017 15:54:21 +0000 (15:54 +0000)]
Merge "QS: Fix QuickQS visibility at non-first page"

7 years agoMerge "Merge "In permission review mode, always request user's consent to toggle...
Ivan Podogov [Tue, 3 Jan 2017 14:16:59 +0000 (14:16 +0000)]
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 2dd60e81ad" into nyc-mr2-dev-plus-aosp
am: 873c2054c9

Change-Id: I63dda24101762a8407f1fafa5b21d4adb99c71d9

7 years agoMerge "In permission review mode, always request user's consent to toggle BT." into...
Ivan Podogov [Tue, 3 Jan 2017 14:16:48 +0000 (14:16 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 2dd60e81ad
am: 171af67a69

Change-Id: I0c9c6a6f8fd3c0f5246426741c244699438def24

7 years agoMerge "Merge "In permission review mode, always request user's consent to toggle...
Ivan Podogov [Tue, 3 Jan 2017 14:15:01 +0000 (14:15 +0000)]
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 57f7c2db57" into nyc-mr2-dev-plus-aosp
am: e337729543

Change-Id: I741841d40df5a46e479160ab4e75b958eea9cc1e

7 years agoMerge "In permission review mode, always request user's consent to toggle BT." into...
Ivan Podogov [Tue, 3 Jan 2017 14:14:52 +0000 (14:14 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 57f7c2db57
am: 2518fb03dc

Change-Id: If70af15581f2182a4175e9b48a7b2b93d3cbd2f5

7 years agoMerge "In permission review mode, always request user's consent to toggle BT. am...
Ivan Podogov [Tue, 3 Jan 2017 14:13:03 +0000 (14:13 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32 am: 0368be4523" into nyc-mr2-dev-plus-aosp
am: 03b1d52088

Change-Id: I7ba648d4df507ccdc69cbf9e2387f9825d650621

7 years agoIn permission review mode, always request user's consent to toggle BT. am: d2d32b1f32...
Ivan Podogov [Tue, 3 Jan 2017 14:12:53 +0000 (14:12 +0000)]
In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32 am: 0368be4523
am: bf3e524976

Change-Id: Idfb0800fbbbdb5a274f2e22eeb560c710b4549c8

7 years agoresolve merge conflicts of 43dc6e7 to master
Ivan Podogov [Tue, 3 Jan 2017 12:02:18 +0000 (12:02 +0000)]
resolve merge conflicts of 43dc6e7 to master

Test: make
Change-Id: I7d49e2c1480e3296f8de25d5e8e94db7b58dd8f5

7 years agoMerge "Remove refernces to V1 API, as V2 doesn't exist anymore."
Niels Egberts [Tue, 3 Jan 2017 11:52:38 +0000 (11:52 +0000)]
Merge "Remove refernces to V1 API, as V2 doesn't exist anymore."

7 years agoMerge "Merge "In permission review mode, always request user's consent to toggle...
Android Build Merger (Role) [Tue, 3 Jan 2017 11:18:33 +0000 (11:18 +0000)]
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 2dd60e81ad" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "In permission review mode, always request user's consent to toggle...
Android Build Merger (Role) [Tue, 3 Jan 2017 11:18:25 +0000 (11:18 +0000)]
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 57f7c2db57" into nyc-mr2-dev-plus-aosp

7 years agoMerge "In permission review mode, always request user's consent to toggle BT." into...
Ivan Podogov [Tue, 3 Jan 2017 11:17:45 +0000 (11:17 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83
am: 2dd60e81ad

Change-Id: Ie0b2f16368d5d6d1d12a140bf57049ae29c7b84f

7 years agoMerge "In permission review mode, always request user's consent to toggle BT." into...
Ivan Podogov [Tue, 3 Jan 2017 11:17:39 +0000 (11:17 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83
am: 57f7c2db57

Change-Id: If36ef6f3fd072fa5ac0593584b499e050d30d4dc

7 years agoMerge "In permission review mode, always request user's consent to toggle BT. am...
Android Build Merger (Role) [Tue, 3 Jan 2017 11:17:22 +0000 (11:17 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32 am: 0368be4523" into nyc-mr2-dev-plus-aosp

7 years agoIn permission review mode, always request user's consent to toggle BT. am: d2d32b1f32
Ivan Podogov [Tue, 3 Jan 2017 11:16:31 +0000 (11:16 +0000)]
In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32
am: 0368be4523

Change-Id: I677252c7b488637ca1b24595b9d5dba09d77b06b

7 years agoIn permission review mode, always request user's consent to toggle BT. am: d2d32b1f32
Ivan Podogov [Tue, 3 Jan 2017 11:16:31 +0000 (11:16 +0000)]
In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32
am: 41f3188f73

Change-Id: Iab790f80b2ca9c810bb6f1d15783ab48d0f04569

7 years agoMerge "In permission review mode, always request user's consent to toggle BT." into...
Ivan Podogov [Tue, 3 Jan 2017 11:08:39 +0000 (11:08 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
am: 34624a5d83

Change-Id: I43d92809b076e64ac0677303977c2950b556734b

7 years agoMerge "In permission review mode, always request user's consent to toggle BT." into...
Ivan Podogov [Tue, 3 Jan 2017 11:08:32 +0000 (11:08 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
am: 34624a5d83

Change-Id: If251197924b6f2f7b1970c614b5ceccc70edef4a

7 years agoIn permission review mode, always request user's consent to toggle BT.
Ivan Podogov [Tue, 3 Jan 2017 11:08:32 +0000 (11:08 +0000)]
In permission review mode, always request user's consent to toggle BT.
am: d2d32b1f32

Change-Id: I85808eba60ad76b7492803c2cca643161521067a

7 years agoIn permission review mode, always request user's consent to toggle BT.
Ivan Podogov [Tue, 3 Jan 2017 11:08:29 +0000 (11:08 +0000)]
In permission review mode, always request user's consent to toggle BT.
am: d2d32b1f32

Change-Id: I89a4c24cf0bd4154ca87f04e41b2cc64c49b39b2

7 years agoMerge "In permission review mode, always request user's consent to toggle BT." into...
Ivan Podogov [Tue, 3 Jan 2017 11:00:49 +0000 (11:00 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev

7 years agoQS: Fix QuickQS visibility at non-first page
dongwan0605.kim [Tue, 3 Jan 2017 06:40:07 +0000 (15:40 +0900)]
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

7 years agoMerge "CEC: Revive a standby handler"
Donghyun Cho [Mon, 2 Jan 2017 09:52:46 +0000 (09:52 +0000)]
Merge "CEC: Revive a standby handler"

7 years agoCEC: Revive a standby handler
Donghyun Cho [Fri, 23 Dec 2016 06:53:28 +0000 (15:53 +0900)]
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

7 years agoCEC: Ignore audio status update when system audio mode is off
Donghyun Cho [Fri, 23 Dec 2016 09:30:37 +0000 (18:30 +0900)]
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)

7 years agoMerge "Use AlertDialog for MediaRouteControllerDialog"
Donghyun Cho [Mon, 2 Jan 2017 04:52:34 +0000 (04:52 +0000)]
Merge "Use AlertDialog for MediaRouteControllerDialog"

7 years agoUse AlertDialog for MediaRouteControllerDialog
Donghyun Cho [Thu, 22 Dec 2016 15:50:57 +0000 (00:50 +0900)]
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

7 years agoMerge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5...
Nick Kralevich [Sun, 1 Jan 2017 23:08:31 +0000 (23:08 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5bed am: 7099984f4c
am: 5a35ec90bf

Change-Id: Ia485c5cadc25a3e83a881132faacd6a0be104877

7 years agoMerge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5bed
Nick Kralevich [Sun, 1 Jan 2017 22:59:55 +0000 (22:59 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5bed
am: 7099984f4c

Change-Id: Ie88a0c43d9426c12319cc942015838e46d0bb8a1

7 years agoMerge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4
Nick Kralevich [Sun, 1 Jan 2017 22:51:23 +0000 (22:51 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4
am: 4400fb5bed

Change-Id: I2d0f491b2f5f814aa92749a2f5d1130393cd1a83

7 years agoMerge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"
Nick Kralevich [Sun, 1 Jan 2017 22:43:20 +0000 (22:43 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"
am: 9156ccdbb4

Change-Id: I1501dce93ba090237831bf4c777cea13870f393d

7 years agoMerge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"
Treehugger Robot [Sun, 1 Jan 2017 22:28:36 +0000 (22:28 +0000)]
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"

7 years agoMerge "Fix getLineExtent for hyphen width."
TreeHugger Robot [Sat, 31 Dec 2016 04:09:58 +0000 (04:09 +0000)]
Merge "Fix getLineExtent for hyphen width."

7 years agoFix profiles broken by ag/1751147 am: 5297dba712 am: 72d9008700
Ivan Podogov [Fri, 30 Dec 2016 23:22:36 +0000 (23:22 +0000)]
Fix profiles broken by ag/1751147 am: 5297dba712 am: 72d9008700
am: 0ad19476cb

Change-Id: I6e69bac35f1d3ec78b64287f4faa86103357e136

7 years agoFix profiles broken by ag/1751147 am: 5297dba712
Ivan Podogov [Fri, 30 Dec 2016 23:15:00 +0000 (23:15 +0000)]
Fix profiles broken by ag/1751147 am: 5297dba712
am: 72d9008700

Change-Id: Ic4760a5c931bf6b8340e9ebc96b08fec938d2421

7 years agoFix profiles broken by ag/1751147
Ivan Podogov [Fri, 30 Dec 2016 23:07:32 +0000 (23:07 +0000)]
Fix profiles broken by ag/1751147
am: 5297dba712

Change-Id: I9c0a4ead26f60b601847c1ba73e6b492a3611880

7 years agoFix profiles broken by ag/1751147
Ivan Podogov [Fri, 30 Dec 2016 14:35:09 +0000 (14:35 +0000)]
Fix profiles broken by ag/1751147

Change-Id: Ifa92819df8e63355a3979ea0f1a20a0363b6cd45

7 years agoMerge "Remove obsolete calls to IPCThreadState/ProcessState."
Martijn Coenen [Fri, 30 Dec 2016 13:01:14 +0000 (13:01 +0000)]
Merge "Remove obsolete calls to IPCThreadState/ProcessState."

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 7ad5111905 -s ours
Bill Yi [Fri, 30 Dec 2016 10:48:22 +0000 (10:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 7ad5111905  -s ours
am: 1efc31d6a6  -s ours

Change-Id: I8a050bf598ec6de7a6d0138bba5bf0dd313821b3

7 years agoImport translations. DO NOT MERGE am: 9ab6fa68cf -s ours
Bill Yi [Fri, 30 Dec 2016 10:47:16 +0000 (10:47 +0000)]
Import translations. DO NOT MERGE am: 9ab6fa68cf  -s ours
am: f4822f1045  -s ours

Change-Id: Idaa57f558ae4bd4ea7286d9f39626aa47a3c0737

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 54c62db71b -s ours
Bill Yi [Fri, 30 Dec 2016 10:46:15 +0000 (10:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 54c62db71b  -s ours
am: 3b16104048  -s ours

Change-Id: I664ce258c449ded2c4cb2f399c08f4a746ea4d00

7 years agoImport translations. DO NOT MERGE am: 84cd5cbca0 -s ours
Bill Yi [Fri, 30 Dec 2016 10:43:14 +0000 (10:43 +0000)]
Import translations. DO NOT MERGE am: 84cd5cbca0  -s ours
am: 5eba8f8978  -s ours

Change-Id: I4fc286b2adfdf79b5f13bf4c318ad0d895e0ee6f

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Fri, 30 Dec 2016 10:30:45 +0000 (10:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 7ad5111905  -s ours

Change-Id: I486d8669bdf005a5d9e9864cc22a3cbb9406d03c

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 30 Dec 2016 10:30:41 +0000 (10:30 +0000)]
Import translations. DO NOT MERGE
am: 9ab6fa68cf  -s ours

Change-Id: Id16fd88bbc5e818a450da694558961077b2c3520

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Fri, 30 Dec 2016 10:29:00 +0000 (10:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 54c62db71b  -s ours

Change-Id: I891c8e0150f073696f2c62d4514b5d94bae250a8

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 30 Dec 2016 10:28:55 +0000 (10:28 +0000)]
Import translations. DO NOT MERGE
am: 84cd5cbca0  -s ours

Change-Id: I551ce75f7294003f492f884b905b0da75d904ad7

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 30 Dec 2016 10:21:16 +0000 (10:21 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 30 Dec 2016 10:20:29 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 30 Dec 2016 10:20:00 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 30 Dec 2016 10:19:34 +0000 (10:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 30 Dec 2016 10:11:19 +0000 (10:11 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 30 Dec 2016 08:22:37 +0000 (00:22 -0800)]
Import translations. DO NOT MERGE

Change-Id: I3aeecfcbcf1a8c6c0cb1ca92982ac43ec4d87480
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 30 Dec 2016 05:29:31 +0000 (21:29 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iaff41f85806a9f7041ddb069130afc741300151a
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 30 Dec 2016 05:20:35 +0000 (21:20 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ied8ca4b5bbae1d9092a6df5acade12feb7d25517
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 30 Dec 2016 04:26:33 +0000 (20:26 -0800)]
Import translations. DO NOT MERGE

Change-Id: I3258f0d63f194f3dbea148e5b4d94483d3fa0514
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 30 Dec 2016 04:03:02 +0000 (20:03 -0800)]
Import translations. DO NOT MERGE

Change-Id: I04e28a1f58f5ae00b8ba6e5187a7319d25157302
Auto-generated-cl: translation import

7 years agoMerge "Do not wait for configuration when it won't change."
Rob Carr [Fri, 30 Dec 2016 02:01:52 +0000 (02:01 +0000)]
Merge "Do not wait for configuration when it won't change."

7 years agoDo not wait for configuration when it won't change.
Robert Carr [Thu, 29 Dec 2016 23:58:14 +0000 (15:58 -0800)]
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

7 years agoMerge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev am: e606e...
Jiaquan He [Fri, 30 Dec 2016 01:55:50 +0000 (01:55 +0000)]
Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev am: e606e999a7
am: 0ca3a65ffd

Change-Id: Iec66672797b99467c94694fe9620db8ce8cc967e

7 years agoCut the Grid-based Recents title if it's too long. am: 8f34df423d
Jiaquan He [Fri, 30 Dec 2016 01:54:38 +0000 (01:54 +0000)]
Cut the Grid-based Recents title if it's too long. am: 8f34df423d
am: e7d2311593

Change-Id: I91f090f72790bf77480a4bd393c1e1bf1c1ff8ca

7 years agoMerge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev
Jiaquan He [Fri, 30 Dec 2016 01:23:54 +0000 (01:23 +0000)]
Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev
am: e606e999a7

Change-Id: I41ad3efd4d06cbf60d517889d3cbb38eb6db5aef

7 years agoCut the Grid-based Recents title if it's too long.
Jiaquan He [Fri, 30 Dec 2016 01:23:48 +0000 (01:23 +0000)]
Cut the Grid-based Recents title if it's too long.
am: 8f34df423d

Change-Id: I941f6d96bd6dab4c3bf6c09e5dbf4b136407a055

7 years agoMerge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev
TreeHugger Robot [Fri, 30 Dec 2016 00:35:33 +0000 (00:35 +0000)]
Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev

7 years agoresolve merge conflicts of 825d8ff to master
Marie Janssen [Fri, 30 Dec 2016 00:20:43 +0000 (16:20 -0800)]
resolve merge conflicts of 825d8ff to master

Change-Id: I57ae47778f738dbea6a670b85f24161cfb544a16

7 years agoresolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp
Marie Janssen [Thu, 29 Dec 2016 23:45:39 +0000 (23:45 +0000)]
resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp
am: 07e590a574

Change-Id: I49fd2c3ed7ac5cbdf102ec289235b1fb12bee39a

7 years agoMerge "Don't allow permission change to runtime"
TreeHugger Robot [Thu, 29 Dec 2016 23:08:19 +0000 (23:08 +0000)]
Merge "Don't allow permission change to runtime"

7 years agoMerge "Always propagate AccessibilityCache events"
Eugene Susla [Thu, 29 Dec 2016 22:51:11 +0000 (22:51 +0000)]
Merge "Always propagate AccessibilityCache events"

7 years agoMerge "New AudioAttributes usage for "assistant" use case"
Jean-Michel Trivi [Thu, 29 Dec 2016 22:24:46 +0000 (22:24 +0000)]
Merge "New AudioAttributes usage for "assistant" use case"

7 years agoresolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp
Marie Janssen [Thu, 29 Dec 2016 22:05:47 +0000 (14:05 -0800)]
resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp

Change-Id: I42e00b90165220d88519771b8f4280aaf3a07525

7 years agoDon't allow permission change to runtime
Svetoslav Ganov [Thu, 29 Dec 2016 18:39:02 +0000 (10:39 -0800)]
Don't allow permission change to runtime

Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.

Test: Added a CTS test which passes.

bug:33860747

Change-Id: Icd2d596d42ae2c6cf569c016d20d9bb9106a29ef

7 years agoAlways propagate AccessibilityCache events
Eugene Susla [Wed, 21 Dec 2016 00:32:59 +0000 (16:32 -0800)]
Always propagate AccessibilityCache events

Bug: b/32642665
Test: Steps:
- Retrieve root AccessibilityNodeInfo
- Change text on its child TextView
- Wait for a few seconds to let the AccessibilityEvent propagate to
    the AccessibilityCache
- Get the child AccessibilityNodeInfo from the root, corresponding to
    that TextView, and ensure that it's updated to reflect the text
    change
Change-Id: Icbdb91803b646fa06aaf11996d350f6f65c1e809

7 years agoresolve merge conflicts of 9cc7ebe to stage-aosp-master
Marie Janssen [Thu, 29 Dec 2016 20:16:34 +0000 (12:16 -0800)]
resolve merge conflicts of 9cc7ebe to stage-aosp-master

Change-Id: Ia1cdf49d77a574c38ed5cc33c31d5cf930103484

7 years agoMerge "Disallow entering PiP without dismissing keyguard."
TreeHugger Robot [Thu, 29 Dec 2016 20:29:41 +0000 (20:29 +0000)]
Merge "Disallow entering PiP without dismissing keyguard."

7 years agoMerge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d am: e11c3f6657
Ivan Podogov [Thu, 29 Dec 2016 20:10:00 +0000 (20:10 +0000)]
Merge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d am: e11c3f6657
am: c7fad3b056

Change-Id: Id6695de96ad887fa979b5ffa89d42b44890cd96e

7 years agoNew AudioAttributes usage for "assistant" use case
Jean-Michel Trivi [Thu, 29 Dec 2016 18:33:29 +0000 (10:33 -0800)]
New AudioAttributes usage for "assistant" use case

Define USAGE_ASSISTANT for new use cases involving audio help,
  query responses and more.

Test: make offline-sdk-docs
Bug: 30947943

Change-Id: Idf93ce4c0f014dbc9b491244cbad9e643cc03413

7 years agoRename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f4...
Ivan Podogov [Thu, 29 Dec 2016 20:08:38 +0000 (20:08 +0000)]
Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499 am: 91ab2e2f98
am: 48738f5ad0

Change-Id: I15651c5a6e3baf53d915626ea6c55180fefe28b5

7 years agoBluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9 am: 1ee22b7f70
Hemant Gupta [Thu, 29 Dec 2016 20:07:51 +0000 (20:07 +0000)]
Bluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9 am: 1ee22b7f70
am: a9c92c2442

Change-Id: I56625e00b1b6c2b7b11e4ce4dc3038072ef6c231

7 years agoMerge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d
Ivan Podogov [Thu, 29 Dec 2016 20:00:52 +0000 (20:00 +0000)]
Merge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d
am: e11c3f6657

Change-Id: Ie63297ebe01de04c6e40c2ddae616c8d5c70a025

7 years agoRename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499
Ivan Podogov [Thu, 29 Dec 2016 20:00:09 +0000 (20:00 +0000)]
Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499
am: 91ab2e2f98

Change-Id: If0e072e96491020191a7742928cc90adff151342

7 years agoBluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9
Hemant Gupta [Thu, 29 Dec 2016 19:59:28 +0000 (19:59 +0000)]
Bluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9
am: 1ee22b7f70

Change-Id: Ia82f834d4d2ad800574bb0317f4fb3b3786972fc

7 years agoMerge "Make methods for Tile content provider data public."
Shahriyar Amini [Thu, 29 Dec 2016 19:56:26 +0000 (19:56 +0000)]
Merge "Make methods for Tile content provider data public."

7 years agoMerge changes from topic 'HID-Client' am: 8a74d0440c
Ivan Podogov [Thu, 29 Dec 2016 19:47:47 +0000 (19:47 +0000)]
Merge changes from topic 'HID-Client' am: 8a74d0440c
am: 59d63e8b1d

Change-Id: I73dc7aa098c0a4cb4c58371088c2aa0661ecdc41

7 years agoRename the Bluetooth profile classes for HID Device role. am: 0afe190af5
Ivan Podogov [Thu, 29 Dec 2016 19:46:55 +0000 (19:46 +0000)]
Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5
am: 94e3d3f499

Change-Id: I97ff93fd2564bd76d90095f8086f79c6c6086aff

7 years agoBluetooth: Add support for HID Device Role am: e88fd4b594
Hemant Gupta [Thu, 29 Dec 2016 19:46:08 +0000 (19:46 +0000)]
Bluetooth: Add support for HID Device Role am: e88fd4b594
am: ee469c6fe9

Change-Id: Ic48911d254671d402f5a6b8198109f28e6497036

7 years agoMerge changes from topic 'HID-Client'
Ivan Podogov [Thu, 29 Dec 2016 19:39:07 +0000 (19:39 +0000)]
Merge changes from topic 'HID-Client'
am: 8a74d0440c

Change-Id: I6a541011024253f7b7f5f5207294cf1bce60a4f0

7 years agoRename the Bluetooth profile classes for HID Device role.
Ivan Podogov [Thu, 29 Dec 2016 19:38:41 +0000 (19:38 +0000)]
Rename the Bluetooth profile classes for HID Device role.
am: 0afe190af5

Change-Id: Ib5c9b904da57048d719df504142edd3dab0e6ec3

7 years agoBluetooth: Add support for HID Device Role
Hemant Gupta [Thu, 29 Dec 2016 19:37:58 +0000 (19:37 +0000)]
Bluetooth: Add support for HID Device Role
am: e88fd4b594

Change-Id: Ic2a82d5670ffbd3046766d73ed9b180546c59169