OSDN Git Service
Sanket Padawe [Tue, 23 Aug 2016 16:31:03 +0000 (16:31 +0000)]
Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am:
0cc68dbf29" into cw-f-dev
am:
eaef72bda5
Change-Id: I198374fa6d7f13f827a83a687b132308e4739068
Sanket Padawe [Tue, 23 Aug 2016 16:30:59 +0000 (16:30 +0000)]
If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am:
0cc68dbf29
am:
e8a2c5c331
Change-Id: Ifa503d0b899bc1ad19c5365eb561d2ebeac5ee15
Adam Seaton [Tue, 23 Aug 2016 16:30:51 +0000 (16:30 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am:
ad1008d089 -s ours am:
aad9147dca -s ours" into cw-f-dev
am:
05f0dd1ed3 -s ours
Change-Id: Ie78d2d8efb76649106c9aa6306285a01408e018c
Adam Seaton [Tue, 23 Aug 2016 16:30:47 +0000 (16:30 +0000)]
Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am:
ad1008d089 -s ours am:
aad9147dca -s ours
am:
7eaccf8e79 -s ours
Change-Id: I8535594105bc3a8001c5967e5b97bda8eedbda8c
Andy Hung [Tue, 23 Aug 2016 16:19:31 +0000 (16:19 +0000)]
Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am:
05a1df9967 -s ours am:
33a04f8333 -s ours" into cw-f-dev
am:
e8b0a5a01a -s ours
Change-Id: I73640af5d3b79919c61c1d39641be7f83d8423a4
Andy Hung [Tue, 23 Aug 2016 16:19:28 +0000 (16:19 +0000)]
DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am:
05a1df9967 -s ours am:
33a04f8333 -s ours
am:
228a63ffac -s ours
Change-Id: I5e9fef59dfeec9aa871e16be160d79f17ec76a61
Adam Seaton [Tue, 23 Aug 2016 16:19:20 +0000 (16:19 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am:
0f1e7ab1d3 -s ours am:
fcd16254c6 -s ours" into cw-f-dev
am:
44fc86b8b8 -s ours
Change-Id: Id369b6061f8e6abd5b07eccc87b48ead1236a1ac
Adam Seaton [Tue, 23 Aug 2016 16:19:16 +0000 (16:19 +0000)]
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am:
0f1e7ab1d3 -s ours am:
fcd16254c6 -s ours
am:
b9475468f5 -s ours
Change-Id: I08187baf768d319a768bf5f5f8d25759356c416e
George Mount [Tue, 23 Aug 2016 16:19:09 +0000 (16:19 +0000)]
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am:
c9373e5505 -s ours am:
27d769e3b0 -s ours" into cw-f-dev
am:
986912ee69 -s ours
Change-Id: I35565278f999f97bf2ffd9e2ba6d197152fa20e5
George Mount [Tue, 23 Aug 2016 16:19:06 +0000 (16:19 +0000)]
DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am:
c9373e5505 -s ours am:
27d769e3b0 -s ours
am:
c9ec6286d1 -s ours
Change-Id: I7f36727b27a5e2405919002eaed80d96d51b04c4
Todd Kennedy [Tue, 23 Aug 2016 16:19:00 +0000 (16:19 +0000)]
Merge "DO NOT MERGE ANYWHERE: Release mPackages lock earlier am:
bab7c28e5e -s ours am:
655932af79 -s ours" into cw-f-dev
am:
dbb5845378 -s ours
Change-Id: I247bf8ea05320da5fed80f3214023c5415d1b639
Todd Kennedy [Tue, 23 Aug 2016 16:18:57 +0000 (16:18 +0000)]
DO NOT MERGE ANYWHERE: Release mPackages lock earlier am:
bab7c28e5e -s ours am:
655932af79 -s ours
am:
915771e5b6 -s ours
Change-Id: Iea1104733af8cb5c779c6d6c690d8322fa26e462
Dirk Dougherty [Tue, 23 Aug 2016 16:18:51 +0000 (16:18 +0000)]
Merge "Doc change: updates for final N landing page and related resources. am:
b0ca00431f am:
b78a9bc5fe am:
1dba7ddf3a" into cw-f-dev
am:
4e421445b0
Change-Id: I14ae49bce2dad03dd334a11b4f20f1c0a785bd0a
Dirk Dougherty [Tue, 23 Aug 2016 16:18:47 +0000 (16:18 +0000)]
Doc change: updates for final N landing page and related resources. am:
b0ca00431f am:
b78a9bc5fe am:
1dba7ddf3a
am:
643dcbda88
Change-Id: Ie212b1dafd3851a28d66937eded2bcbbf44adc1d
David Friedman [Tue, 23 Aug 2016 16:13:56 +0000 (16:13 +0000)]
Merge "Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am:
410ae5b004 am:
e5036b3cab am:
d6ad4f051e" into cw-f-dev
am:
5d653c4771
Change-Id: I81255bcdec7563b1fe9d9ea05bca67cf4a47e291
David Friedman [Tue, 23 Aug 2016 16:13:52 +0000 (16:13 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am:
410ae5b004 am:
e5036b3cab am:
d6ad4f051e
am:
af09673c38
Change-Id: I6ba0266c785d2a58ed14f83da6f029b017846a23
David Friedman [Tue, 23 Aug 2016 16:13:42 +0000 (16:13 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page. am:
cbaf3f9986 am:
2663c419c0 am:
7208e94355" into cw-f-dev
am:
b0da43c8f2
Change-Id: I0fbbec474de26929e796de7fc6324389764ac923
David Friedman [Tue, 23 Aug 2016 16:13:38 +0000 (16:13 +0000)]
Docs: Adding information to Building-for-Billions landing page. am:
cbaf3f9986 am:
2663c419c0 am:
7208e94355
am:
904fa00b3e
Change-Id: I1d6ae6a7d94f7e3f70af8c5aed16695c21c7012e
David Friedman [Tue, 23 Aug 2016 16:13:24 +0000 (16:13 +0000)]
Merge "Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am:
162a0005ac am:
c02c6b8fb0 am:
32d77972d5" into cw-f-dev
am:
9242f396a6
Change-Id: I1df2dbef9fa18c2a8f89ef9d5f79c87fb1d248ec
David Friedman [Tue, 23 Aug 2016 16:13:19 +0000 (16:13 +0000)]
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am:
162a0005ac am:
c02c6b8fb0 am:
32d77972d5
am:
a655fe6c9d
Change-Id: I5258c60de002434672ebc7969c426edd548a0c34
Julius D'souza [Tue, 23 Aug 2016 16:13:01 +0000 (16:13 +0000)]
Merge "DO NOT MERGE: Add dynamic illuminance hysteresis support" into cw-f-dev
am:
529beb2cc5
Change-Id: Icdb0a74c9b11aad86b20250dd67e74627a95dbf5
Julius D'souza [Tue, 23 Aug 2016 16:12:51 +0000 (16:12 +0000)]
DO NOT MERGE: Add dynamic illuminance hysteresis support
am:
043a57186a
Change-Id: I08c0e87bcbba1964301e53ad0c9615c1e0e5a66d
David Friedman [Tue, 23 Aug 2016 16:12:39 +0000 (16:12 +0000)]
Docs: Adds a redirect to make it easier to access Performance section on DAC. am:
196cb73dbb am:
f5c5eb0045 am:
5e1468cdbd
am:
b4e27c0d72
Change-Id: I167921c609d3b9535c44f3188eb1ff42016d38a5
Scott Main [Tue, 23 Aug 2016 15:56:14 +0000 (15:56 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am:
77917a835f
am:
759c2855e8
Change-Id: I4e70f6d857e76dc66e3b0d10cf9620dc62937b0b
smain@google.com [Tue, 23 Aug 2016 15:56:11 +0000 (15:56 +0000)]
add workaround for annotations dependency conflict with espresso am:
eee3518d11
am:
b5971ef610
Change-Id: Ie4f93ff85ad67fb048460a49937cbf55db575262
Scott Main [Tue, 23 Aug 2016 15:47:18 +0000 (15:47 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
am:
77917a835f
Change-Id: Id3b88a94a23de579c20757f038dd83c0645e67bc
smain@google.com [Tue, 23 Aug 2016 15:47:14 +0000 (15:47 +0000)]
add workaround for annotations dependency conflict with espresso
am:
eee3518d11
Change-Id: I8a609f9f542e2955efe333c13c065e00836c87ab
Jim Miller [Tue, 23 Aug 2016 15:47:03 +0000 (15:47 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42 am:
ddf70b9195 am:
364a51221a -s ours am:
ce0856f702 am:
41d1827fd3 am:
a7025c283c
am:
547d52ca3f
Change-Id: I1776f6daaa1b7f2fd7301bfbb3686357acb413da
Jim Miller [Tue, 23 Aug 2016 15:46:59 +0000 (15:46 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991 am:
85c390e9fb -s ours am:
f159feff98 am:
ade6f4df5b am:
634aafc181
am:
0063bf03c9
Change-Id: I08f2820b4d3df2f01b085799b1dce9693f740a2d
Sudheer Shanka [Tue, 23 Aug 2016 15:46:52 +0000 (15:46 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9 am:
58def3804c -s ours am:
e49de5e073 am:
105453e170 am:
8887e258a9
am:
3cf87ce75e
Change-Id: I69bd46bc44c512ce09370116a5d75bcfd08e495b
Amith Yamasani [Tue, 23 Aug 2016 15:46:46 +0000 (15:46 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365 am:
5841c492a7 -s ours am:
f705730667 am:
d09a6aa0f0 am:
110bd114a8
am:
7136384209
Change-Id: I64227c17513e70615bd7e544e1e3e00fa38555e5
Sudheer Shanka [Tue, 23 Aug 2016 15:46:39 +0000 (15:46 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am:
badc5cd942 am:
f1e0a4a60c am:
3cf8ad97d0
am:
80533d81bd
Change-Id: Ia237d5a56a46cfd6d968f0d88989fdaeae10d792
Scott Main [Tue, 23 Aug 2016 15:42:01 +0000 (15:42 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
Amith Yamasani [Tue, 23 Aug 2016 15:35:10 +0000 (15:35 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
55eacb9441 am:
ac9bb3886d am:
250a509a68
am:
9b3f1e26e0
Change-Id: I72b1878607419e2374e15cd5e6b23b5fdec335fe
Svetoslav Ganov [Tue, 23 Aug 2016 15:34:59 +0000 (15:34 +0000)]
Add resource based mechanism to grant default permissions am:
d44d46aa50 am:
fb53efd8f3
am:
eb36e353a6
Change-Id: I9b635e29e7707e03952adf2d657e275eb81147e0
Rob Carr [Tue, 23 Aug 2016 15:34:50 +0000 (15:34 +0000)]
Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev am:
7ae506260e
am:
f40e1533b5
Change-Id: Ide42f202a2bd4ae30e7bc7a8471818751e9962b9
Robert Carr [Tue, 23 Aug 2016 15:34:42 +0000 (15:34 +0000)]
Only allow focused window to select seamless rotation. am:
828ec3dc51
am:
d2bacdaf6d
Change-Id: I1c3a083f34c224f04343cbd1ae390068c686cde8
Dianne Hackborn [Tue, 23 Aug 2016 15:34:34 +0000 (15:34 +0000)]
Merge "Fix issue #
30929080: Default Assist app is set to None..." into nyc-mr1-dev am:
d6ece3e175
am:
ddca04dcbe
Change-Id: Idefe2cc12a7ad4f79ead642bd041bdd09033d7b3
Dianne Hackborn [Tue, 23 Aug 2016 15:25:00 +0000 (15:25 +0000)]
Fix issue #
30929080: Default Assist app is set to None... am:
e9563659a5
am:
5cb766a9cd
Change-Id: Ida55c001bd6f4ec0be8235b88fb806a617ed15cc
Todd Kennedy [Tue, 23 Aug 2016 15:24:57 +0000 (15:24 +0000)]
Merge "Allow permission group updates" into nyc-mr1-dev am:
ee2df0390e
am:
a09f3f28ef
Change-Id: I2ef7ea000d0cc65becb40a8ecdd9d1859758c944
Todd Kennedy [Tue, 23 Aug 2016 15:24:53 +0000 (15:24 +0000)]
Allow permission group updates am:
21bd9b824f
am:
873b0f563e
Change-Id: I387ffcb88341a112ff8a1aff3b38b32b4b65e382
Todd Kennedy [Tue, 23 Aug 2016 15:24:48 +0000 (15:24 +0000)]
Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev am:
0060d6eda1
am:
5cc6bf0ead
Change-Id: If8de2f5e7751ec1e65b7bdb499ecde0037fbec9b
Todd Kennedy [Tue, 23 Aug 2016 15:24:44 +0000 (15:24 +0000)]
Don't call into pkg mgr svc w/ lock held am:
f29d07a62a
am:
76a12e177c
Change-Id: Ic1f21fd64990a282375be7709aba79297c9dd6f9
Tenghui Zhu [Tue, 23 Aug 2016 15:15:16 +0000 (15:15 +0000)]
Merge "Correctly report the transparent region" into nyc-mr1-dev am:
f05765e3c4
am:
52feb6b956
Change-Id: I746a21537ec34285fda505a5919740ab04693b3d
Teng-Hui Zhu [Tue, 23 Aug 2016 15:15:06 +0000 (15:15 +0000)]
Correctly report the transparent region am:
f8da30dc65
am:
94a2f7e6fd
Change-Id: Ice979b549a74f1e8e59210f2b7c7e5a6f141b9f6
Salvador Martinez [Tue, 23 Aug 2016 15:14:54 +0000 (15:14 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am:
09b64ade22
am:
0c216301b6
Change-Id: Ic534d6c68c3b43d7b9bd811e257abb695d7c1874
Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:37 +0000 (15:14 +0000)]
Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am:
0cc68dbf29" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:20 +0000 (15:14 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am:
ad1008d089 -s ours am:
aad9147dca -s ours" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:03 +0000 (15:14 +0000)]
Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am:
05a1df9967 -s ours am:
33a04f8333 -s ours" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:13:45 +0000 (15:13 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am:
0f1e7ab1d3 -s ours am:
fcd16254c6 -s ours" into cw-f-dev
Salvador Martinez [Tue, 23 Aug 2016 15:13:37 +0000 (15:13 +0000)]
Prevent wifi icon from disappearing am:
823cd0e35a
am:
aebce41a88
Change-Id: Ic05c1f77725904011e3cf5db44accb7c9847eefa
Android Build Merger (Role) [Tue, 23 Aug 2016 15:13:26 +0000 (15:13 +0000)]
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am:
c9373e5505 -s ours am:
27d769e3b0 -s ours" into cw-f-dev
Rob Carr [Tue, 23 Aug 2016 15:13:04 +0000 (15:13 +0000)]
Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev am:
b19915bea8
am:
b97dc0a5a8
Change-Id: I3d27d8ae4e25fdb1977e6c57ee02aa80b3a8a4ef
Sanket Padawe [Tue, 23 Aug 2016 15:12:29 +0000 (15:12 +0000)]
If Vodafone Italy sim is in Spain consider it as roaming on Spain nw.
am:
0cc68dbf29
Change-Id: I2aa45f5db13bc867a23663a14ab6330285a6e872
Adam Seaton [Tue, 23 Aug 2016 15:12:26 +0000 (15:12 +0000)]
Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am:
ad1008d089 -s ours
am:
aad9147dca -s ours
Change-Id: I7e5040b8246458a5a24afa28fec9469a4b223652
Andy Hung [Tue, 23 Aug 2016 15:12:25 +0000 (15:12 +0000)]
DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am:
05a1df9967 -s ours
am:
33a04f8333 -s ours
Change-Id: I123cf216c3654a4572d64400b91265f956d53ac7
Adam Seaton [Tue, 23 Aug 2016 15:12:23 +0000 (15:12 +0000)]
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am:
0f1e7ab1d3 -s ours
am:
fcd16254c6 -s ours
Change-Id: Iff2337eeb9148078fc5f2774d5c72dbd39360fec
George Mount [Tue, 23 Aug 2016 15:12:22 +0000 (15:12 +0000)]
DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am:
c9373e5505 -s ours
am:
27d769e3b0 -s ours
Change-Id: Ie414fbc28d07642febe6c6dcf2e30283fbc802c0
Android Build Merger (Role) [Tue, 23 Aug 2016 15:11:05 +0000 (15:11 +0000)]
Merge "DO NOT MERGE ANYWHERE: Release mPackages lock earlier am:
bab7c28e5e -s ours am:
655932af79 -s ours" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:49 +0000 (15:10 +0000)]
Merge "Doc change: updates for final N landing page and related resources. am:
b0ca00431f am:
b78a9bc5fe am:
1dba7ddf3a" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:33 +0000 (15:10 +0000)]
Merge "Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am:
410ae5b004 am:
e5036b3cab am:
d6ad4f051e" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:22 +0000 (15:10 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page. am:
cbaf3f9986 am:
2663c419c0 am:
7208e94355" into cw-f-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:09 +0000 (15:10 +0000)]
Merge "Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am:
162a0005ac am:
c02c6b8fb0 am:
32d77972d5" into cw-f-dev
Todd Kennedy [Tue, 23 Aug 2016 15:09:17 +0000 (15:09 +0000)]
DO NOT MERGE ANYWHERE: Release mPackages lock earlier am:
bab7c28e5e -s ours
am:
655932af79 -s ours
Change-Id: If5e283f29ca14e7eb7d2dbf7edefe3f5a2be4223
Dirk Dougherty [Tue, 23 Aug 2016 15:09:15 +0000 (15:09 +0000)]
Doc change: updates for final N landing page and related resources. am:
b0ca00431f am:
b78a9bc5fe
am:
1dba7ddf3a
Change-Id: I21b0522b626433fa932618092b97f42acf108f6d
David Friedman [Tue, 23 Aug 2016 15:09:12 +0000 (15:09 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am:
410ae5b004 am:
e5036b3cab
am:
d6ad4f051e
Change-Id: Ic8ad057a85b59e3140881b4deccfb0c0add24960
David Friedman [Tue, 23 Aug 2016 15:09:10 +0000 (15:09 +0000)]
Docs: Adding information to Building-for-Billions landing page. am:
cbaf3f9986 am:
2663c419c0
am:
7208e94355
Change-Id: I04ef62e6851ee429fbc2607beb54a54b6a4120a4
Julius D'souza [Tue, 23 Aug 2016 15:09:08 +0000 (15:09 +0000)]
Merge "DO NOT MERGE: Add dynamic illuminance hysteresis support" into cw-f-dev
David Friedman [Tue, 23 Aug 2016 15:09:07 +0000 (15:09 +0000)]
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am:
162a0005ac am:
c02c6b8fb0
am:
32d77972d5
Change-Id: Iccae3409ae8a7797ebd8ffa67aad496f51a890c7
Tenghui Zhu [Tue, 23 Aug 2016 15:03:39 +0000 (15:03 +0000)]
Merge "Update the javaDoc for VectorDrawable and AnimatedVectorDrawable" into nyc-mr1-dev am:
5cb0c13f76
am:
d4f839c477
Change-Id: Iba7c42c3284b1b4b8c3df90c82ce24723d3dfba3
Teng-Hui Zhu [Tue, 23 Aug 2016 15:03:33 +0000 (15:03 +0000)]
Update the javaDoc for VectorDrawable and AnimatedVectorDrawable am:
d64255f61d
am:
1c06a4dcc7
Change-Id: I936e99996d2b075d4c7ec12b7ed45dffd814e60c
Fan Zhang [Tue, 23 Aug 2016 15:03:29 +0000 (15:03 +0000)]
Merge "Update navup button content description when it's menu." into nyc-mr1-dev am:
bf1d4cae3b
am:
ab19598584
Change-Id: I51685602784ced9309d338c3864ef7b45d751a3f
Fan Zhang [Tue, 23 Aug 2016 15:03:24 +0000 (15:03 +0000)]
Update navup button content description when it's menu. am:
c10db985f3
am:
17dc1ad151
Change-Id: I8914aa451a545ba1e6f9999eec9deaedbf796e80
Steve McKay [Tue, 23 Aug 2016 15:03:19 +0000 (15:03 +0000)]
Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev am:
8499c13740
am:
a902d61eb6
Change-Id: I2940f8700c71a29ded2a68d43a3845e03e0b7c4e
David Friedman [Tue, 23 Aug 2016 15:00:17 +0000 (15:00 +0000)]
Docs: Adds a redirect to make it easier to access Performance section on DAC. am:
196cb73dbb am:
f5c5eb0045
am:
5e1468cdbd
Change-Id: I5e81ab82e8e3e9c321b57d31333c4a40283e86ba
Jim Miller [Tue, 23 Aug 2016 15:00:15 +0000 (15:00 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42 am:
ddf70b9195 am:
364a51221a -s ours am:
ce0856f702 am:
41d1827fd3
am:
a7025c283c
Change-Id: Id53a357acd6b5ac900963d216aaf441471991f3a
Jim Miller [Tue, 23 Aug 2016 15:00:13 +0000 (15:00 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991 am:
85c390e9fb -s ours am:
f159feff98 am:
ade6f4df5b
am:
634aafc181
Change-Id: I17a1313244d56f6e416f5a0252ee3f6681e19763
Sudheer Shanka [Tue, 23 Aug 2016 15:00:11 +0000 (15:00 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9 am:
58def3804c -s ours am:
e49de5e073 am:
105453e170
am:
8887e258a9
Change-Id: Ic9dfa00be5c10ab4d09e55587fa25f8b88c0bbe2
Amith Yamasani [Tue, 23 Aug 2016 15:00:08 +0000 (15:00 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365 am:
5841c492a7 -s ours am:
f705730667 am:
d09a6aa0f0
am:
110bd114a8
Change-Id: Ia23820f580ae6fd4345e6fe4bd844b33e2459907
Steve McKay [Tue, 23 Aug 2016 14:57:14 +0000 (14:57 +0000)]
Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev am:
8499c13740
am:
477c383cea
Change-Id: I876dfc2a08d3890ea02eb943c40d4769f5cf5e8a
Steve McKay [Tue, 23 Aug 2016 14:57:04 +0000 (14:57 +0000)]
DO NOT MERGE: Treat unknown tooltype as touch. am:
0c28f3bda3
am:
6c06272a12
Change-Id: Ie67b77b846c2bdc7655970c23beb725ae9adc70d
Sungmin Choi [Tue, 23 Aug 2016 14:56:56 +0000 (14:56 +0000)]
Merge "telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network" into nyc-mr1-dev am:
156d897f2e
am:
9d5514c81a
Change-Id: Ib72e47eaa6b9d7e5fa08f9df6c3b93c161d149a5
Sungmin Choi [Tue, 23 Aug 2016 14:56:52 +0000 (14:56 +0000)]
telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network am:
fd80d5482a
am:
c461691675
Change-Id: I793a3fe8baf60cdc29493c8cb9623d79a79bc120
Sanket Padawe [Tue, 23 Aug 2016 14:56:48 +0000 (14:56 +0000)]
Merge "Fix roam icon issues in Austria" into nyc-mr1-dev am:
914354f334
am:
f3f5022a7f
Change-Id: I12a8728a854d9b998c42ffa4c945b8b9ac2aa925
Sungmin Choi [Tue, 23 Aug 2016 14:53:52 +0000 (14:53 +0000)]
Fix roam icon issues in Austria am:
f8912fc489
am:
d1c8ab5566
Change-Id: I4827213efac41fa215c7096e666328b58d127e2e
Chong Zhang [Tue, 23 Aug 2016 14:53:39 +0000 (14:53 +0000)]
Merge "Make sure surface control is really valid before giving it to client" into nyc-mr1-dev am:
f9f8e82045
am:
ac2c6b307e
Change-Id: I333cf8facd448ac3993713bdd315841c7d249a0b
Chong Zhang [Tue, 23 Aug 2016 14:53:29 +0000 (14:53 +0000)]
Make sure surface control is really valid before giving it to client am:
7581cddf25
am:
d3edf1e799
Change-Id: I25cb7bb6a3f87795af75d637bf98b682197f3627
Raph Levien [Tue, 23 Aug 2016 14:53:16 +0000 (14:53 +0000)]
Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev am:
e7ab3e1650
am:
ddc50bb7d9
Change-Id: I8d78147b79e57a69dac679f4e571f3dc815932b1
Raph Levien [Tue, 23 Aug 2016 14:53:06 +0000 (14:53 +0000)]
Update lint check to accommodate new emoji sequences am:
0790ac68bc
am:
b1581dbbfd
Change-Id: I17b2989e1ee0477991705d15e0324a449da69c1a
Sudheer Shanka [Tue, 23 Aug 2016 14:51:45 +0000 (14:51 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am:
badc5cd942 am:
f1e0a4a60c
am:
3cf8ad97d0
Change-Id: Ibf31e9162d42caa24f9f79b934a461925c194589
Amith Yamasani [Tue, 23 Aug 2016 14:51:43 +0000 (14:51 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
55eacb9441 am:
ac9bb3886d
am:
250a509a68
Change-Id: Ic5ed2c9b3b6f7779d59176db169c390a8762cd1b
Svetoslav Ganov [Tue, 23 Aug 2016 14:51:41 +0000 (14:51 +0000)]
Add resource based mechanism to grant default permissions am:
d44d46aa50
am:
fb53efd8f3
Change-Id: I734a4186b92c4dfed45c0269b6d2419e7971e802
Rob Carr [Tue, 23 Aug 2016 14:51:39 +0000 (14:51 +0000)]
Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev
am:
7ae506260e
Change-Id: I0b1d7c270c421bc1ec77d87b3ed74aa5f27a7b6b
Robert Carr [Tue, 23 Aug 2016 14:51:37 +0000 (14:51 +0000)]
Only allow focused window to select seamless rotation.
am:
828ec3dc51
Change-Id: I617dbf02a81a004a38ec3b1da1381ae0497f64ba
Dianne Hackborn [Tue, 23 Aug 2016 14:51:33 +0000 (14:51 +0000)]
Merge "Fix issue #
30929080: Default Assist app is set to None..." into nyc-mr1-dev
am:
d6ece3e175
Change-Id: Ic07c8b9212422afca01e28682608c577594d5931
Dianne Hackborn [Tue, 23 Aug 2016 14:51:30 +0000 (14:51 +0000)]
Fix issue #
30929080: Default Assist app is set to None...
am:
e9563659a5
Change-Id: I738c1126ffbffaa904e7d4533347a218a0ccecdd
Todd Kennedy [Tue, 23 Aug 2016 14:46:29 +0000 (14:46 +0000)]
Merge "Allow permission group updates" into nyc-mr1-dev
am:
ee2df0390e
Change-Id: I1c88a2863ddb2a60d94a5a84d49103789b849d42
Todd Kennedy [Tue, 23 Aug 2016 14:46:25 +0000 (14:46 +0000)]
Allow permission group updates
am:
21bd9b824f
Change-Id: I8f938705b6f25b2bd53410f5b496191ec2784a9c
Todd Kennedy [Tue, 23 Aug 2016 14:46:18 +0000 (14:46 +0000)]
Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev
am:
0060d6eda1
Change-Id: Ia8fb43fceea7f13a035a719a969e833b45e99408
Todd Kennedy [Tue, 23 Aug 2016 14:46:12 +0000 (14:46 +0000)]
Don't call into pkg mgr svc w/ lock held
am:
f29d07a62a
Change-Id: Iffd22d7e33a0870236576033658d420c22426b97