OSDN Git Service
Adam Lesinski [Tue, 18 Oct 2016 20:40:54 +0000 (20:40 +0000)]
Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev
am:
212a6f264f
Change-Id: I2f092b325c8b5333dc8435cf7b41a652d6c8b2be
Adam Lesinski [Tue, 18 Oct 2016 20:40:50 +0000 (20:40 +0000)]
Fix race with Asset destruction and printing allocation stats
am:
2582465bb4
Change-Id: I1dbb7609fa4d770e513e6f628e4c598600607383
TreeHugger Robot [Tue, 18 Oct 2016 20:29:37 +0000 (20:29 +0000)]
Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev
Sungsoo [Tue, 18 Oct 2016 20:07:57 +0000 (20:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours am:
8c94179f51 am:
336791758a am:
43222cec43 am:
e7adcdd082 -s ours am:
ac12204cd3 am:
f134b88684
am:
c23c9dd730
Change-Id: I75cf94578e061a8216da4ee97707b7128c107114
Sungsoo [Tue, 18 Oct 2016 20:06:45 +0000 (20:06 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8 am:
8e2451759d -s ours am:
9cf942973d am:
25cbc1b7ec am:
78cc05eebe am:
a787a575b1 -s ours am:
88a5b7e919 am:
1342dca30f
am:
195a80e3ff
Change-Id: Ib4b74e316a6ee7602e4800cfe405c1a539645c2b
Sungsoo [Tue, 18 Oct 2016 20:05:44 +0000 (20:05 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d am:
41b775b40a -s ours am:
8be090868e am:
69febedd6d am:
a1f70f7056 am:
ef874e34b9 -s ours am:
c4b72e5f1d am:
7fd5f3d2a3
am:
2b9cb55632
Change-Id: I37bd28917a2532c01839be892cb49ff3fc51c394
Andy Hung [Tue, 18 Oct 2016 20:04:48 +0000 (20:04 +0000)]
Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev
am:
8e7b934850
Change-Id: I91225b8b4b24f9580ce8599462913b81ee932f6f
Andy Hung [Tue, 18 Oct 2016 18:55:04 +0000 (11:55 -0700)]
resolve merge conflicts of
ffe502b to cw-f-dev
Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
Sungsoo [Tue, 18 Oct 2016 18:39:48 +0000 (18:39 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours am:
8c94179f51 am:
336791758a am:
43222cec43 am:
e7adcdd082 -s ours am:
ac12204cd3
am:
f134b88684
Change-Id: I80bb9d7fb4e9a00abab35af04f64f21f9c8675e9
Sungsoo [Tue, 18 Oct 2016 18:33:13 +0000 (18:33 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours am:
8c94179f51 am:
336791758a am:
43222cec43 am:
e7adcdd082 -s ours
am:
ac12204cd3
Change-Id: I1faab603c76031b48b4fa6560c67fae4e3247e31
Sungsoo [Tue, 18 Oct 2016 18:26:41 +0000 (18:26 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8 am:
8e2451759d -s ours am:
9cf942973d am:
25cbc1b7ec am:
78cc05eebe am:
a787a575b1 -s ours am:
88a5b7e919
am:
1342dca30f
Change-Id: I1c5b083fa5dfdb6c7b1333829c917f2075dc66ce
Sungsoo [Tue, 18 Oct 2016 18:26:35 +0000 (18:26 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours am:
8c94179f51 am:
336791758a am:
43222cec43
am:
e7adcdd082 -s ours
Change-Id: I2903eae7d1334282e9f2fdb04a7970e1bc423c02
Sungsoo [Tue, 18 Oct 2016 18:20:27 +0000 (18:20 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8 am:
8e2451759d -s ours am:
9cf942973d am:
25cbc1b7ec am:
78cc05eebe am:
a787a575b1 -s ours
am:
88a5b7e919
Change-Id: Ibffc1f2ab709556898c1b391b28614175677d430
Sungsoo [Tue, 18 Oct 2016 18:20:17 +0000 (18:20 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d am:
41b775b40a -s ours am:
8be090868e am:
69febedd6d am:
a1f70f7056 am:
ef874e34b9 -s ours am:
c4b72e5f1d
am:
7fd5f3d2a3
Change-Id: I7a7dd7b99934dbd0e0150ca2b89e8458f6133fde
Sungsoo [Tue, 18 Oct 2016 18:20:01 +0000 (18:20 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours am:
8c94179f51 am:
336791758a
am:
43222cec43
Change-Id: Iaea2cf175368efe32934a14d5717fe2069c1ce99
Andy Hung [Tue, 18 Oct 2016 18:14:59 +0000 (18:14 +0000)]
Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev
Sungsoo [Tue, 18 Oct 2016 18:14:10 +0000 (18:14 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d am:
41b775b40a -s ours am:
8be090868e am:
69febedd6d am:
a1f70f7056 am:
ef874e34b9 -s ours
am:
c4b72e5f1d
Change-Id: Iae5fe5b1b113ee2b395d0784f3223ab5f7089cd9
Sungsoo [Tue, 18 Oct 2016 18:14:03 +0000 (18:14 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8 am:
8e2451759d -s ours am:
9cf942973d am:
25cbc1b7ec am:
78cc05eebe
am:
a787a575b1 -s ours
Change-Id: I9a3ed1ceeb98c70c0dc49ad3278f05f194cdd385
Sungsoo [Tue, 18 Oct 2016 18:13:55 +0000 (18:13 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours am:
8c94179f51
am:
336791758a
Change-Id: I7aba59c53b9fbeb6d58d139d730cdb13af78d6bb
Sungsoo [Tue, 18 Oct 2016 18:13:53 +0000 (18:13 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
cb17930077 am:
761a1ed3a6 am:
e31a44b710 am:
802632d4a8 -s ours am:
6eea6bbb5a am:
6e6bb933ae
am:
5f6d0c2c81
Change-Id: I2e984cb02b2120c6895922158963331e75f36b88
Sungsoo [Tue, 18 Oct 2016 18:07:43 +0000 (18:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
cb17930077 am:
761a1ed3a6 am:
e31a44b710 am:
802632d4a8 -s ours am:
6eea6bbb5a
am:
6e6bb933ae
Change-Id: I2210d4a29a515e3ff6b653d03051e213b209d7c6
Sungsoo [Tue, 18 Oct 2016 18:07:24 +0000 (18:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d am:
41b775b40a -s ours am:
8be090868e am:
69febedd6d am:
a1f70f7056
am:
ef874e34b9 -s ours
Change-Id: I57497969a54d7491db6ba7e585ea95e363d2f6dd
Sungsoo [Tue, 18 Oct 2016 18:07:22 +0000 (18:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8 am:
8e2451759d -s ours am:
9cf942973d am:
25cbc1b7ec
am:
78cc05eebe
Change-Id: I5a0930994d7fcd0e130d8127d2107effcd29d02d
Sungsoo [Tue, 18 Oct 2016 18:07:19 +0000 (18:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours
am:
8c94179f51
Change-Id: I8abecc3855c2dd92fbf25717bd56481dd1ee37ea
Sungsoo [Tue, 18 Oct 2016 18:00:54 +0000 (18:00 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42
am:
583a7017ce -s ours
Change-Id: I39976fd7bf943dd9b4e38c084270c977cf0511ca
Sungsoo [Tue, 18 Oct 2016 18:00:45 +0000 (18:00 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8 am:
8e2451759d -s ours am:
9cf942973d
am:
25cbc1b7ec
Change-Id: Ie8e3cfffd550c15b8d43d59539962d07934e76a3
Sungsoo [Tue, 18 Oct 2016 17:56:13 +0000 (17:56 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d am:
41b775b40a -s ours am:
8be090868e am:
69febedd6d
am:
a1f70f7056
Change-Id: I9ac60876e36d651e3aec597d4d6a396041877e98
Sungsoo [Tue, 18 Oct 2016 17:55:56 +0000 (17:55 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
cb17930077 am:
761a1ed3a6 am:
e31a44b710 am:
802632d4a8 -s ours
am:
6eea6bbb5a
Change-Id: If9505274f0a5e0cf42909d450320e30a19766265
Sungsoo [Tue, 18 Oct 2016 17:54:57 +0000 (17:54 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours
am:
ec44540d42
Change-Id: Id4fd3422c443d5e7363d3ff27b2ba0eeb532f1dd
Sungsoo [Tue, 18 Oct 2016 17:48:04 +0000 (17:48 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
cb17930077 am:
761a1ed3a6 am:
e31a44b710
am:
802632d4a8 -s ours
Change-Id: Ic5bcd58df094c76a640197bc0e39f007617911b3
Sungsoo [Tue, 18 Oct 2016 17:47:59 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d am:
41b775b40a -s ours am:
8be090868e
am:
69febedd6d
Change-Id: Id1c70a1131d860d027fed915088918232899f026
Sungsoo [Tue, 18 Oct 2016 17:47:58 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours
am:
21c4e6d532 -s ours
Change-Id: Ibf02e62ee13accd5d204c44faeb6aa8c05afb709
Sungsoo [Tue, 18 Oct 2016 17:47:56 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8 am:
8e2451759d -s ours
am:
9cf942973d
Change-Id: Ice1c96b49f7350a41cf35779f0f1fb06f6ff0c77
Sungsoo [Tue, 18 Oct 2016 17:47:51 +0000 (17:47 +0000)]
ExifInterfaceTest: Catch IOException am:
c9ed3b8a5b am:
a4ec9714b3
am:
b6f40a84fa
Change-Id: Ia9dbb060111c198774843f753977879f362bf904
Sungsoo [Tue, 18 Oct 2016 17:42:01 +0000 (17:42 +0000)]
ExifInterfaceTest: Catch IOException am:
c9ed3b8a5b
am:
a4ec9714b3
Change-Id: I32a0cd6b1a58a697f108f37e0f036e55c9df9e17
Sungsoo [Tue, 18 Oct 2016 17:41:55 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e
am:
9a15881184 -s ours
Change-Id: I67ba2d8b8d3c3f32fca417303ee422482acc40d8
Sungsoo [Tue, 18 Oct 2016 17:41:49 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8
am:
8e2451759d -s ours
Change-Id: Id0d69d1bddcf0d6059b53bd3a4b2b55df493899c
Sungsoo [Tue, 18 Oct 2016 17:41:48 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
cb17930077 am:
761a1ed3a6
am:
e31a44b710
Change-Id: I6d56c9db2085bf7b14a3a82184ce0efe77479871
Sungsoo [Tue, 18 Oct 2016 17:41:45 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d am:
41b775b40a -s ours
am:
8be090868e
Change-Id: I9e9954d2d058b6552d4d9900df51a4050a90c1fe
Daichi Hirono [Tue, 18 Oct 2016 17:35:23 +0000 (17:35 +0000)]
Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev
am:
dd443a0548
Change-Id: I57c3b7ab138f28bd8e74c039740f21bcd4376b73
Sungsoo [Tue, 18 Oct 2016 17:35:23 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba
am:
a5affb045e
Change-Id: I4bb4440c019839073b4fcf6df54d726a02286680
Sungsoo [Tue, 18 Oct 2016 17:35:22 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d
am:
41b775b40a -s ours
Change-Id: I6ce63b74988fb4f87565be611a47c2f4a28cbc9b
Daichi Hirono [Tue, 18 Oct 2016 17:35:21 +0000 (17:35 +0000)]
DO NOT MERGE: Fix NullPointerException in MtpManager.
am:
9c8e0f1a54
Change-Id: I0a83b1dc39015b588759e50ff16db5deaa2f6093
Sungsoo [Tue, 18 Oct 2016 17:35:20 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
cb17930077
am:
761a1ed3a6
Change-Id: Ia6679d76895a452267f23dd71096c397c5b48c88
Sungsoo [Tue, 18 Oct 2016 17:35:16 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours
am:
02cd808ab8
Change-Id: Ic14a5adecb6fb0732a5b3c2a68a28fdcf1eb1bc4
Sungsoo [Tue, 18 Oct 2016 17:31:12 +0000 (17:31 +0000)]
ExifInterfaceTest: Catch IOException
am:
c9ed3b8a5b
Change-Id: I589c7be846a9043ab0a7bbfb5e7775e9e595c0fd
TreeHugger Robot [Tue, 18 Oct 2016 17:29:43 +0000 (17:29 +0000)]
Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev
Sungsoo [Tue, 18 Oct 2016 17:29:03 +0000 (17:29 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am:
135524f2c5 -s ours
Change-Id: I34fc1b37171ad6ea5d79035df6c4730260a0b47b
Sungsoo [Tue, 18 Oct 2016 17:29:00 +0000 (17:29 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am:
cb17930077
Change-Id: I4b8f9270f75800e1390c3a840b41316c20ea4aa8
Sungsoo [Tue, 18 Oct 2016 17:28:58 +0000 (17:28 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am:
418e0869ba
Change-Id: Ifad08d681f67abc4dd9ad5d8c4e82b038cbd8322
Sungsoo [Tue, 18 Oct 2016 17:28:58 +0000 (17:28 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am:
ad74e88f1d
Change-Id: Ic8a6e5b579c028a560436cdc6c3ca68a51cbf229
Adrian Roos [Tue, 18 Oct 2016 17:08:43 +0000 (17:08 +0000)]
Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev
am:
fe7cab6042
Change-Id: Ia9ae415a51f7a103c4af000e72ac2f2e93a92949
Adrian Roos [Tue, 18 Oct 2016 17:08:39 +0000 (17:08 +0000)]
DirectReply: fix lockscreen crash
am:
b22665db0c
Change-Id: I88a689d4fee7bcddcecccb32f48c0fb83bac0072
TreeHugger Robot [Tue, 18 Oct 2016 16:59:24 +0000 (16:59 +0000)]
Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev
Bryce Lee [Tue, 18 Oct 2016 16:32:49 +0000 (16:32 +0000)]
Merge "Add a way to query for supported Bluetooth profiles." into cw-f-dev
Sungsoo [Tue, 18 Oct 2016 01:06:01 +0000 (10:06 +0900)]
ExifInterfaceTest: Catch IOException
ExifInterface throws IOException instead of UnsupportedOperationException.
Bug:
32221877
Change-Id: I68a4a62f565a386434b774759271bf6f2af2b7db
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug:
32068647, Bug:
30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug:
32068647, Bug:
30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug:
32068647, Bug:
30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug:
32068647, Bug:
30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
Jakub Adámek [Tue, 18 Oct 2016 07:47:15 +0000 (07:47 +0000)]
Merge "Search for RRO both in SKU subdir and in vendor/overlay" into cw-f-dev
Bill Yi [Tue, 18 Oct 2016 06:03:05 +0000 (06:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
92bd012829 -s ours
Change-Id: Ie361c190b2a67dfced753c8988766f81a374aca3
Bill Yi [Tue, 18 Oct 2016 06:03:03 +0000 (06:03 +0000)]
Import translations. DO NOT MERGE
am:
ad231bd2f8 -s ours
Change-Id: I9ffdc8e90d55d429ae96be3153497e8cc1231e22
TreeHugger Robot [Tue, 18 Oct 2016 05:57:08 +0000 (05:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 18 Oct 2016 05:44:05 +0000 (05:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
61058919ca -s ours
Change-Id: Iedb8a217643556d0f4920d3f076daa65bf3def73
Bill Yi [Tue, 18 Oct 2016 05:44:03 +0000 (05:44 +0000)]
Import translations. DO NOT MERGE
am:
c5a1d40bf1 -s ours
Change-Id: I0362a2d32dfb655560f9e8ae3b9ec583ad45d0e3
Daichi Hirono [Tue, 19 Jul 2016 06:48:04 +0000 (15:48 +0900)]
DO NOT MERGE: Fix NullPointerException in MtpManager.
BUG=
30152892
Change-Id: I1f4ec361f499510e3ac1635ca5d134b47b6059c3
(cherry picked from commit
28e6112e2f2cef5852b20e53382ea717a5a6cd41)
Bill Yi [Tue, 18 Oct 2016 05:38:09 +0000 (05:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
e8dc857c2f -s ours
Change-Id: Ia4640233c55faaa79050d94e71d48c5301be2904
Bill Yi [Tue, 18 Oct 2016 05:38:08 +0000 (05:38 +0000)]
Import translations. DO NOT MERGE
am:
c11e301ca4 -s ours
Change-Id: Ib8f6a4ea48fbe3a95153ee15be71bedd81d1e88c
TreeHugger Robot [Tue, 18 Oct 2016 05:34:40 +0000 (05:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 05:31:38 +0000 (05:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 05:30:57 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 18 Oct 2016 05:30:08 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Tue, 18 Oct 2016 04:19:36 +0000 (21:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I551e9cc3ac74b6a488f0bcc32da9905b7d313f5f
Auto-generated-cl: translation import
Bill Yi [Tue, 18 Oct 2016 04:10:43 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I49725d38064efcb1f95e204a0ab805f8f6eed550
Auto-generated-cl: translation import
Adam Lesinski [Mon, 17 Oct 2016 20:50:56 +0000 (13:50 -0700)]
Fix race with Asset destruction and printing allocation stats
A race could occur when printing the list of Asset allocations for
debugging purposes.
Each Asset object would insert themselves into a global linked list
on construction and remove themselves on destruction. Iterating the list
and the insertion/remove operations all acquire a global lock.
The race occurs after the Asset subclass destructor runs but before the Asset
base class destructor runs, which performs the actual removal from the list.
The vtable of the object being destroyed ends up pointing at the base Asset class'
vtable, and during the iteration of the global list, a pure virtual method is called
leading to an abort, since the wrong vtable is dereferenced.
This change moves the insertion/removal of the Asset object into the global list
to the concrete class, which adds some maintenance overhead but solves the problem.
Bug:
31113965
Test: make libandroidfw_tests
Change-Id: I1a620897e5e04a8519ee247883bba0719b1fa6f3
(cherry picked from commit
0358efe4f76f42d9eea91600202a5ab0831d9cef)
Andy Hung [Tue, 18 Oct 2016 01:02:29 +0000 (18:02 -0700)]
Ringtone: clear the MediaPlayer listener upon completion
This breaks a local refcount cycle and allows the Java gc to finalize
the Ringtone and MediaPlayer objects quickly.
Bug:
31811091
Change-Id: I0e5a4a78fdc02cc0c8b7811a1f1a45db3c90a0ff
Michael Kwan [Mon, 17 Oct 2016 23:14:04 +0000 (23:14 +0000)]
Merge "Fix oversized icons and removed title line limit." into cw-f-dev
Chris Thornton [Mon, 17 Oct 2016 22:32:20 +0000 (22:32 +0000)]
Merge "Update primary key in VIS sound model database." into nyc-mr1-dev
am:
c81e1f15d2
Change-Id: I1a04106f1fc4748b015a18920bfc73ec3aed97fd
Chris Thornton [Mon, 17 Oct 2016 22:32:17 +0000 (22:32 +0000)]
Update primary key in VIS sound model database.
am:
5bd5cf75e1
Change-Id: Ie35e4a4f15ece95d3b5458f4c5ee06098062c96f
TreeHugger Robot [Mon, 17 Oct 2016 22:20:34 +0000 (22:20 +0000)]
Merge "Update primary key in VIS sound model database." into nyc-mr1-dev
Adrian Roos [Mon, 17 Oct 2016 22:08:03 +0000 (15:08 -0700)]
DirectReply: fix lockscreen crash
Fixes a crash that happens when direct reply is triggered and
the view is detached between clicking and unlocking.
Change-Id: I647560a24f9a26a28e86df436b45d5f496454eb8
Fixes:
32171748
Bill Yi [Mon, 17 Oct 2016 21:13:52 +0000 (14:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7bd27211cd2cb24cae8bb2bc31404f66e2301f26
Auto-generated-cl: translation import
Bill Yi [Mon, 17 Oct 2016 21:02:57 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia35c346101f62955ae7bc9937f02242dad195b9d
Auto-generated-cl: translation import
Matthew Bouyack [Mon, 17 Oct 2016 20:28:52 +0000 (20:28 +0000)]
Merge "DO NOT MERGE Improved anti-aliasing for circular display mask" into cw-f-dev
Chris Craik [Mon, 17 Oct 2016 19:52:53 +0000 (19:52 +0000)]
Fix complex clipping on mergeable ops DO NOT MERGE
am:
d183e0b988
Change-Id: Icb357a11cb8a4be473aa8b0acdb4d799973ff54a
Bill Yi [Mon, 17 Oct 2016 18:08:03 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ed7b626ec4169f9154a18daffe36160b8f3dacb
Auto-generated-cl: translation import
Chris Craik [Fri, 14 Oct 2016 22:08:21 +0000 (15:08 -0700)]
Fix complex clipping on mergeable ops DO NOT MERGE
Fixes:
32106003
Change-Id: I519bc38a1fa8c25c9ae317ffdb7e59e5a0824f59
Chris Thornton [Sun, 16 Oct 2016 23:23:29 +0000 (16:23 -0700)]
Update primary key in VIS sound model database.
The public API for getting at KeyphraseSoundModels is based on the user,
locale, and keyphrase ID. However, the sound model database would allow
multiple models to be registered using the same values, as it has a
primary key on the model UUID. This can potentially lead to a scenario
where multiple models are enrolled for the same user, and the data that
is returned when querying models is arbitrary.
V6 of the sound model database now enforces a primary key over the user
ID, locale and keyphrase ID. When inserting a new model with the same
primary key, the old model will be removed and the new model will be
used instead.
When upgrading from V5 to V6, if there are any models that would violate
the primary key constraint, they are all dropped.
Bug:
32174118
Change-Id: I9597c6a994f01a426625c3be2c53e826f26f5156
Jakub Adamek [Mon, 17 Oct 2016 13:53:40 +0000 (14:53 +0100)]
Search for RRO both in SKU subdir and in vendor/overlay
Currently, if the "ro.boot.vendor.overlay.subdir" property is set, we
only search in the subdir. It seems more powerful to search both in
there and in the standard /vendor/overlay directory.
Also, RRO packages have the "priority" attribute in the <overlay>
attribute in AndroidManifest.xml which serves for disambiguation.
Bug:
32202741
Change-Id: I7acff1b7f0e153830924047349f003295648a53b
Jakub Adamek [Mon, 17 Oct 2016 13:55:36 +0000 (14:55 +0100)]
Search for RRO in Java both in SKU subdir and in vendor/overlay
Currently, if the "ro.boot.vendor.overlay.subdir" property is set, we
only search in the subdir. It seems more powerful to search both in
there and in the standard /vendor/overlay directory.
Also, RRO packages have the "priority" attribute in the <overlay>
attribute in AndroidManifest.xml which serves for disambiguation.
Bug:
32202741
Change-Id: I9ef44b8ca4ac0e92ba02e25b3672c6b274fe4639
Donghyun Cho [Sun, 16 Oct 2016 03:17:30 +0000 (03:17 +0000)]
Merge "CEC: Check standby action availability before request for sleep mode" into nyc-mr1-dev
am:
c00a6cb9c3
Change-Id: I720c799b35a823c920e39ede2f242d7cc320171d
Donghyun Cho [Sun, 16 Oct 2016 03:17:26 +0000 (03:17 +0000)]
CEC: Check standby action availability before request for sleep mode
am:
02920a08e1
Change-Id: Ibb0966d00afbcc69cfc8d58939bc544f50d57c98
Donghyun Cho [Sun, 16 Oct 2016 03:09:20 +0000 (03:09 +0000)]
Merge "CEC: Check standby action availability before request for sleep mode" into nyc-mr1-dev
Sooraj Sasindran [Sat, 15 Oct 2016 06:38:50 +0000 (06:38 +0000)]
Merge "Introduce the config to disable LAUNCH_BROWSER" into nyc-mr1-dev
am:
742b0a7d12
Change-Id: Ib4e96001bd4f5ef48f3186c3cbc0e4bc4cb47560
Sooraj Sasindran [Sat, 15 Oct 2016 06:38:42 +0000 (06:38 +0000)]
Introduce the config to disable LAUNCH_BROWSER
am:
c80aaa94c6
Change-Id: I6b78179f8769011136f0cdd364b2380031ce343a
Sooraj Sasindran [Sat, 15 Oct 2016 06:34:02 +0000 (06:34 +0000)]
Merge "Introduce the config to disable LAUNCH_BROWSER" into nyc-mr1-dev
Suprabh Shukla [Sat, 15 Oct 2016 04:15:21 +0000 (04:15 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am:
6739ba0280 am:
c36913e68a am:
e3c0c509ea -s ours am:
5bea7d3aee -s ours am:
0eef6b3ff2 am:
6d7f209964 -s ours am:
5d1bfd9d5f am:
13fdd92274 am:
cc63841161 am:
eb8bdd6e12 -s ours am:
01e42cf67c am:
f0edbfbe48
am:
70508a1961
Change-Id: Ib123ee2a61826953035239e8d94948f5603e88b3
Suprabh Shukla [Sat, 15 Oct 2016 04:14:17 +0000 (04:14 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
2aa7e5e861 am:
9df66924c0 am:
e07b811d78 -s ours am:
9c78d0ad9f -s ours am:
7dfd05f0e5 am:
2432cf3645 -s ours am:
99f8b9c2b4 am:
f6c384c657 am:
a2fe1c2e62 am:
c0a7561135 -s ours am:
c0294c50e2 am:
3b38e7d663
am:
a32f3dfe80
Change-Id: I15f221af5e0ec10f910b6f4f2b0aceb17e7840ed
Suprabh Shukla [Sat, 15 Oct 2016 04:13:24 +0000 (04:13 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am:
35bd0fc5f0 -s ours am:
40a13c5917 am:
0645127e25 -s ours am:
3da33f8bb0 am:
efbb0d6db3 am:
b2467b6158 am:
6b903b9299 -s ours am:
ef6363cec7 am:
f2a0598b8d
am:
1051f0b8ad
Change-Id: Ib5ae3f662f96bb00d324c9d564c5a94bb3ffb913
OSDN Git Service
