OSDN Git Service
Sudheer Shanka [Mon, 19 Sep 2016 20:15:56 +0000 (20:15 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am:
b59e73613b
Change-Id: Ibb2cba35ebedc884247c189a214ccce396333342
Paul Jensen [Mon, 19 Sep 2016 14:55:54 +0000 (14:55 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f am:
d6a5f68f52
am:
a81dd677d3
Change-Id: Id2da47a2300b6fd211da08daddc1873bdc519e14
Paul Jensen [Mon, 19 Sep 2016 14:50:48 +0000 (14:50 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f
am:
d6a5f68f52
Change-Id: I55e5c90dd0b2c52a1cbee5d6be14a339157d6a75
Paul Jensen [Mon, 19 Sep 2016 14:43:28 +0000 (14:43 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24
am:
009e08116f
Change-Id: Ied1bf21ec09d9774bd0f12d2688244fe7dc2bd80
Paul Jensen [Mon, 19 Sep 2016 14:37:29 +0000 (14:37 +0000)]
Fix build break due to automerge of
7d2198b5
am:
baae57ab24
Change-Id: Iafcc207308b94d37a04d196def0e7c7a5ce037d9
Paul Jensen [Mon, 19 Sep 2016 12:53:20 +0000 (08:53 -0400)]
Fix build break due to automerge of
7d2198b5
Bug:
30100884
Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f
Paul Jensen [Mon, 19 Sep 2016 12:08:02 +0000 (12:08 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9 am:
b7ba9fd70f am:
4121b70a7d
am:
c875015cc5
Change-Id: Ic04dd9fcf708873b95113814eeba18501861a32a
Paul Jensen [Mon, 19 Sep 2016 12:02:09 +0000 (12:02 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465 am:
ddce8664bd am:
4fd2cc7277
am:
2855de1e7c
Change-Id: I67e399dc97073387b2c0c6769bf9b4b19cb91a62
Paul Jensen [Mon, 19 Sep 2016 12:01:57 +0000 (12:01 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9 am:
b7ba9fd70f
am:
4121b70a7d
Change-Id: I225d23b2ad0afa6113c085d2ee7e51c996896902
Paul Jensen [Mon, 19 Sep 2016 11:55:30 +0000 (11:55 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9
am:
b7ba9fd70f
Change-Id: If57722c1437bd5ea7b3a1fd016cbc7fce8237965
Paul Jensen [Mon, 19 Sep 2016 11:55:24 +0000 (11:55 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465 am:
ddce8664bd
am:
4fd2cc7277
Change-Id: I2bd78344796e888c4fa26dcf2e07a0a24994cb42
Paul Jensen [Mon, 19 Sep 2016 11:50:42 +0000 (11:50 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465
am:
ddce8664bd
Change-Id: I9379db3398f066841fdb5435d8128e2d12bff63b
Paul Jensen [Mon, 19 Sep 2016 11:50:23 +0000 (11:50 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb
am:
849f1ba2d9
Change-Id: I3213d64cc5396a22096e3ad484a3f769f03f6cda
Paul Jensen [Mon, 19 Sep 2016 11:44:22 +0000 (11:44 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9
am:
d37eb76465
Change-Id: I2433d723fd9ec13774eff4aa40a089e73932f357
Paul Jensen [Mon, 19 Sep 2016 11:40:02 +0000 (11:40 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947
am:
3532f10fcb
Change-Id: I9dc833de510da32d47c4e6b0a78eae4cc7a38832
Paul Jensen [Mon, 19 Sep 2016 11:37:54 +0000 (11:37 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7
am:
66ee2296a9
Change-Id: Ib0023b44e521b936ab2f9450ad367b1feda64492
Paul Jensen [Mon, 19 Sep 2016 11:34:00 +0000 (11:34 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc
am:
963ca6f947
Change-Id: I1a509c39640e7f9d76bd2e420764aeb3d823a3df
Paul Jensen [Mon, 19 Sep 2016 11:31:54 +0000 (11:31 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273
am:
6634e90ad7
Change-Id: Id46b32b80d47f6b7e2bfab2740978377a6b711cf
Paul Jensen [Mon, 19 Sep 2016 11:27:47 +0000 (11:27 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b
am:
7c08c4d5cc
Change-Id: Idd0a3598ffac808a39703a23238b47a02bca66ed
Paul Jensen [Mon, 19 Sep 2016 11:25:21 +0000 (11:25 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586
am:
9c1cb7a273
Change-Id: I8cd4b0d33da22bc29abd176672659c3eeb8c7d5b
Paul Jensen [Mon, 19 Sep 2016 11:19:16 +0000 (11:19 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev
am:
96c045807b
Change-Id: Ia20ba679f7b0445567b43aa74eef27f751453d4e
Paul Jensen [Mon, 19 Sep 2016 11:19:13 +0000 (11:19 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big
am:
7d2198b586
Change-Id: I512d6f9de6a92dd3cabec93bcadf437f5cf2e16d
Paul Jensen [Mon, 19 Sep 2016 11:10:59 +0000 (11:10 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:12:15 +0000 (14:12 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c am:
9bb068a5ad am:
22c8e0b51d -s ours
am:
839671d5a9
Change-Id: I04ba40b04c2127a11bc70b1952a452a404275a9e
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:40:52 +0000 (13:40 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c am:
9bb068a5ad
am:
22c8e0b51d -s ours
Change-Id: I55c117eeaeaaf2801fc19fdc6619a20fc17c13a2
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:18:57 +0000 (13:18 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c
am:
9bb068a5ad
Change-Id: I0e4ea875ea14217e98ed5df3642046ce8d3db52a
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:03:08 +0000 (13:03 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours
am:
94537b171c
Change-Id: I382b954e67faa6ebf662349a763aafe8704ae711
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:54:49 +0000 (12:54 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9 am:
c296565749 am:
dd583cf069 -s ours
am:
2e0a30efd9
Change-Id: I0fa0e8796310aeec561e4baf33da4fc0145e9c34
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:51:27 +0000 (12:51 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197 am:
3b06511a95 am:
61d39b340a -s ours
am:
ee518e410b
Change-Id: I178dd732ef1b77e4235db277830b2959e8de7831
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:48:56 +0000 (12:48 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b am:
9ef783599b am:
8310560c62 -s ours
am:
a53a42f049
Change-Id: Id245054a21bd9f029773b5ea2e2663fae836c860
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:47:22 +0000 (12:47 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours
am:
2578264b86 -s ours
Change-Id: I0f5483480d7ba6c5a5386635fabc0db0bb5aefdb
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:29:44 +0000 (12:29 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9 am:
c296565749
am:
dd583cf069 -s ours
Change-Id: I72554dbf5ccc292baf9a6769c0f52a66cc7d33ee
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:27:17 +0000 (12:27 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77 am:
cd8595cdcf am:
f9dac671ca -s ours
am:
9b5fba5f32
Change-Id: Ia9166d55f26c782c9ff1a5b1d2eb25a7d8d4549b
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:27:12 +0000 (12:27 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197 am:
3b06511a95
am:
61d39b340a -s ours
Change-Id: I8a3cba1aaacab87ac5b2ab00c29c7c52f3c8a55c
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:23:36 +0000 (12:23 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9
am:
c296565749
Change-Id: I3b97c7b101c53c77f03c889d945d4630edebee44
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:22:55 +0000 (12:22 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e
am:
29f2e1d93a -s ours
Change-Id: Iaed8d1cc6e6a6bf00a9602ebb829d008f8c4e56e
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:21:50 +0000 (12:21 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b am:
9ef783599b
am:
8310560c62 -s ours
Change-Id: I4091f8ea0cff4720b792d49ee2d5f5cd9c3d3027
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:21:41 +0000 (12:21 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197
am:
3b06511a95
Change-Id: Ia01e63fcf975c21136c0b0206ecd413ec3d975ad
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:17:27 +0000 (12:17 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77 am:
cd8595cdcf
am:
f9dac671ca -s ours
Change-Id: I252b7a8870a3b161a72e1fd7e0dcc7943e6d08ed
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:17:17 +0000 (12:17 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1
am:
57454cf15e
Change-Id: I2620580fca624c6ab4520f0a31c42cef42bafa01
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:12:22 +0000 (12:12 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b
am:
9ef783599b
Change-Id: Idd8e19b941e01ff2de557c569bb06dc0a7bbb6d1
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:12:15 +0000 (12:12 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours
am:
233e3b22f9
Change-Id: Iec8b29d93df5e23d80fe9c48f102a6c8d5b4daba
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:10:22 +0000 (12:10 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77
am:
cd8595cdcf
Change-Id: I27939b464cc8e57a7eba7e03af0f4601fb777ec3
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:10:03 +0000 (12:10 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours
am:
076f262197
Change-Id: Idcd2180c908fb20bfd861c74e07c45c7b2cffed5
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:07 +0000 (12:04 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev
am:
3a4431bbb9
Change-Id: I7a2ef348e1b198f00c750be3653a2e95cc11df22
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:06 +0000 (12:04 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev
am:
5fa097311c -s ours
Change-Id: I4c06dd7ff10cafcf15d0e4ece474c97343f608ae
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:03 +0000 (12:04 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
c6fc6c3b55 -s ours
Change-Id: I1433140b2805ca127956f210a3faa81f83dd3069
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:03 +0000 (12:04 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
7bb4c82558
Change-Id: I78dae55bf202feafe465875b4ddd85ed4827d74d
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:01 +0000 (12:04 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev
am:
8fa8da727b
Change-Id: Ic46e534eebdba8def4e32318aee04601179fc7a9
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:03:59 +0000 (12:03 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
f71d2cddf1
Change-Id: Iaa5041d4b5fc61860f7ce95ecce60d39bbd5023b
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:03:58 +0000 (12:03 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
43f4980e77
Change-Id: Ibbf09fdbcaf00fd41d832e3e2597978e2a0863a9
Tadashi G. Takaoka [Sun, 18 Sep 2016 11:56:23 +0000 (11:56 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev
Tadashi G. Takaoka [Sun, 18 Sep 2016 11:55:55 +0000 (11:55 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev
Tadashi G. Takaoka [Sun, 18 Sep 2016 11:55:33 +0000 (11:55 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev
Jeff Sharkey [Fri, 16 Sep 2016 23:14:51 +0000 (23:14 +0000)]
Merge commit '
0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
am:
df42d732f8
Change-Id: Ib7efd9dacf476d8a717456d8e6fc7ee617483d17
Jeff Sharkey [Fri, 16 Sep 2016 22:57:34 +0000 (16:57 -0600)]
Merge commit '
0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
Jeff Sharkey [Fri, 16 Sep 2016 22:07:27 +0000 (22:07 +0000)]
Use "all_downloads" instead of "my_downloads". am:
1547194418 am:
f6d7c1ed15
am:
6db572cf00
Change-Id: I687a883d528cc260aad3ee3da5600d3e0542c940
Jeff Sharkey [Fri, 16 Sep 2016 21:53:37 +0000 (21:53 +0000)]
Use "all_downloads" instead of "my_downloads". am:
1547194418
am:
f6d7c1ed15
Change-Id: Icb352ec7b0e746264a6311b5fba1fc1272b627b0
Jeff Sharkey [Fri, 16 Sep 2016 21:48:24 +0000 (21:48 +0000)]
Use "all_downloads" instead of "my_downloads".
am:
1547194418
Change-Id: I6dabba1f82ef1989eb2a52c3c493127a174ff315
Jeff Sharkey [Fri, 16 Sep 2016 18:04:05 +0000 (12:04 -0600)]
Use "all_downloads" instead of "my_downloads".
We can no longer return the "my_downloads" paths: if those Uris were
shared beyond the app that requested the download, access would be
denied. Instead, we need to switch to using "all_downloads" Uris so
that permission grants can be issued to third-party viewer apps.
Since an app requesting a download doesn't normally have permission
to "all_downloads" paths, DownloadProvider now issues narrow grants
toward the owner of each download, both at device boot and when new
downloads are started.
Bug:
30537115,
30945409
Change-Id: I533125b36444877f54373d88922f2acc777e250b
Tadashi G. Takaoka [Fri, 16 Sep 2016 03:12:14 +0000 (12:12 +0900)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
Bug:
30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from
9b2997d22e6ce2a15065d8e7608dd77b316c2065)
Tadashi G. Takaoka [Fri, 16 Sep 2016 03:12:14 +0000 (12:12 +0900)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
Bug:
30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from
9b2997d22e6ce2a15065d8e7608dd77b316c2065)
Tadashi G. Takaoka [Fri, 16 Sep 2016 03:12:14 +0000 (12:12 +0900)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
Bug:
30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from
9b2997d22e6ce2a15065d8e7608dd77b316c2065)
Tadashi G. Takaoka [Fri, 16 Sep 2016 03:00:57 +0000 (12:00 +0900)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
Bug:
30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from
9b2997d22e6ce2a15065d8e7608dd77b316c2065)
Sudheer Shanka [Wed, 14 Sep 2016 21:37:14 +0000 (14:37 -0700)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
Don't hold mPidsSelfLocked lock when calling
cleanUpApplicationRecordLocked.
Bug:
31463143
Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98
John Reck [Tue, 13 Sep 2016 20:13:27 +0000 (20:13 +0000)]
Ensure munmap matches mmap
am:
aa394dd42c
Change-Id: I80dbf9a859693cbd90aa472b04ae58d4d081d735
John Reck [Mon, 12 Sep 2016 17:43:35 +0000 (10:43 -0700)]
Ensure munmap matches mmap
Bug:
31350622
Change-Id: I6d3f9faec32d54360caa6706d17405e20b50966c
Sungsoo [Sat, 10 Sep 2016 00:03:23 +0000 (00:03 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours
am:
deeb0e5246
Change-Id: Ica5ffed73e58ea429c88e52551e69ac39938c46c
Sungsoo [Fri, 9 Sep 2016 23:50:46 +0000 (23:50 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0
am:
2ddc2956fd -s ours
Change-Id: Ie0a7dad2ed06124a537077f8fb85c95bc1d49781
Sungsoo [Fri, 9 Sep 2016 23:46:07 +0000 (23:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e
am:
40d3c1a7f0
Change-Id: I491d585b91c7d7b130bbfbcdd62aaddf57718c56
Sungsoo [Fri, 9 Sep 2016 23:39:52 +0000 (23:39 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours
am:
14bc23be74
Change-Id: I697d8519269bcf82d47a00b9ed236bd285268261
Sungsoo [Fri, 9 Sep 2016 23:37:52 +0000 (23:37 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours
am:
9f37a8900e
Change-Id: Ied9ac7711abaee4d1f534d35f7882f0a93c425bf
Sungsoo [Fri, 9 Sep 2016 23:27:21 +0000 (23:27 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e
am:
ca88e604e4 -s ours
Change-Id: Iae1ea19a96fbf9421a24b5682c4b769af95b2660
Sungsoo [Fri, 9 Sep 2016 23:08:29 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours
am:
f495cf6944 -s ours
Change-Id: If47c5a777ad3c7e4cca070ca633ec01442444c8e
Sungsoo [Fri, 9 Sep 2016 23:08:29 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0
am:
c17e29076e
Change-Id: If6e85c284a811287a9751eb501e50dabe2dfe8b1
Sungsoo [Fri, 9 Sep 2016 23:08:25 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours
am:
aa1d75f5e7
Change-Id: Ib06cad762d46ba7577a87ef19c9cfe8f83f7ba0c
Sungsoo [Fri, 9 Sep 2016 23:01:41 +0000 (23:01 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef
am:
dde94fc477 -s ours
Change-Id: I301706cbdc5fd2ca56eb671891e55fd31dfa469a
Sungsoo [Fri, 9 Sep 2016 23:00:35 +0000 (23:00 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830
am:
d07324fe85 -s ours
Change-Id: Ie3049cea7663d06632b0e3139f30f01e7dba5df0
Sungsoo [Fri, 9 Sep 2016 23:00:21 +0000 (23:00 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours
am:
3af57850a0
Change-Id: I70f6b639cab68d401d3927c67192d3b89e08eee3
Sungsoo [Fri, 9 Sep 2016 22:54:32 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
aebe2347a7 -s ours
Change-Id: I58dd093cb10fd89e44d59867f5a4c1a378a61661
Sungsoo [Fri, 9 Sep 2016 22:54:28 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30
am:
8d3e6bd3ef
Change-Id: I83f7733039ee73407aa5d7f3848ad1074e9dfb03
Sungsoo [Fri, 9 Sep 2016 22:54:12 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953
am:
b336cce830
Change-Id: Ib90b72ce9abefc6a7ceab1070555ded45dc8567d
Sungsoo Lim [Fri, 9 Sep 2016 22:47:09 +0000 (22:47 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev
am:
987472290c
Change-Id: Ida680d7915f1774e1f4b2cf94d38c384d50c0e64
Sungsoo [Fri, 9 Sep 2016 22:47:06 +0000 (22:47 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
2ee53c82cc
Change-Id: Ifb5d9af5faae122dcd3111a83e69a218bf4e4f3f
Sungsoo [Fri, 9 Sep 2016 22:46:44 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
659275dc30
Change-Id: I385c86e9753f1c99201a4f32b3c8b840da51376e
Sungsoo [Fri, 9 Sep 2016 22:46:23 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
1bdd10a953
Change-Id: I644f8187ed6f5957fc273b98c10ed0c602ed1879
Sungsoo Lim [Fri, 9 Sep 2016 22:39:06 +0000 (22:39 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev
Narayan Kamath [Fri, 9 Sep 2016 10:28:52 +0000 (10:28 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b
am:
e59073096e
Change-Id: Ifb7972c30d70a0fbc4ffdae100aac2d77ca445ca
Narayan Kamath [Fri, 9 Sep 2016 10:21:48 +0000 (10:21 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours
am:
646ee94421
Change-Id: I62f6556e630707274daa4ee0a4a57c77f5329bbc
Narayan Kamath [Fri, 9 Sep 2016 10:18:19 +0000 (10:18 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
am:
00e808b06b
Change-Id: I14939b5bf04ba47229e663b2ffc50543c5c6bc9a
Narayan Kamath [Fri, 9 Sep 2016 10:15:11 +0000 (10:15 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
82c6e6267e -s ours
Change-Id: Ib35b2567f19aff39d285794951cf9b8cb8d74ef1
Narayan Kamath [Fri, 9 Sep 2016 10:05:44 +0000 (10:05 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
Narayan Kamath [Thu, 8 Sep 2016 08:30:41 +0000 (08:30 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
am:
014016cf32
Change-Id: Ic0cf8b5cc2accaad552b82eaadce359e21e5e624
Narayan Kamath [Thu, 8 Sep 2016 08:23:49 +0000 (08:23 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
0f6a0e1560 -s ours
Change-Id: I2cdd131b750b4d04672149dcf7a90d2d566dd621
Narayan Kamath [Thu, 8 Sep 2016 08:20:55 +0000 (08:20 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev
Narayan Kamath [Thu, 8 Sep 2016 08:12:17 +0000 (08:12 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
OSDN Git Service
