OSDN Git Service
Michael Wright [Mon, 12 Sep 2016 18:24:47 +0000 (19:24 +0100)]
DO NOT MERGE Track generics in API definition.
Bug:
24265043
Change-Id: I2f51d5b914ef4aa66a973db4765da117385e3bfb
Mark Renouf [Mon, 12 Sep 2016 13:52:40 +0000 (13:52 +0000)]
Merge "Mark 'candidates_style' as not translatable" into nyc-mr1-dev
Lorenzo Colitti [Mon, 12 Sep 2016 13:30:19 +0000 (13:30 +0000)]
Merge changes I40f73526,Ia08900c5 into nyc-mr1-dev
* changes:
Add a background NetworkRequest type for mobile data always on.
Rematch requests first and listens second.
Hugo Benichi [Mon, 12 Sep 2016 03:29:13 +0000 (03:29 +0000)]
Merge "Better IPv4 multicast coverage in ApfTest" into nyc-mr1-dev
Eric Laurent [Sat, 10 Sep 2016 01:36:46 +0000 (01:36 +0000)]
Merge "Disable selecting the default audio route when a BT route is avaiable" into nyc-mr1-dev
Eric Laurent [Sat, 10 Sep 2016 01:36:46 +0000 (01:36 +0000)]
Merge "AudioService: remove deprecated forcing of A2DP off" into nyc-mr1-dev
TreeHugger Robot [Sat, 10 Sep 2016 01:28:58 +0000 (01:28 +0000)]
Merge "Enable Bluetooth by default" into nyc-mr1-dev
Sungsoo [Sat, 10 Sep 2016 00:55:29 +0000 (00:55 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246 am:
8ec076623b am:
89e328770d am:
d98163c7a6 -s ours am:
054d2931a0
am:
2e0df412a4
Change-Id: I6624b51ec3f8efdd8d818d7a48719dd5f7395c8d
Sungsoo [Sat, 10 Sep 2016 00:47:31 +0000 (00:47 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246 am:
8ec076623b am:
89e328770d am:
d98163c7a6 -s ours
am:
054d2931a0
Change-Id: I0aebc68249c6ef4a1b00106c9add74e8a616ce3b
Svetoslav Ganov [Sat, 10 Sep 2016 00:36:20 +0000 (00:36 +0000)]
Merge "[DO NOT MERGE] Don't show account access request UI until app launched." into nyc-mr1-dev
Sungsoo [Sat, 10 Sep 2016 00:30:22 +0000 (00:30 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246 am:
8ec076623b am:
89e328770d
am:
d98163c7a6 -s ours
Change-Id: Iaa9d3a28872d990cb5196086f9deaaa1d03336cc
Sungsoo [Sat, 10 Sep 2016 00:23:00 +0000 (00:23 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours am:
14bc23be74 am:
2418ef1313 am:
e5d9dc7eac am:
0c476fac30 -s ours am:
0a7a489ce8
am:
fc939bbf58
Change-Id: I695d46de2206e93c89ed57b53ef6000b373b37ca
Sungsoo [Sat, 10 Sep 2016 00:22:56 +0000 (00:22 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246 am:
8ec076623b
am:
89e328770d
Change-Id: I400b511b84f599ea05fb33a5db5dbc8da2c031b0
TreeHugger Robot [Sat, 10 Sep 2016 00:18:48 +0000 (00:18 +0000)]
Merge "Fix SearchView measure for UNSPECIFIED height." into nyc-mr1-dev
Sungsoo [Sat, 10 Sep 2016 00:11:49 +0000 (00:11 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours am:
14bc23be74 am:
2418ef1313 am:
e5d9dc7eac am:
0c476fac30 -s ours
am:
0a7a489ce8
Change-Id: Ibbfb8af3ac7fa101e701a84ab6216cb40d2b2895
Sungsoo [Sat, 10 Sep 2016 00:11:48 +0000 (00:11 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246
am:
8ec076623b
Change-Id: Iee2ca5301d261552694bf7dfcc324730e0b967f4
Sungsoo [Sat, 10 Sep 2016 00:11:40 +0000 (00:11 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours am:
aa1d75f5e7 am:
e9a7225bf2 am:
bf62cbb95e am:
e38a89dfb8 -s ours am:
ebeb3a9d3c
am:
d498ae3c3c
Change-Id: Ibad910a05ae2a3a11775515a7e5c48f0ff79406f
TreeHugger Robot [Sat, 10 Sep 2016 00:04:24 +0000 (00:04 +0000)]
Merge "[DO NOT MERGE] Backup account access grants" into nyc-mr1-dev
Sungsoo [Sat, 10 Sep 2016 00:03:45 +0000 (00:03 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours am:
aa1d75f5e7 am:
e9a7225bf2 am:
bf62cbb95e am:
e38a89dfb8 -s ours
am:
ebeb3a9d3c
Change-Id: I189567da8bef8664239cbc667397130beb04319d
Sungsoo [Sat, 10 Sep 2016 00:03:23 +0000 (00:03 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours
am:
deeb0e5246
Change-Id: Ica5ffed73e58ea429c88e52551e69ac39938c46c
Sungsoo [Sat, 10 Sep 2016 00:02:18 +0000 (00:02 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours am:
14bc23be74 am:
2418ef1313 am:
e5d9dc7eac
am:
0c476fac30 -s ours
Change-Id: Ibe1f7b4ad4dbdfdbad56f806928e4aec1d6ffe79
Sungsoo [Fri, 9 Sep 2016 23:50:55 +0000 (23:50 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours am:
aa1d75f5e7 am:
e9a7225bf2 am:
bf62cbb95e
am:
e38a89dfb8 -s ours
Change-Id: I05536b488f67ccee7ceeb2bcde5f3bb50985e3e1
Sungsoo Lim [Fri, 9 Sep 2016 23:50:50 +0000 (23:50 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am:
987472290c am:
bcc0e5a7ab am:
883a724193 am:
ba9aa89cfe -s ours am:
034401cfaf
am:
4443c42d7d
Change-Id: Iac823ef7d5c21d956760dfeac8c484db1a6a5ab1
Sungsoo [Fri, 9 Sep 2016 23:50:47 +0000 (23:50 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc am:
865bf88813 am:
45e14ffec6 am:
5906630ad7 -s ours am:
85446272d3
am:
4098d6507f
Change-Id: Id98427978d37dcee69a3ecd63c70f638ce93687c
Sungsoo [Fri, 9 Sep 2016 23:50:46 +0000 (23:50 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0
am:
2ddc2956fd -s ours
Change-Id: Ie0a7dad2ed06124a537077f8fb85c95bc1d49781
Sungsoo [Fri, 9 Sep 2016 23:50:39 +0000 (23:50 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours am:
14bc23be74 am:
2418ef1313
am:
e5d9dc7eac
Change-Id: Ibf5e67c94ab6442b3e7d3e069d021fa83d424771
Sungsoo Lim [Fri, 9 Sep 2016 23:46:11 +0000 (23:46 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am:
987472290c am:
bcc0e5a7ab am:
883a724193 am:
ba9aa89cfe -s ours
am:
034401cfaf
Change-Id: I48a8d054110bfbf7f3e7b6b2e5829bfabd8f6133
Sungsoo [Fri, 9 Sep 2016 23:46:07 +0000 (23:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e
am:
40d3c1a7f0
Change-Id: I491d585b91c7d7b130bbfbcdd62aaddf57718c56
Sungsoo [Fri, 9 Sep 2016 23:46:06 +0000 (23:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc am:
865bf88813 am:
45e14ffec6 am:
5906630ad7 -s ours
am:
85446272d3
Change-Id: I065c3361d5bf2c495243c1a5da2d5dae46f03eb8
Sungsoo [Fri, 9 Sep 2016 23:44:57 +0000 (23:44 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours am:
14bc23be74
am:
2418ef1313
Change-Id: I21056ca0c2858c4414fe3c11d70d96b9fb9a8c57
Sungsoo [Fri, 9 Sep 2016 23:44:44 +0000 (23:44 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours am:
aa1d75f5e7 am:
e9a7225bf2
am:
bf62cbb95e
Change-Id: I37df2e1008676f6a8e0c4364203ce234361bb2f0
Sungsoo [Fri, 9 Sep 2016 23:39:52 +0000 (23:39 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours
am:
14bc23be74
Change-Id: I697d8519269bcf82d47a00b9ed236bd285268261
Sungsoo Lim [Fri, 9 Sep 2016 23:38:54 +0000 (23:38 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am:
987472290c am:
bcc0e5a7ab am:
883a724193
am:
ba9aa89cfe -s ours
Change-Id: Ic85cbc0ad279e0c8e8859b066ec98638cfbd1cec
Sungsoo [Fri, 9 Sep 2016 23:38:34 +0000 (23:38 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc am:
865bf88813 am:
45e14ffec6
am:
5906630ad7 -s ours
Change-Id: If39f3ad11006c270690a6621dfa0c16d7b74e68c
Sungsoo [Fri, 9 Sep 2016 23:37:52 +0000 (23:37 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours
am:
9f37a8900e
Change-Id: Ied9ac7711abaee4d1f534d35f7882f0a93c425bf
Sungsoo [Fri, 9 Sep 2016 23:37:47 +0000 (23:37 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours am:
aa1d75f5e7
am:
e9a7225bf2
Change-Id: Ie7fa7ee8d7f4acee388ec76ae1f687c6235c955b
Sungsoo [Fri, 9 Sep 2016 23:27:21 +0000 (23:27 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e
am:
ca88e604e4 -s ours
Change-Id: Iae1ea19a96fbf9421a24b5682c4b769af95b2660
Andre Eisenbach [Wed, 7 Sep 2016 01:03:10 +0000 (18:03 -0700)]
Enable Bluetooth by default
Bug:
29446913
Change-Id: I6d42810cb3f99617b886f6c643f8c66c42c1d017
Sungsoo [Fri, 9 Sep 2016 23:08:29 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0
am:
c17e29076e
Change-Id: If6e85c284a811287a9751eb501e50dabe2dfe8b1
Sungsoo [Fri, 9 Sep 2016 23:08:29 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours
am:
f495cf6944 -s ours
Change-Id: If47c5a777ad3c7e4cca070ca633ec01442444c8e
Sungsoo [Fri, 9 Sep 2016 23:08:25 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours
am:
aa1d75f5e7
Change-Id: Ib06cad762d46ba7577a87ef19c9cfe8f83f7ba0c
Sungsoo Lim [Fri, 9 Sep 2016 23:07:52 +0000 (23:07 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am:
987472290c am:
bcc0e5a7ab
am:
883a724193
Change-Id: I3766dbd982ea51e8f7429da76bce8b9feebbfe8d
Sungsoo [Fri, 9 Sep 2016 23:07:49 +0000 (23:07 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc am:
865bf88813
am:
45e14ffec6
Change-Id: I1a6d79242b6f972dca5bb7eb6ddd37960b1cd4f9
TreeHugger Robot [Fri, 9 Sep 2016 23:03:16 +0000 (23:03 +0000)]
Merge "Remove the reference to android.support.v7.widget.Space" into nyc-mr1-dev
Sungsoo [Fri, 9 Sep 2016 23:01:41 +0000 (23:01 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef
am:
dde94fc477 -s ours
Change-Id: I301706cbdc5fd2ca56eb671891e55fd31dfa469a
Sungsoo [Fri, 9 Sep 2016 23:00:35 +0000 (23:00 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830
am:
d07324fe85 -s ours
Change-Id: Ie3049cea7663d06632b0e3139f30f01e7dba5df0
Sungsoo [Fri, 9 Sep 2016 23:00:21 +0000 (23:00 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours
am:
3af57850a0
Change-Id: I70f6b639cab68d401d3927c67192d3b89e08eee3
Sungsoo Lim [Fri, 9 Sep 2016 22:55:14 +0000 (22:55 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am:
987472290c
am:
bcc0e5a7ab
Change-Id: I03932a82253351dd46dee8bdd7e8910bd5862410
Sungsoo Lim [Fri, 9 Sep 2016 22:55:14 +0000 (22:55 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev am:
c60f995ae9
am:
6df90df83c
Change-Id: I6bd28a829dfbb5056b860c8667e17defcc632e5c
Sungsoo [Fri, 9 Sep 2016 22:55:11 +0000 (22:55 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc
am:
865bf88813
Change-Id: I1a59ad0872c98a416efa7bfc8800d65c01cea3f8
Sungsoo [Fri, 9 Sep 2016 22:55:11 +0000 (22:55 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
56ea7b4901
am:
9a420bb0f6
Change-Id: I311bf018bd114397dc1b54986aa2e8f7e7915de4
Sungsoo [Fri, 9 Sep 2016 22:54:32 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
aebe2347a7 -s ours
Change-Id: I58dd093cb10fd89e44d59867f5a4c1a378a61661
Sungsoo [Fri, 9 Sep 2016 22:54:28 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30
am:
8d3e6bd3ef
Change-Id: I83f7733039ee73407aa5d7f3848ad1074e9dfb03
Sungsoo [Fri, 9 Sep 2016 22:54:12 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953
am:
b336cce830
Change-Id: Ib90b72ce9abefc6a7ceab1070555ded45dc8567d
Sungsoo Lim [Fri, 9 Sep 2016 22:47:09 +0000 (22:47 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev
am:
987472290c
Change-Id: Ida680d7915f1774e1f4b2cf94d38c384d50c0e64
Sungsoo [Fri, 9 Sep 2016 22:47:06 +0000 (22:47 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
2ee53c82cc
Change-Id: Ifb5d9af5faae122dcd3111a83e69a218bf4e4f3f
Sungsoo Lim [Fri, 9 Sep 2016 22:46:53 +0000 (22:46 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev
am:
c60f995ae9
Change-Id: I91f906df707b351e082ba5444208ef24fb076534
Sungsoo [Fri, 9 Sep 2016 22:46:46 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
56ea7b4901
Change-Id: Iebcfced541a569bd441f45ff126075c2e87401c9
Sungsoo [Fri, 9 Sep 2016 22:46:44 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
659275dc30
Change-Id: I385c86e9753f1c99201a4f32b3c8b840da51376e
Sungsoo [Fri, 9 Sep 2016 22:46:23 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
1bdd10a953
Change-Id: I644f8187ed6f5957fc273b98c10ed0c602ed1879
Sungsoo Lim [Fri, 9 Sep 2016 22:39:20 +0000 (22:39 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev
Sungsoo Lim [Fri, 9 Sep 2016 22:39:06 +0000 (22:39 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev
Aurimas Liutikas [Fri, 9 Sep 2016 22:32:55 +0000 (15:32 -0700)]
Fix SearchView measure for UNSPECIFIED height.
Previously it would almost always force SearchView to become 0
when height mode was UNSPECIFIED.
Bug:
31302290
Change-Id: Icd2116b84951b1b967666147dbc5762d996408e6
Svet Ganov [Fri, 9 Sep 2016 03:15:55 +0000 (20:15 -0700)]
[DO NOT MERGE] Don't show account access request UI until app launched.
Sync adapters that don't have account access cannot run until
the user explicitly approves in the UI. This is spammy given
the user may not use the app right away. This change doesn't
show the notificaiton until the app has run.
bug:
31162498
Change-Id: I1f4f2d2e9426f78763590e8aa542b94d6e93e488
Fyodor Kupolov [Fri, 9 Sep 2016 21:40:58 +0000 (21:40 +0000)]
Merge "Fixed a bug with incorrect handling of onUnlockUser" into nyc-dr1-dev
am:
05918fd123
Change-Id: I94f65a46948a26260aef08af18b8e4b2a5e1f7cb
Fyodor Kupolov [Fri, 9 Sep 2016 21:40:54 +0000 (21:40 +0000)]
Fixed a bug with incorrect handling of onUnlockUser
am:
0f57cce644
Change-Id: I316808e7d3ff978dd3eb56a2f5a998f374a1aeab
Fyodor Kupolov [Fri, 9 Sep 2016 21:36:01 +0000 (21:36 +0000)]
Merge "Fixed a bug with incorrect handling of onUnlockUser" into nyc-dr1-dev
TreeHugger Robot [Fri, 9 Sep 2016 21:31:02 +0000 (21:31 +0000)]
Merge "Fix duplicate entries in ChooserActivity" into nyc-mr1-dev
Hall Liu [Fri, 9 Sep 2016 20:48:42 +0000 (20:48 +0000)]
Merge "Add configurable emergency call number support" into nyc-mr1-dev
Chien-Yu Chen [Fri, 9 Sep 2016 20:09:48 +0000 (20:09 +0000)]
Merge "CameraJNI: Fix memory leak in stop recording." into nyc-mr1-dev
TreeHugger Robot [Fri, 9 Sep 2016 19:59:44 +0000 (19:59 +0000)]
Merge "Add filter ordering" into nyc-mr1-dev
TreeHugger Robot [Fri, 9 Sep 2016 19:50:33 +0000 (19:50 +0000)]
Merge "Invoke service w/ action" into nyc-mr1-dev
Daniel Nishi [Fri, 9 Sep 2016 19:43:10 +0000 (19:43 +0000)]
Merge "Fix a bug where the Deletion Helper could not delete packages." into nyc-mr1-dev
TreeHugger Robot [Fri, 9 Sep 2016 19:28:08 +0000 (19:28 +0000)]
Merge "Hold a weak reference to PointerController when handling vsync" into nyc-mr1-dev
TreeHugger Robot [Fri, 9 Sep 2016 19:17:44 +0000 (19:17 +0000)]
Merge "Fix issues with SHOW_WHEN_LOCKED windows" into nyc-mr1-dev
Vladislav Kaznacheev [Fri, 9 Sep 2016 18:47:44 +0000 (18:47 +0000)]
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev am:
148ccbb082
am:
b0666c61b1
Change-Id: I0eeed59707162085194858e3ec0349291503c0c4
Vladislav Kaznacheev [Fri, 9 Sep 2016 18:47:41 +0000 (18:47 +0000)]
Update JavaDoc for DragEvent.getLocalState am:
048f3bfaf0
am:
fa05df640f
Change-Id: I535a5218bec2f5cf0ea9fa83aaa92ab70f05fcdd
Vladislav Kaznacheev [Fri, 9 Sep 2016 18:42:42 +0000 (18:42 +0000)]
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev
am:
148ccbb082
Change-Id: I0933f7f9f2180462b173fc2ca0ef23bfe464b1b5
Vladislav Kaznacheev [Fri, 9 Sep 2016 18:42:34 +0000 (18:42 +0000)]
Update JavaDoc for DragEvent.getLocalState
am:
048f3bfaf0
Change-Id: I72bec54ac999ebce5779062ddc5effd1bb4d61ce
TreeHugger Robot [Fri, 9 Sep 2016 18:34:55 +0000 (18:34 +0000)]
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev
Fyodor Kupolov [Fri, 9 Sep 2016 17:36:30 +0000 (10:36 -0700)]
Fixed a bug with incorrect handling of onUnlockUser
userId should be passed as arg1 instead of obj.
Bug:
31321500
Change-Id: I11e8c146d83773c73ec6bb5f5cfac566759b7bcc
Adam Powell [Fri, 9 Sep 2016 17:26:35 +0000 (10:26 -0700)]
Fix duplicate entries in ChooserActivity
Fix use of wrong index when checking for duplicates.
Bug
31234526
Change-Id: Ia37d1b04a9054b8d90957057db857633e4b79569
Svet Ganov [Wed, 7 Sep 2016 16:57:41 +0000 (09:57 -0700)]
[DO NOT MERGE] Backup account access grants
Sync adapters without an account access cannot run until the
user approves the account access (for the case the account
access is not allowed by other policy such as being singed
with the same cert as the authenticator). If the sync adapter
does not have permission to access the account we ask the
user to grant access and take a note. This CL adds backup
for the explicit user grants.
bug:
31162498
Change-Id: I31e3f3d010475352c7c54255ac2d3a2fed4d0c72
Vladislav Kaznacheev [Fri, 9 Sep 2016 17:03:31 +0000 (10:03 -0700)]
Hold a weak reference to PointerController when handling vsync
Currently PointerController starts listening to display events
immediately (in its constructor) and never explicitly removes
the callback. The reference dangling from the looper
prevents the PointerController instance from being deleted
when all the clients have released their references.
As a result, when USB or BT mouse is disconnected,
the mouse stays frozen on screen and only goes away
after a 15 sec inactivity timeout.
This change introduces an intermediary LooperCallback
which holds only a weak reference to PointerController.
The pointer now disappears immediately upon mouse
disconnect.
Bug:
30824220
Change-Id: I5f7208dbfa381b3e21f248cc0da402f307faa184
Rob Carr [Fri, 9 Sep 2016 16:37:50 +0000 (16:37 +0000)]
Merge "Remove reuse of pending deferred transactions." into nyc-mr1-dev
Robert Carr [Thu, 8 Sep 2016 19:56:42 +0000 (12:56 -0700)]
Remove reuse of pending deferred transactions.
Only defer transactions originating from repositionChild. There is
no guarantee the frame we are suggested to synchronize to will ever
arrive and synchronizing WM originated transactions to this can
interfere with implementation of system policy. Anyway this code
originally was fixing a case where transactions pushed by pulling
down the notification shade, would interrupt animating SurfaceView's
by pushing an undeferred transaction for those SurfaceView's. This
doesn't seem to be occuring anymore even without this code. Furthermore
even if it was occuring, we should prevent transactions from pushing
updates for Surfaces where nothing has really changed, rather than
attempt to chain the deferred transactions.
Bug:
31293950
Bug:
27098060
Bug:
28858420
Change-Id: Ifb83fe78bb4e7d18376e53a743709648aa1e03bc
Narayan Kamath [Fri, 9 Sep 2016 11:01:19 +0000 (11:01 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e am:
24ffc9ab47 am:
bd6a29cddc am:
e9295560cf am:
19ebec6d36
am:
2e8b25701a
Change-Id: If0cc333a2fa6bfadc0d4ac56049dc14e7066e38c
Narayan Kamath [Fri, 9 Sep 2016 10:52:43 +0000 (10:52 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e am:
24ffc9ab47 am:
bd6a29cddc am:
e9295560cf
am:
19ebec6d36
Change-Id: Idf28988f014023f04bda3d3ce77a37fc26863469
Narayan Kamath [Fri, 9 Sep 2016 10:52:40 +0000 (10:52 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13 am:
8cb6b9335c am:
eb972e5d9d am:
7aba7234e1
am:
d1697846ba
Change-Id: If4553a6075d24cea4398b035abea26db9998313f
Narayan Kamath [Fri, 9 Sep 2016 10:44:54 +0000 (10:44 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e am:
24ffc9ab47 am:
bd6a29cddc
am:
e9295560cf
Change-Id: Ib64b8f7e777a5779ef7b057cb55bf1b8148e2fa5
Narayan Kamath [Fri, 9 Sep 2016 10:44:45 +0000 (10:44 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13 am:
8cb6b9335c am:
eb972e5d9d
am:
7aba7234e1
Change-Id: I8c33caec1a869caa4ea3d1b7e2cfcb3a9a6787ea
Narayan Kamath [Fri, 9 Sep 2016 10:39:40 +0000 (10:39 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13 am:
8cb6b9335c
am:
eb972e5d9d
Change-Id: I8030e2b745fe08b238fd9da5b518729fda05174e
Narayan Kamath [Fri, 9 Sep 2016 10:39:29 +0000 (10:39 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e am:
24ffc9ab47
am:
bd6a29cddc
Change-Id: I78f74e5d3f0e0b82afe4d5f48f2541a881189aa1
Narayan Kamath [Fri, 9 Sep 2016 10:33:43 +0000 (10:33 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13
am:
8cb6b9335c
Change-Id: If2f8fbef801cd61834ac50a7e1a254ed21b95cc2
Narayan Kamath [Fri, 9 Sep 2016 10:33:40 +0000 (10:33 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e
am:
24ffc9ab47
Change-Id: I78adbdbbf8ffddfee3cd8b1407415cdf3a4d1b1f
Narayan Kamath [Fri, 9 Sep 2016 10:28:52 +0000 (10:28 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b
am:
e59073096e
Change-Id: Ifb7972c30d70a0fbc4ffdae100aac2d77ca445ca
Narayan Kamath [Fri, 9 Sep 2016 10:28:46 +0000 (10:28 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421
am:
8f0cc3dd13
Change-Id: Ida08d48da51f9f49dc70a916fa379cf89a4d33c0
Narayan Kamath [Fri, 9 Sep 2016 10:21:48 +0000 (10:21 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours
am:
646ee94421
Change-Id: I62f6556e630707274daa4ee0a4a57c77f5329bbc
Narayan Kamath [Fri, 9 Sep 2016 10:18:19 +0000 (10:18 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
am:
00e808b06b
Change-Id: I14939b5bf04ba47229e663b2ffc50543c5c6bc9a
Narayan Kamath [Fri, 9 Sep 2016 10:15:11 +0000 (10:15 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
82c6e6267e -s ours
Change-Id: Ib35b2567f19aff39d285794951cf9b8cb8d74ef1