OSDN Git Service
Calvin On [Tue, 11 Oct 2016 22:10:46 +0000 (15:10 -0700)]
Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug:
30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
(cherry picked from commit
be96da11ccb5dd500f920c3ba90d350857293b3d)
Bill Yi [Thu, 20 Oct 2016 16:03:58 +0000 (16:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
3623134476 -s ours
Change-Id: Ia0155fdcebd8c81c24dd68ea345ad4fb40a110d3
Bill Yi [Thu, 20 Oct 2016 16:03:56 +0000 (16:03 +0000)]
Import translations. DO NOT MERGE
am:
66dc59064a -s ours
Change-Id: Ic64d34c0cc499094b3e43789ed9f28f45801b8cd
Bill Yi [Thu, 20 Oct 2016 16:02:34 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
f7a7712d50 -s ours
Change-Id: I2c73b3824bd0fdcb3628e71c641b811202d26d2a
Bill Yi [Thu, 20 Oct 2016 16:02:32 +0000 (16:02 +0000)]
Import translations. DO NOT MERGE
am:
5ad7d6e328 -s ours
Change-Id: I6b1a80f5cbc2282afe50101e2a6fdc3b7c17db52
Bill Yi [Thu, 20 Oct 2016 15:56:51 +0000 (15:56 +0000)]
Import translations. DO NOT MERGE
am:
7f5b5eee99 -s ours
Change-Id: I550b053800133c76cc6abf3daeefd2790ffe2363
TreeHugger Robot [Thu, 20 Oct 2016 15:54:26 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 20 Oct 2016 15:53:26 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 20 Oct 2016 15:52:50 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 20 Oct 2016 14:17:55 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6fffe370549a3c2904043151dee4bc06f6799f81
Auto-generated-cl: translation import
Bill Yi [Thu, 20 Oct 2016 10:57:17 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1d22964ed960d5388377f461a26836d2d24749c
Auto-generated-cl: translation import
Bill Yi [Thu, 20 Oct 2016 10:49:00 +0000 (03:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd3482da6612d83091fbc13a3733a19a2008f0c1
Auto-generated-cl: translation import
Bill Yi [Thu, 20 Oct 2016 05:35:19 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaad30d2e0f0119cbb3213bea5948dab67785ec06
Auto-generated-cl: translation import
Bill Yi [Thu, 20 Oct 2016 05:26:54 +0000 (22:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I045e600a36fa58956970ca71099db67d6a6edf7f
Auto-generated-cl: translation import
Selim Cinek [Thu, 20 Oct 2016 02:34:55 +0000 (02:34 +0000)]
Merge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev
am:
d9a569ae58
Change-Id: I47ba110bd4a53f59647f37a5466cb8c4b0fd8966
Selim Cinek [Thu, 20 Oct 2016 02:34:48 +0000 (02:34 +0000)]
Fixed a grey flash when swiping away the last notification
am:
54680901ed
Change-Id: I050754c1f749b7c5fce81359a52b7eba2f7b7d67
TreeHugger Robot [Thu, 20 Oct 2016 02:21:34 +0000 (02:21 +0000)]
Merge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev
Tyler Gunn [Thu, 20 Oct 2016 01:06:56 +0000 (01:06 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." into nyc-mr1-dev
am:
049980c284
Change-Id: I003ba96a8358b3104acae03f8e2a3e53d8b976df
Tyler Gunn [Thu, 20 Oct 2016 01:06:48 +0000 (01:06 +0000)]
Framework fixes to support VoLTE conf calls via RemoteConnectionServices.
am:
2282bb97e7
Change-Id: Ibc446de0822d379bc367d6bc410e9830b65d5d20
Tyler Gunn [Thu, 20 Oct 2016 00:56:18 +0000 (00:56 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." into nyc-mr1-dev
Selim Cinek [Wed, 19 Oct 2016 23:49:44 +0000 (16:49 -0700)]
Fixed a grey flash when swiping away the last notification
Change-Id: I12edf673f29abad66fa6704004886124eee9978b
Fixes:
32289359
Test: have 1 notification, swipe it a way, observe no flashing in statusbar
Kevin Hufnagle [Wed, 19 Oct 2016 23:53:40 +0000 (23:53 +0000)]
Merge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc-mr1-dev
am:
fee89015c5
Change-Id: Ieeb9f7424d8f8e7845417f069b044e50b95c693f
Kevin Hufnagle [Wed, 19 Oct 2016 23:53:36 +0000 (23:53 +0000)]
docs: Updated ShortcutManager and ShortcutInfo class references.
am:
68d699d100
Change-Id: I3d6ba36f36eddc3e9075383011732143c910a13f
Kevin Hufnagle [Wed, 19 Oct 2016 23:43:49 +0000 (23:43 +0000)]
Merge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc-mr1-dev
Winson [Wed, 19 Oct 2016 19:18:31 +0000 (19:18 +0000)]
Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev
am:
5f4169b5ea
Change-Id: I98a6d30d26fd00d09e670d22663617ccd0c5ca62
Winson [Wed, 19 Oct 2016 19:18:26 +0000 (19:18 +0000)]
Skip getting transforms for ignored tasks.
am:
448c0adb78
Change-Id: Ie929c699ee466b1298acab07eefa68006a92cdb1
Andrii Kulian [Wed, 19 Oct 2016 19:16:52 +0000 (19:16 +0000)]
Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev
am:
6e4f6ecbab
Change-Id: I56995f1b7239f4b3bb1a81c46891af04016561f0
Andrii Kulian [Wed, 19 Oct 2016 19:16:50 +0000 (19:16 +0000)]
DO NOT MERGE -- Use focused activity value when moving task back
am:
da3b648b64
Change-Id: Ib706755c056ed27050375a675169f7df3f5f141a
TreeHugger Robot [Wed, 19 Oct 2016 18:45:22 +0000 (18:45 +0000)]
Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev
Andrii Kulian [Wed, 19 Oct 2016 18:31:33 +0000 (18:31 +0000)]
Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev
Dan Yu [Wed, 19 Oct 2016 18:12:16 +0000 (18:12 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:
dc69de5ac6 am:
3aa0ff2de7 am:
8233c03d1e
am:
0346fee93c
Change-Id: I1997e8e14e5d0ddfbf60ea08797b57d107393411
Dan Yu [Wed, 19 Oct 2016 18:05:37 +0000 (18:05 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:
dc69de5ac6 am:
3aa0ff2de7
am:
8233c03d1e
Change-Id: If0291ee0b6df1c0fb81785b490cdf716ba9cc8b7
Daniel Yu [Wed, 19 Oct 2016 18:05:18 +0000 (18:05 +0000)]
docs: Updating TIF docs for new TIF Companion library. am:
e0810402fb am:
f8a8260c0d am:
9ce21dc769
am:
f45beedf6c
Change-Id: I2895221a6675da5909d4dbb1186321018189e10d
Yang Ni [Wed, 19 Oct 2016 17:59:16 +0000 (17:59 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev am:
6aee6e9ca8 am:
4a9883cdf8
am:
02addb0b41
Change-Id: I7f934cb65171862b1ef5f0e1c41c5c1916b99529
Yang Ni [Wed, 19 Oct 2016 17:58:16 +0000 (17:58 +0000)]
Updated API reference doc for Single-Source RS am:
51f1e93be7 am:
246b0bcc9a
am:
93f0442cbd
Change-Id: I9d26975a2ce8c0c9efa187cb1c90207f73b3c42a
Daniel Yu [Wed, 19 Oct 2016 17:57:11 +0000 (17:57 +0000)]
docs: Updating TIF docs for new TIF Companion library. am:
e0810402fb am:
f8a8260c0d
am:
9ce21dc769
Change-Id: I1066a9122bab7f3fe620bd23f17adc36559133a4
Yang Ni [Wed, 19 Oct 2016 17:52:39 +0000 (17:52 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev am:
6aee6e9ca8
am:
4a9883cdf8
Change-Id: I1a4378d4ec4c5b2e720d81d90d72c5b7fedce261
Dan Yu [Wed, 19 Oct 2016 17:52:35 +0000 (17:52 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:
dc69de5ac6
am:
3aa0ff2de7
Change-Id: If9e2b5d23f40a5d48906b81f818a2e9b5e8bb24a
Daniel Yu [Wed, 19 Oct 2016 17:51:36 +0000 (17:51 +0000)]
docs: Updating TIF docs for new TIF Companion library. am:
e0810402fb
am:
f8a8260c0d
Change-Id: Ida18c6b46ccff01cb6299b1774fbcc724f54712a
Yang Ni [Wed, 19 Oct 2016 17:51:32 +0000 (17:51 +0000)]
Updated API reference doc for Single-Source RS am:
51f1e93be7
am:
246b0bcc9a
Change-Id: I572709a23a33f0a17ad754221c27a042f9c44f2e
Dan Yu [Wed, 19 Oct 2016 17:44:48 +0000 (17:44 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs
am:
dc69de5ac6
Change-Id: I3f49c5fbd2dc9f298cdf0cdd8acc5f49188319d4
Daniel Yu [Wed, 19 Oct 2016 17:44:46 +0000 (17:44 +0000)]
docs: Updating TIF docs for new TIF Companion library.
am:
e0810402fb
Change-Id: Ic44c96963d1dd172f07f6564a084ca731bf49762
Yang Ni [Wed, 19 Oct 2016 17:37:43 +0000 (17:37 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev
am:
6aee6e9ca8
Change-Id: I86ae7b92e3c6bb2202375a990f0203630afa5744
Yang Ni [Wed, 19 Oct 2016 17:37:39 +0000 (17:37 +0000)]
Updated API reference doc for Single-Source RS
am:
51f1e93be7
Change-Id: Ie8c820ea2d55b16f66afd53034b69d4c770d17e0
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
Dan Yu [Wed, 19 Oct 2016 17:30:42 +0000 (17:30 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs
Yang Ni [Wed, 19 Oct 2016 17:25:55 +0000 (17:25 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev
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
Winson [Wed, 19 Oct 2016 16:53:59 +0000 (09:53 -0700)]
Skip getting transforms for ignored tasks.
- If the stack does not contain the existing ignored task view on
relayout, then we should not try and get the transform for it
since it will be skipped.
Bug:
32001762
Change-Id: I23182c76ac41b036c25edf92374622191e9d4ce3
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
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: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: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: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
Andrii Kulian [Tue, 18 Oct 2016 20:54:38 +0000 (13:54 -0700)]
DO NOT MERGE -- Use focused activity value when moving task back
When task is moved back we need to adjust currently focused activity
and sent currently resumed record from ActivityStack. However if this
happens when device is locked, resumed activity record will be null.
Need to used currently focused record from service instead.
Bug:
32172829
Change-Id: I2de9bc4135663ab45af859f21e9e92562deb44d4
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
Kevin Hufnagle [Sat, 15 Oct 2016 02:04:51 +0000 (19:04 -0700)]
docs: Updated ShortcutManager and ShortcutInfo class references.
Bug:
32074598
Change-Id: I168d49a8542b411a074dc6e9120b0f08f72a829a
TreeHugger Robot [Tue, 18 Oct 2016 22:46:22 +0000 (22:46 +0000)]
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev
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: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: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
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
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
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
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: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