OSDN Git Service
Andrew Solovay [Wed, 19 Oct 2016 17:47:40 +0000 (17:47 +0000)]
Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev am:
439d71837e
am:
f31f36c305
Change-Id: I0735ce31db3435e47e0610955ff345968f877932
Andrew Solovay [Wed, 19 Oct 2016 17:46:35 +0000 (17:46 +0000)]
docs: Updating the samples "what's new" for API 7.1 am:
c86db22b2f
am:
630b6320eb
Change-Id: I124e27242de6de31e6d7d33b4fc93dcb12804caf
Andrew Solovay [Wed, 19 Oct 2016 17:36:48 +0000 (17:36 +0000)]
Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev
am:
439d71837e
Change-Id: I33ca9cc9e7176df2916c70619c007260d035afdf
Andrew Solovay [Wed, 19 Oct 2016 17:36:46 +0000 (17:36 +0000)]
docs: Updating the samples "what's new" for API 7.1
am:
c86db22b2f
Change-Id: Ic7feef22e3337445f8dccfcb237783a40dd59099
Andrew Solovay [Wed, 19 Oct 2016 17:06:43 +0000 (17:06 +0000)]
Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev
Marie Janssen [Wed, 19 Oct 2016 16:49:23 +0000 (16:49 +0000)]
Bluetooth: More logging of bluetooth service state am:
9fa2491850
am:
d8e027b5a4
Change-Id: Ifaa9bad48234a6035b49a6a05484d91df31c5727
Marie Janssen [Wed, 19 Oct 2016 16:43:09 +0000 (16:43 +0000)]
Bluetooth: More logging of bluetooth service state
am:
9fa2491850
Change-Id: Idd26922caf3c1a0fb77d2091ac86bfe3a1d1c62a
Marie Janssen [Tue, 18 Oct 2016 17:04:24 +0000 (10:04 -0700)]
Bluetooth: More logging of bluetooth service state
Bug:
32140251
Bug:
32140271
Bug:
32060415
Change-Id: I50faa184551748023ea5a573646a75293f553d16
Jason Monk [Wed, 19 Oct 2016 15:23:40 +0000 (15:23 +0000)]
Merge "Hide QS customizer correctly" am:
03e4eb32fe
am:
fb56958223
Change-Id: I62095e8b8c5bea7627e59cf166abce1cfa4ce2f1
Jason Monk [Wed, 19 Oct 2016 15:15:43 +0000 (15:15 +0000)]
Merge "Hide QS customizer correctly"
am:
03e4eb32fe
Change-Id: I8c1998de76beee26b703781a6f883e9efd24bde3
Jason Monk [Wed, 19 Oct 2016 15:05:41 +0000 (15:05 +0000)]
Merge "Hide QS customizer correctly"
Svetoslav Ganov [Wed, 19 Oct 2016 01:56:18 +0000 (01:56 +0000)]
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev am:
d48bd27f0e
am:
6a2ada0a0a
Change-Id: I3fa265e516b958f23e916fcf6fd702707cd1969f
Svetoslav Ganov [Wed, 19 Oct 2016 01:55:18 +0000 (01:55 +0000)]
[DO NOT MERGE] Catch a missed case when adding a toast am:
5c90c5e32e
am:
a9aa78b1fd
Change-Id: Iba49fa7331a183fe14cd87583a8614552f33aadd
Svetoslav Ganov [Wed, 19 Oct 2016 01:47:51 +0000 (01:47 +0000)]
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev
am:
d48bd27f0e
Change-Id: I9fbbbbe709dbf308fa4b2678ede416e68f59c057
Svetoslav Ganov [Wed, 19 Oct 2016 01:47:48 +0000 (01:47 +0000)]
[DO NOT MERGE] Catch a missed case when adding a toast
am:
5c90c5e32e
Change-Id: Ie9273caa0918a95a87c5bdb26ebc80ef2d4c22c0
Svetoslav Ganov [Wed, 19 Oct 2016 01:35:33 +0000 (01:35 +0000)]
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev
Chris Thornton [Wed, 19 Oct 2016 01:34:48 +0000 (01:34 +0000)]
Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev am:
23655af585
am:
1696610b17
Change-Id: I8f0a9be6ed53a7e585f1c11752ee707372fa4764
Chris Thornton [Wed, 19 Oct 2016 01:33:45 +0000 (01:33 +0000)]
Only purge sound models that violate the new primary key constraint if they don't contain identical data. am:
d5ff116403
am:
519b7837bb
Change-Id: I7788e4a5a09ba918e4a142bebf797af4db3b8afe
Chris Thornton [Wed, 19 Oct 2016 01:26:48 +0000 (01:26 +0000)]
Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev
am:
23655af585
Change-Id: Idc6e7aeef68d16a13a707968ff3805a6d87b2bc3
Chris Thornton [Wed, 19 Oct 2016 01:26:45 +0000 (01:26 +0000)]
Only purge sound models that violate the new primary key constraint if they don't contain identical data.
am:
d5ff116403
Change-Id: I3e205134832a7abeb4d9d2aca3b7c5600fc22239
TreeHugger Robot [Wed, 19 Oct 2016 01:17:02 +0000 (01:17 +0000)]
Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev
Andrew Solovay [Tue, 18 Oct 2016 23:01:21 +0000 (16:01 -0700)]
docs: Updating the samples "what's new" for API 7.1
"What's new" page hadn't been updated since 6.0 (18 months ago).
Replacing the old "new" sample apps with the three new ones added
for 7.1.
Doc is staged to:
http://go/dods-stage/samples/new/
bug:
32212333
Change-Id: Ibb48bb531c0d519e50d940d443b461a215ed87d7
Svetoslav Ganov [Wed, 19 Oct 2016 00:57:08 +0000 (00:57 +0000)]
Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev am:
76043cf69f
am:
b3a8fc9835
Change-Id: I783cc8665433ac22ab0b4eb1da39e9714b009117
Svet Ganov [Wed, 19 Oct 2016 00:56:16 +0000 (00:56 +0000)]
Validate input for ContentService#setIsSyncable am:
96b9c75cec
am:
ba7bd1fe06
Change-Id: If0e95400a089804fac54ae946650a353b8d039ef
Svetoslav Ganov [Wed, 19 Oct 2016 00:42:58 +0000 (00:42 +0000)]
Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev
am:
76043cf69f
Change-Id: I89c6415c45320a1825bf2bca26ec64a9e308d46d
Svet Ganov [Wed, 19 Oct 2016 00:42:53 +0000 (00:42 +0000)]
Validate input for ContentService#setIsSyncable
am:
96b9c75cec
Change-Id: Ib39782e880a528be297d673134d7609e68ed313d
Svetoslav Ganov [Wed, 19 Oct 2016 00:32:58 +0000 (00:32 +0000)]
Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev
Hemal Patel [Tue, 18 Oct 2016 23:24:53 +0000 (23:24 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev am:
b361f519dc am:
2a2c0fb96a am:
b841c2d845
am:
6fe03a8529
Change-Id: I8274f3ed022f561b2aa4ecb13a5d78e30ce59fd5
Hemal Patel [Tue, 18 Oct 2016 23:23:38 +0000 (23:23 +0000)]
Docs: Fixed a broken link am:
9a641b6989 am:
40aaf53920 am:
8068fdca0c
am:
c9f68a8be3
Change-Id: I9636eef5a4cfeb8ab875aa15cbfaba20a1c80dcb
Hemal Patel [Tue, 18 Oct 2016 23:17:11 +0000 (23:17 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev am:
b361f519dc am:
2a2c0fb96a
am:
b841c2d845
Change-Id: I618a5f80027a2518dd1fb93697465adf011bf442
Hemal Patel [Tue, 18 Oct 2016 23:16:08 +0000 (23:16 +0000)]
Docs: Fixed a broken link am:
9a641b6989 am:
40aaf53920
am:
8068fdca0c
Change-Id: Ic6d2bbcb23051f22e8a10e7d7573dc34b000f9a5
Hemal Patel [Tue, 18 Oct 2016 23:09:58 +0000 (23:09 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev am:
b361f519dc
am:
2a2c0fb96a
Change-Id: I52c0fc44767f3b1102a8830e9e7910bf6d0db993
Hemal Patel [Tue, 18 Oct 2016 23:08:56 +0000 (23:08 +0000)]
Docs: Fixed a broken link am:
9a641b6989
am:
40aaf53920
Change-Id: I4888353281c101f92da0ce438e64531739c332be
Adam Lesinski [Tue, 18 Oct 2016 23:04:50 +0000 (23:04 +0000)]
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev am:
0858d08a88
am:
93e4720813
Change-Id: I5270f2413ca90ac58c0917b48d9959bab81b1c4a
Adam Lesinski [Tue, 18 Oct 2016 23:03:51 +0000 (23:03 +0000)]
Fix regression with defaultDisplay adjustments am:
f02523bf4b
am:
be75a58447
Change-Id: I748eaefa1a99b9af5101177090cf906267620f0b
Hemal Patel [Tue, 18 Oct 2016 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev
am:
b361f519dc
Change-Id: I715603d2fe5f7d21b93c663dc7109d4ee5abaf74
Hemal Patel [Tue, 18 Oct 2016 23:01:53 +0000 (23:01 +0000)]
Docs: Fixed a broken link
am:
9a641b6989
Change-Id: If8e166a3cb36d158fd428e314b90cb265cf2256c
Adam Lesinski [Tue, 18 Oct 2016 22:55:17 +0000 (22:55 +0000)]
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev
am:
0858d08a88
Change-Id: Idc8f2c1685c11d301d9fb4323a21e6d14c4ae594
Adam Lesinski [Tue, 18 Oct 2016 22:55:14 +0000 (22:55 +0000)]
Fix regression with defaultDisplay adjustments
am:
f02523bf4b
Change-Id: I7e96a95bcb75ee0b286e73024f62391cc1b759dd
Hemal Patel [Tue, 18 Oct 2016 22:54:35 +0000 (22:54 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev
TreeHugger Robot [Tue, 18 Oct 2016 22:46:22 +0000 (22:46 +0000)]
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev
Adrian Roos [Tue, 18 Oct 2016 22:41:45 +0000 (22:41 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am:
52af7e0759
am:
f07199a9b1
Change-Id: I2bb40f0548ac493ad2810dc54041951fc44ae474
Chris Thornton [Tue, 18 Oct 2016 22:27:00 +0000 (15:27 -0700)]
Only purge sound models that violate the new primary key constraint if
they don't contain identical data.
Bug:
32174118
Change-Id: Ied5e4e852337e5f819c7ded53dd941d79087ce73
Adrian Roos [Tue, 18 Oct 2016 22:19:43 +0000 (22:19 +0000)]
Separate ambient display triggers am:
b7e4e10618
am:
59116440e7
Change-Id: I588f5541c73ae356b255ffa6b1e23c1fbcd1693e
Adrian Roos [Tue, 18 Oct 2016 22:12:53 +0000 (22:12 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
am:
52af7e0759
Change-Id: I61ccb55ed8d4226fa46fdad8dd7845dfae3bc2a3
Adrian Roos [Tue, 18 Oct 2016 22:07:03 +0000 (22:07 +0000)]
Separate ambient display triggers
am:
b7e4e10618
Change-Id: I575f96338cffa0f6e8adb1b9ff300dbd322398dc
Adrian Roos [Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
Fan Zhang [Tue, 18 Oct 2016 21:45:30 +0000 (21:45 +0000)]
Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev am:
964874e444
am:
d0560f097a
Change-Id: I0793226266472697b2ef68419706cd38952efa6f
Fan Zhang [Tue, 18 Oct 2016 21:44:31 +0000 (21:44 +0000)]
Catch NPE on network state and fall back to empty summary. am:
6acb76621d
am:
d856752ee7
Change-Id: Id1f17b2d60627110c1c7a3ae9aac3a7496f534f1
Fan Zhang [Tue, 18 Oct 2016 21:37:35 +0000 (21:37 +0000)]
Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev
am:
964874e444
Change-Id: I86e665b3aee0d01dcbec3040e51efeb60b8f2f0e
Brad Ebinger [Tue, 18 Oct 2016 21:37:35 +0000 (21:37 +0000)]
Merge "Add support for new SessionManager and EventManager tests" am:
42598f4a96
am:
cedb97bfb6
Change-Id: I8f24b19fadecea0cea945ba96bd885b6e8030b06
Fan Zhang [Tue, 18 Oct 2016 21:37:30 +0000 (21:37 +0000)]
Catch NPE on network state and fall back to empty summary.
am:
6acb76621d
Change-Id: I208a614e1a29c0d0e523d712ea184ee87fc04254
Brad Ebinger [Tue, 18 Oct 2016 21:30:57 +0000 (21:30 +0000)]
Merge "Add support for new SessionManager and EventManager tests"
am:
42598f4a96
Change-Id: I9c629074ca39dfb06bd6b16217ba5e59a9e0a004
TreeHugger Robot [Tue, 18 Oct 2016 21:27:44 +0000 (21:27 +0000)]
Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev
Brad Ebinger [Tue, 18 Oct 2016 21:22:18 +0000 (21:22 +0000)]
Merge "Add support for new SessionManager and EventManager tests"
Adam Lesinski [Tue, 18 Oct 2016 20:55:01 +0000 (20:55 +0000)]
Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev am:
212a6f264f
am:
f851c07b85
Change-Id: Ia157a60515b3130fa8a77886c27c55bb5cb85a25
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: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
Svetoslav Ganov [Tue, 18 Oct 2016 01:41:48 +0000 (18:41 -0700)]
[DO NOT MERGE] Catch a missed case when adding a toast
We allow a single toast window per UID. It is possible that
the UID had another toast window that is going away and this
CL adds a missed check for when a window is scheduled to be
removed.
bug:
31340854
Change-Id: I0621516019542c85fe7121f7fe61659e4d4eb672
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
Adam Lesinski [Tue, 18 Oct 2016 19:58:27 +0000 (12:58 -0700)]
Fix regression with defaultDisplay adjustments
ag/
1542219 introduced a regression where if the display was the default
display, the configuration would still be adjusted as if it were
a non-default display. This fixes that logic to only adjust the
configuration if the display is non-default.
Bug:
32133693
Test: cts-tradefed run cts --module CtsServicesHostTestCases --test android.server.cts.ActivityManagerAppConfigurationTests#testConfigurationUpdatesWhenRotatingToSideFromDocked
Change-Id: Ib2fda8c1651609efa9d20b3e2dace8a122864916
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
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: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: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: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
OSDN Git Service
