Commit Graph

293422 Commits

Author SHA1 Message Date
John Reck
60bf972d48 Merge "Fix pause/resume timing" 2016-10-18 20:27:41 +00:00
Sungsoo
68fbb5e1c9 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
2016-10-18 20:21:43 +00:00
Sungsoo
31be9d42af 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
2016-10-18 20:20:35 +00:00
Sungsoo
be057aaea3 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
2016-10-18 20:19:51 +00:00
Andy Hung
2b9a746ca5 Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev am: 8e7b934850 am: 76bd5dfdf5
am: 5b80bb2e68

Change-Id: Ib44e6c1bae259d94d88337b2bd41301d08d1527b
2016-10-18 20:18:57 +00:00
Andy Hung
0564ec9d68 resolve merge conflicts of ffe502b to cw-f-dev am: 3dd656c624
am: c6e0d5f125

Change-Id: I80b908142bb4dbd2af8c9f3627ecfd5e3df1963c
2016-10-18 20:18:05 +00:00
Sungsoo
9e844d9a80 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
2016-10-18 20:15:17 +00:00
Sungsoo
4202549ca1 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
2016-10-18 20:14:08 +00:00
Sungsoo
b49d9df30e 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
2016-10-18 20:13:09 +00:00
Andy Hung
5b80bb2e68 Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev am: 8e7b934850
am: 76bd5dfdf5

Change-Id: I9d27d401f7df88b914387e5b50c025b75899be62
2016-10-18 20:12:09 +00:00
Andy Hung
c6e0d5f125 resolve merge conflicts of ffe502b to cw-f-dev
am: 3dd656c624

Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2
2016-10-18 20:11:21 +00:00
Sungsoo
51497a9403 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
2016-10-18 20:07:57 +00:00
Sungsoo
1962e0e940 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
2016-10-18 20:06:45 +00:00
Sungsoo
c92abdeac8 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
2016-10-18 20:05:44 +00:00
TreeHugger Robot
1262a92ac2 Merge "Upgrade resize mode setting for home activities when restoring task" 2016-10-18 20:04:55 +00:00
Andy Hung
76bd5dfdf5 Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev
am: 8e7b934850

Change-Id: I91225b8b4b24f9580ce8599462913b81ee932f6f
2016-10-18 20:04:48 +00:00
Andy Hung
3dd656c624 resolve merge conflicts of ffe502b to cw-f-dev
Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
2016-10-18 11:55:04 -07:00
Sungsoo
c23c9dd730 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
2016-10-18 18:39:48 +00:00
Sungsoo
f134b88684 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
2016-10-18 18:33:13 +00:00
Sungsoo
db20fb1fbb 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
2016-10-18 18:32:55 +00:00
Sungsoo
195a80e3ff 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
2016-10-18 18:26:41 +00:00
Sungsoo
ac12204cd3 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
2016-10-18 18:26:35 +00:00
Sungsoo
f420816b25 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
2016-10-18 18:20:34 +00:00
Sungsoo
1342dca30f 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
2016-10-18 18:20:27 +00:00
Sungsoo
2b9cb55632 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
2016-10-18 18:20:17 +00:00
Sungsoo
e7adcdd082 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
2016-10-18 18:20:01 +00:00
Andy Hung
8e7b934850 Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev 2016-10-18 18:15:03 +00:00
Sungsoo
7fd5f3d2a3 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
2016-10-18 18:14:10 +00:00
Sungsoo
88a5b7e919 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
2016-10-18 18:14:03 +00:00
Sungsoo
43222cec43 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
2016-10-18 18:13:55 +00:00
Sungsoo
cbec33614a 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
2016-10-18 18:13:53 +00:00
Sungsoo
5f6d0c2c81 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
2016-10-18 18:07:43 +00:00
Sungsoo
c4b72e5f1d 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
2016-10-18 18:07:24 +00:00
Sungsoo
a787a575b1 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
2016-10-18 18:07:22 +00:00
Sungsoo
336791758a 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
2016-10-18 18:07:19 +00:00
Sungsoo
9a052fd590 ExifInterfaceTest: Catch IOException am: c9ed3b8a5b am: a4ec9714b3 am: b6f40a84fa am: 815d687215
am: 4090df5b63

Change-Id: If0c1922b0563c8723704e78609f0d7d8e21fb957
2016-10-18 18:03:20 +00:00
Daichi Hirono
3317995e6f Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev am: dd443a0548 am: a8f55f354d
am: b233343bd1  -s ours

Change-Id: Ied78eaf667348a3fa49bfd34f0e9770e6a8a70b6
2016-10-18 18:02:19 +00:00
Daichi Hirono
05b74cc2ef DO NOT MERGE: Fix NullPointerException in MtpManager. am: 9c8e0f1a54 am: 6e6fdd4779
am: 0fd96a12ec  -s ours

Change-Id: I5187b8bb7d530bf8a2280dde495a47516aedf8cf
2016-10-18 18:01:38 +00:00
Sungsoo
8c94179f51 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
2016-10-18 18:00:54 +00:00
Sungsoo
78cc05eebe 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
2016-10-18 18:00:45 +00:00
TreeHugger Robot
dd17309815 Merge "Port Parcel benchmarks to APCT" 2016-10-18 17:58:30 +00:00
Sungsoo
ef874e34b9 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
2016-10-18 17:56:13 +00:00
Sungsoo
6e6bb933ae 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
2016-10-18 17:55:56 +00:00
Sungsoo
4090df5b63 ExifInterfaceTest: Catch IOException am: c9ed3b8a5b am: a4ec9714b3 am: b6f40a84fa
am: 815d687215

Change-Id: I7a1f157a59f342dfbe8c9b08f387e121d781280a
2016-10-18 17:55:20 +00:00
Sungsoo
583a7017ce 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
2016-10-18 17:54:57 +00:00
Daichi Hirono
b233343bd1 Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev am: dd443a0548
am: a8f55f354d

Change-Id: I90d36817c33bbca9754af7c7b9b0e3043959b475
2016-10-18 17:49:19 +00:00
Daichi Hirono
0fd96a12ec DO NOT MERGE: Fix NullPointerException in MtpManager. am: 9c8e0f1a54
am: 6e6fdd4779

Change-Id: I83b323e21ea69b8bf51fc0c3896ef159868323ef
2016-10-18 17:48:11 +00:00
Sungsoo
6eea6bbb5a DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6 am: e31a44b710
am: 802632d4a8  -s ours

Change-Id: Ic5bcd58df094c76a640197bc0e39f007617911b3
2016-10-18 17:48:04 +00:00
Sungsoo
a1f70f7056 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours am: 8be090868e
am: 69febedd6d

Change-Id: Id1c70a1131d860d027fed915088918232899f026
2016-10-18 17:47:59 +00:00
Sungsoo
ec44540d42 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
2016-10-18 17:47:58 +00:00