OSDN Git Service
Adam Lesinski [Tue, 18 Oct 2016 21:01:14 +0000 (21:01 +0000)]
Fix race with Asset destruction and printing allocation stats am:
2582465bb4 am:
882f8168b0
am:
08a870cd6d
Change-Id: I0ffc2b8268d376a45618f2b33fbb964b788ffbea
Adam Lesinski [Tue, 18 Oct 2016 20:53:59 +0000 (20:53 +0000)]
Fix race with Asset destruction and printing allocation stats am:
2582465bb4
am:
882f8168b0
Change-Id: I613fabdaad38be88ff9c4527e100e33a87f9d601
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
Adrian Roos [Tue, 18 Oct 2016 20:29:53 +0000 (20:29 +0000)]
Merge "ImageWallpaper: forget wallpaper in background"
John Reck [Tue, 18 Oct 2016 20:27:37 +0000 (20:27 +0000)]
Merge "Fix pause/resume timing"
Sungsoo [Tue, 18 Oct 2016 20:21:43 +0000 (20:21 +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 am:
51497a9403
am:
9e844d9a80 -s ours
Change-Id: Ifebe6ce5119121f36d76b2b44f20c1f2c0d1f0f1
Sungsoo [Tue, 18 Oct 2016 20:20:35 +0000 (20: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 am:
1342dca30f am:
195a80e3ff am:
1962e0e940
am:
4202549ca1 -s ours
Change-Id: I622ce938fe48af38103caf721a4073183dd23f81
Sungsoo [Tue, 18 Oct 2016 20:19:51 +0000 (20:19 +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 am:
c92abdeac8
am:
b49d9df30e -s ours
Change-Id: Ia442b247ea1a00856f7315522d239c8cd890df09
Andy Hung [Tue, 18 Oct 2016 20:18:57 +0000 (20:18 +0000)]
Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev am:
8e7b934850 am:
76bd5dfdf5
am:
5b80bb2e68
Change-Id: Ib44e6c1bae259d94d88337b2bd41301d08d1527b
Andy Hung [Tue, 18 Oct 2016 20:18:05 +0000 (20:18 +0000)]
resolve merge conflicts of
ffe502b to cw-f-dev am:
3dd656c624
am:
c6e0d5f125
Change-Id: I80b908142bb4dbd2af8c9f3627ecfd5e3df1963c
Sungsoo [Tue, 18 Oct 2016 20:15:17 +0000 (20:15 +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
am:
51497a9403
Change-Id: I4b46f957553adb310eb9cfa3e0a38ecf90793bf0
Sungsoo [Tue, 18 Oct 2016 20:14:08 +0000 (20: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 am:
88a5b7e919 am:
1342dca30f am:
195a80e3ff
am:
1962e0e940
Change-Id: I8817af944903f5a4a3ecdf1a777034213cede1b5
Sungsoo [Tue, 18 Oct 2016 20:13:09 +0000 (20:13 +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
am:
c92abdeac8
Change-Id: Ib5602cf0cef9d7d8ada75b0776d28cbe2fb6512b
Andy Hung [Tue, 18 Oct 2016 20:12:09 +0000 (20:12 +0000)]
Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev am:
8e7b934850
am:
76bd5dfdf5
Change-Id: I9d27d401f7df88b914387e5b50c025b75899be62
Andy Hung [Tue, 18 Oct 2016 20:11:21 +0000 (20:11 +0000)]
resolve merge conflicts of
ffe502b to cw-f-dev
am:
3dd656c624
Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2
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
TreeHugger Robot [Tue, 18 Oct 2016 20:04:52 +0000 (20:04 +0000)]
Merge "Upgrade resize mode setting for home activities when restoring task"
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:32:55 +0000 (18:32 +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 am:
cbec33614a
am:
f420816b25 -s ours
Change-Id: Ic819a694aec65c0a1dd57f2ce4bd2e545f69511f
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:34 +0000 (18:20 +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
am:
cbec33614a
Change-Id: I8eea4fe42e6dae0303e9a63eacfb3821d72e8271
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:03:20 +0000 (18:03 +0000)]
ExifInterfaceTest: Catch IOException am:
c9ed3b8a5b am:
a4ec9714b3 am:
b6f40a84fa am:
815d687215
am:
4090df5b63
Change-Id: If0c1922b0563c8723704e78609f0d7d8e21fb957
Daichi Hirono [Tue, 18 Oct 2016 18:02:19 +0000 (18:02 +0000)]
Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev am:
dd443a0548 am:
a8f55f354d
am:
b233343bd1 -s ours
Change-Id: Ied78eaf667348a3fa49bfd34f0e9770e6a8a70b6
Daichi Hirono [Tue, 18 Oct 2016 18:01:38 +0000 (18:01 +0000)]
DO NOT MERGE: Fix NullPointerException in MtpManager. am:
9c8e0f1a54 am:
6e6fdd4779
am:
0fd96a12ec -s ours
Change-Id: I5187b8bb7d530bf8a2280dde495a47516aedf8cf
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
TreeHugger Robot [Tue, 18 Oct 2016 17:58:27 +0000 (17:58 +0000)]
Merge "Port Parcel benchmarks to APCT"
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:55:20 +0000 (17:55 +0000)]
ExifInterfaceTest: Catch IOException am:
c9ed3b8a5b am:
a4ec9714b3 am:
b6f40a84fa
am:
815d687215
Change-Id: I7a1f157a59f342dfbe8c9b08f387e121d781280a
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
Daichi Hirono [Tue, 18 Oct 2016 17:49:19 +0000 (17:49 +0000)]
Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev am:
dd443a0548
am:
a8f55f354d
Change-Id: I90d36817c33bbca9754af7c7b9b0e3043959b475
Daichi Hirono [Tue, 18 Oct 2016 17:48:11 +0000 (17:48 +0000)]
DO NOT MERGE: Fix NullPointerException in MtpManager. am:
9c8e0f1a54
am:
6e6fdd4779
Change-Id: I83b323e21ea69b8bf51fc0c3896ef159868323ef
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
Adrian Roos [Tue, 18 Oct 2016 17:44:55 +0000 (17:44 +0000)]
Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev am:
fe7cab6042 am:
593f9cdde0
am:
ca73ecfde2
Change-Id: Ie07d2604e0c6b492b225b65586ebab44e14b0659
Adrian Roos [Tue, 18 Oct 2016 17:43:57 +0000 (17:43 +0000)]
DirectReply: fix lockscreen crash am:
b22665db0c am:
dd8b2c943d
am:
4c4e0de5d5
Change-Id: Ifc1b08a0a58ca7dc67f2eef0c3de678e8ba1f5c1
Bryce Lee [Tue, 18 Oct 2016 17:42:58 +0000 (17:42 +0000)]
Merge "Add a way to query for supported Bluetooth profiles." into cw-f-dev am:
112ae34fea
am:
cabdd0c49a
Change-Id: I45cabb94e9d11ec2419fbdfe7c7d0a389c43d76c
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
Bryce Lee [Tue, 18 Oct 2016 17:41:52 +0000 (17:41 +0000)]
resolve merge conflicts of
b1301fa to nyc-mr1-dev-plus-aosp
am:
ccd3468567
Change-Id: I5dac528db07b40bb9e59a090bd7e0016ca6e996a
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
Adrian Roos [Tue, 18 Oct 2016 17:38:40 +0000 (17:38 +0000)]
Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev am:
fe7cab6042
am:
593f9cdde0
Change-Id: I86e4dfef4d031221e69b78c8cbded91ccdb93144
Adrian Roos [Tue, 18 Oct 2016 17:37:45 +0000 (17:37 +0000)]
DirectReply: fix lockscreen crash am:
b22665db0c
am:
dd8b2c943d
Change-Id: I30dd96b6b332fcd327fcaf81c8e082d7081781b2
Bryce Lee [Tue, 18 Oct 2016 17:36:20 +0000 (17:36 +0000)]
Merge "Add a way to query for supported Bluetooth profiles." into cw-f-dev
am:
112ae34fea
Change-Id: I9581cdb9d932b2cefd40e493f9100ef4ad0bc8f2
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
Bryce Lee [Tue, 18 Oct 2016 17:07:00 +0000 (10:07 -0700)]
resolve merge conflicts of
b1301fa to nyc-mr1-dev-plus-aosp
Change-Id: Idb97adf36d981a340cdb5d24d4c3c3858d23e2fe
TreeHugger Robot [Tue, 18 Oct 2016 16:59:24 +0000 (16:59 +0000)]
Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 16:57:01 +0000 (16:57 +0000)]
Merge "Iteration on findPath API."
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
Wale Ogunwale [Tue, 18 Oct 2016 15:50:31 +0000 (08:50 -0700)]
Upgrade resize mode setting for home activities when restoring task
We need to convert the resize mode of home activities saved before
version 1 of the persisted task record if they are marked as
RESIZE_MODE_RESIZEABLE to RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION
since we didn't have that differentiation before version 1 and the
system didn't resize home activities before then.
Bug:
30982291
Bug:
32231084
Test: Verify that a device runnin N upgraded to O doesn't resize the
home activity when in split-screen multi-window mode.
Change-Id: I3c9dfcc8be2651b06f7ab77abe4edb9653742952
Philip P. Moltmann [Tue, 18 Oct 2016 14:55:48 +0000 (14:55 +0000)]
Merge "Allow to select printer from info activity."
TreeHugger Robot [Tue, 18 Oct 2016 14:49:08 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Mike Reed [Tue, 18 Oct 2016 13:57:10 +0000 (13:57 +0000)]
Merge "use SkBlendMode instead of SkXfermode use sk_sp versions of paint setters/getters"
Jakub Adámek [Tue, 18 Oct 2016 08:01:48 +0000 (08:01 +0000)]
Merge "Search for RRO both in SKU subdir and in vendor/overlay" into cw-f-dev am:
ffacd81c23
am:
b38b015b7c
Change-Id: Ib9e3fb1bc9d152bfc62f004cb09cd5433302163e
Jakub Adamek [Tue, 18 Oct 2016 08:00:50 +0000 (08:00 +0000)]
Search for RRO both in SKU subdir and in vendor/overlay am:
1f36a2166b
am:
27471b30de
Change-Id: I5c8655c5f9abe1375c0d53f48705709331d472d9
Jakub Adámek [Tue, 18 Oct 2016 07:54:25 +0000 (07:54 +0000)]
Merge "Search for RRO both in SKU subdir and in vendor/overlay" into cw-f-dev
am:
ffacd81c23
Change-Id: If864d2b3cd0467b86b8b1a28152faf213276b3fb
Jakub Adamek [Tue, 18 Oct 2016 07:54:15 +0000 (07:54 +0000)]
Search for RRO both in SKU subdir and in vendor/overlay
am:
1f36a2166b
Change-Id: I3d3a3a5e7c9a39616c7289b6587717d6b37a3bf5
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
OSDN Git Service
