OSDN Git Service
Sungsoo [Fri, 9 Sep 2016 23:37:47 +0000 (23:37 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours am:
aa1d75f5e7
am:
e9a7225bf2
Change-Id: Ie7fa7ee8d7f4acee388ec76ae1f687c6235c955b
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 Lim [Fri, 9 Sep 2016 22:55:14 +0000 (22:55 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am:
987472290c
am:
bcc0e5a7ab
Change-Id: I03932a82253351dd46dee8bdd7e8910bd5862410
Sungsoo [Fri, 9 Sep 2016 22:55:11 +0000 (22:55 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc
am:
865bf88813
Change-Id: I1a59ad0872c98a416efa7bfc8800d65c01cea3f8
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 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 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:33:40 +0000 (10:33 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e
am:
24ffc9ab47
Change-Id: I78adbdbbf8ffddfee3cd8b1407415cdf3a4d1b1f
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:28:46 +0000 (10:28 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421
am:
8f0cc3dd13
Change-Id: Ida08d48da51f9f49dc70a916fa379cf89a4d33c0
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:40:03 +0000 (08:40 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32
am:
447d3798f1
Change-Id: I323c669ed44e10f9e3a91271f47800754da5d389
Narayan Kamath [Thu, 8 Sep 2016 08:33:40 +0000 (08:33 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours
am:
6fa8339792
Change-Id: Id7ad55a251a26782815005218dc186b53e74cfca
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:24:54 +0000 (08:24 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev
am:
459810b9b7
Change-Id: I867a7c97c8363ede1b04e4ea8a75045d36d9d58d
Narayan Kamath [Thu, 8 Sep 2016 08:24:47 +0000 (08:24 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
41ca1bce01
Change-Id: Id08676457fa3fa022d607e5de754f49b9c396261
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
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- change std::unordered_map to std::tr1::unordered_map.
- add /dev/alarm and /dev/__properties__ to the whitelist.
- map.erase(iterator) returns void prior to C++11, so need the kludge
of calling erase(it++).
(cherry picked from commit
7ec85f9d549971af59f047d5eafd7a829e1541c7)
Change-Id: If44dc64275d753553233b78a05d41df9d5bfdc36
Narayan Kamath [Wed, 7 Sep 2016 20:17:02 +0000 (20:17 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c
am:
36b90a1934
Change-Id: Iec55904ecb004d3bf89bf3a065e5811afae798d6
Narayan Kamath [Wed, 7 Sep 2016 20:12:43 +0000 (20:12 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b
am:
2acf9f7e3c
Change-Id: Ideae7875e299ec0292054aad85fe8aa92b6aba9b
Narayan Kamath [Wed, 7 Sep 2016 20:07:58 +0000 (20:07 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours
am:
9802fcfa2b
Change-Id: Iabeefa7d07d78002c124ce62dc210111b83a99b7
Narayan Kamath [Wed, 7 Sep 2016 20:01:56 +0000 (20:01 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87
am:
9a409265fc -s ours
Change-Id: Idf4dcc5ab7e8b0510848cbd2f220fe7a8e4b3e04
Narayan Kamath [Wed, 7 Sep 2016 18:58:41 +0000 (18:58 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54
am:
f7b9f84f87
Change-Id: I317cecff389f30c5d47e4adee1afafbde8d9d23d
Narayan Kamath [Wed, 7 Sep 2016 18:53:40 +0000 (18:53 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
7ec85f9d54
Change-Id: I6db56b5b06636201382f6d908297644183253c0b
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- add /dev/__properties__ to the whitelist.
Change-Id: I709a7f4913e807a8fec8a58c81e98fe5b5222820
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- add /dev/__properties__ to the whitelist.
Change-Id: Ic512be6362c3c5d84767e933884872b7e995dfea
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- change std::unordered_map to std::tr1::unordered_map.
- add /dev/alarm and /dev/__properties__ to the whitelist.
- map.erase(iterator) returns void prior to C++11, so need the kludge
of calling erase(it++).
Change-Id: I694ff66d5f227239b0190ffc2287882b16e336fa
Sudheer Shanka [Thu, 25 Aug 2016 23:22:19 +0000 (23:22 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58 am:
cdf70ba0a3 am:
c2a760e68c
am:
77dec89bb3
Change-Id: I1d755ef86b80f723c3fde59476e0018167fbf8b7
Sudheer Shanka [Thu, 25 Aug 2016 23:22:14 +0000 (23:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours am:
f368bdee06 am:
f21534a288 am:
dfc2d0a4bc -s ours am:
603a69ffb4
am:
97194798ab
Change-Id: If4a1716de3d54d6a08025665cdff51edc1b2f6da
Amith Yamasani [Thu, 25 Aug 2016 23:22:10 +0000 (23:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e
am:
75c7391a41
Change-Id: I2646c10763640e6079e09e6fd53b9958b3aba2ea
Sudheer Shanka [Thu, 25 Aug 2016 23:22:04 +0000 (23:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb
am:
2490679d7e
Change-Id: I59f3ace3a9c72a6d2fe1e1bd4cadec102a8c6254
Amith Yamasani [Thu, 25 Aug 2016 23:22:00 +0000 (23:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours am:
368ae62e9d
am:
1d513c845a
Change-Id: If920208b052d41a80d3a0bf70af831313c9b9c06
Sudheer Shanka [Thu, 25 Aug 2016 23:14:09 +0000 (23:14 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58 am:
cdf70ba0a3
am:
c2a760e68c
Change-Id: I2e5a3bb037921013e78b4270d843cebe239ac520
Sudheer Shanka [Thu, 25 Aug 2016 23:14:06 +0000 (23:14 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours am:
f368bdee06 am:
f21534a288 am:
dfc2d0a4bc -s ours
am:
603a69ffb4
Change-Id: Ie94c3c24a3b07c26c8b363358f4df1d7366d95a2
Amith Yamasani [Thu, 25 Aug 2016 23:14:04 +0000 (23:14 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours
am:
9080d4462e
Change-Id: Idd437ad418ac2deaf08a9c0ac89cb518c216d8f1
Sudheer Shanka [Thu, 25 Aug 2016 23:14:01 +0000 (23:14 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours
am:
86ac88ccdb
Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562
Amith Yamasani [Thu, 25 Aug 2016 23:13:58 +0000 (23:13 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours
am:
368ae62e9d
Change-Id: Icfafc6e9d56a97777db1c3d0e0feae3305f6707f
Narayan Kamath [Thu, 25 Aug 2016 23:13:51 +0000 (23:13 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624
am:
8f4f9e4d5e
Change-Id: I2f470a15113ac14219dea82c3a9487ef96f3f2f4
Narayan Kamath [Thu, 25 Aug 2016 23:08:25 +0000 (23:08 +0000)]
resolve merge conflicts of
5191225 to mnc-dev
am:
1fbc4b8624
Change-Id: Id3aad329dd515a392cbeb2f0e03c2eb5aee5cf71
Sudheer Shanka [Thu, 25 Aug 2016 23:07:56 +0000 (23:07 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58
am:
cdf70ba0a3
Change-Id: Ia7c597b1b96e65cce89396a6b509a796bb17bc2c
Sudheer Shanka [Thu, 25 Aug 2016 23:07:53 +0000 (23:07 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours am:
f368bdee06 am:
f21534a288
am:
dfc2d0a4bc -s ours
Change-Id: Ia4a5952bc4fda5be8602708215ff1d72a5db297a
Amith Yamasani [Thu, 25 Aug 2016 23:07:51 +0000 (23:07 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec
am:
7b8140652b -s ours
Change-Id: I40d855d0f87483a6a8733475b490ddf6ee582433
Sudheer Shanka [Thu, 25 Aug 2016 23:07:49 +0000 (23:07 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6
am:
26bb7bf86c -s ours
Change-Id: Id2ddb640c8d041f13a78c5f07fb1749968618b61
Amith Yamasani [Thu, 25 Aug 2016 23:07:46 +0000 (23:07 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0
am:
117a383099 -s ours
Change-Id: I8173ba5c3156a6294d672db63c4a310b0c880cfb
Narayan Kamath [Thu, 25 Aug 2016 09:43:25 +0000 (10:43 +0100)]
resolve merge conflicts of
5191225 to mnc-dev
Change-Id: I8dd276f61e77b0fe2d861f4b0d34d76bf533192f
Narayan Kamath [Wed, 24 Aug 2016 22:33:43 +0000 (22:33 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04 am:
c01db7dca3
am:
8e168116d0
Change-Id: Iffa2e8ae4f02adaf4c031d8b5d50362ee9efb1d1
David Christie [Wed, 24 Aug 2016 22:33:41 +0000 (22:33 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30 am:
8788a2413c am:
c6ab92e93b am:
3970ee98f7
am:
735699f3ef
Change-Id: I80e68cde7a673cfb269ecad9114dbb14850287b4
David Christie [Wed, 24 Aug 2016 22:33:39 +0000 (22:33 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66 am:
d610363a48
am:
0777ad8253
Change-Id: I9403ca33c0b87ca1ca01f2ce5209c12332b01e51
David Christie [Wed, 24 Aug 2016 22:33:37 +0000 (22:33 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619
am:
3aaac55e70
Change-Id: I01b09466d9993f28de5c95a7d21555b3be112891
Narayan Kamath [Wed, 24 Aug 2016 22:23:54 +0000 (22:23 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04
am:
c01db7dca3
Change-Id: I056c33c5925a625b539df250af0fa7d48258b0f2
David Christie [Wed, 24 Aug 2016 22:23:52 +0000 (22:23 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30 am:
8788a2413c am:
c6ab92e93b
am:
3970ee98f7
Change-Id: I68f89fabe5603941e009f48f3277a2c40221ce74
David Christie [Wed, 24 Aug 2016 22:23:49 +0000 (22:23 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66
am:
d610363a48
Change-Id: I186b4bedcf057489deca1e161a052619ce594e56
David Christie [Wed, 24 Aug 2016 22:23:46 +0000 (22:23 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d
am:
dd1016c619
Change-Id: I54910f6c22b69b029be80007cdbf06b203886398
David Christie [Wed, 24 Aug 2016 22:23:42 +0000 (22:23 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev am:
6195acc2b5
am:
e24eb2dbb5
Change-Id: Idb6cbe8c16877301aed50faed41fa0390db3cf10
David Christie [Wed, 24 Aug 2016 22:16:07 +0000 (22:16 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev
am:
6195acc2b5
Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be
Narayan Kamath [Wed, 24 Aug 2016 22:14:36 +0000 (22:14 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f
am:
c11e8fcc04
Change-Id: Idd314c1e12919d8cbaf9e71d72519d34d18e6f01
David Christie [Wed, 24 Aug 2016 22:14:32 +0000 (22:14 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30 am:
8788a2413c
am:
c6ab92e93b
Change-Id: I0d17aacc1d83b2bceb9abcfa3da1f1ff3dc74e09
David Christie [Wed, 24 Aug 2016 22:14:28 +0000 (22:14 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1
am:
af369f6e66
Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4
David Christie [Wed, 24 Aug 2016 22:14:24 +0000 (22:14 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
am:
975879a18d
Change-Id: Icf81e5ce2bc02750d66b13feedfc098dd9374167
David Christie [Wed, 24 Aug 2016 20:47:57 +0000 (13:47 -0700)]
resolve merge conflicts of
a2399b4 to mnc-dev
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
Sudheer Shanka [Wed, 24 Aug 2016 20:38:40 +0000 (20:38 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944
am:
a0994c6d58
Change-Id: I50cb41c74c4d049390155fc0981f6609673febd0
Sudheer Shanka [Wed, 24 Aug 2016 20:38:30 +0000 (20:38 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours am:
f368bdee06
am:
f21534a288
Change-Id: I4e5a6b4eb30dde276a1293e986398a8dba21ef05
Amith Yamasani [Wed, 24 Aug 2016 20:38:20 +0000 (20:38 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986
am:
03b0f5c3ec
Change-Id: Ic8565bef0bbd034c4d54eff428731809b29ee0c3
Sudheer Shanka [Wed, 24 Aug 2016 20:38:16 +0000 (20:38 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7
am:
c8aedeeaf6
Change-Id: Id8f62a0c41004aa713d61a87f59e7ee1eff4ee0a
Amith Yamasani [Wed, 24 Aug 2016 20:38:12 +0000 (20:38 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf
am:
dd0be992c0
Change-Id: I93958d0b8cf2d7a79af4ff534209848f3b0e35c2
Narayan Kamath [Wed, 24 Aug 2016 20:30:21 +0000 (20:30 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47 am:
efab128e67 am:
86437ec433
am:
4d7740907e
Change-Id: If0e46bb3e4fd182a46b714e0e9140deac8fc470e
Narayan Kamath [Wed, 24 Aug 2016 20:30:13 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours am:
2984748753 am:
b9fae65605
am:
c6c7ca0cde
Change-Id: Ifca9f825dac758c653560c41b81a13bd13c9fd4c
Narayan Kamath [Wed, 24 Aug 2016 20:30:09 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f
am:
3c63bb367f
Change-Id: Iaa5ba9f3fcc28da14b60dc489e49bd177d2bfcb3
David Christie [Wed, 24 Aug 2016 20:30:06 +0000 (20:30 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30
am:
8788a2413c
Change-Id: If9d5385d7d949e85932e5586d4884ffe84d51d47
David Christie [Wed, 24 Aug 2016 20:30:01 +0000 (20:30 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24
am:
41a0dd41f1
Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
David Christie [Tue, 23 Aug 2016 23:19:51 +0000 (16:19 -0700)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
Sudheer Shanka [Mon, 22 Aug 2016 22:38:23 +0000 (22:38 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207 am:
21ef672cab am:
e0d1ff1c42 -s ours am:
b31a6955a4 -s ours
am:
52d0f48f80
Change-Id: I01d36d2e160c3e33e3f2701843d768b5f581af1b
Sudheer Shanka [Mon, 22 Aug 2016 22:33:15 +0000 (22:33 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207 am:
21ef672cab am:
e0d1ff1c42 -s ours
am:
b31a6955a4 -s ours
Change-Id: I6fb134e75355bc1fdcc2dd9a21b51802575c28f3
Sudheer Shanka [Mon, 22 Aug 2016 22:33:10 +0000 (22:33 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9
am:
6a50270944
Change-Id: I55fa6f6719a4ce3358ca7ba9f0244fb4ada96368
Sudheer Shanka [Mon, 22 Aug 2016 22:28:24 +0000 (22:28 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours
am:
bbbb514bc9
Change-Id: I47bfb18ce300e52a092da534b8aac720f0b8aa3f
Sudheer Shanka [Mon, 22 Aug 2016 22:19:10 +0000 (22:19 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207 am:
21ef672cab
am:
e0d1ff1c42 -s ours
Change-Id: I8a1464443e84bb7987235d25ad40ae01386d72ef
Sudheer Shanka [Mon, 22 Aug 2016 22:19:06 +0000 (22:19 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev
am:
76c4b2a7b6 -s ours
Change-Id: Icdcd0929eb7bd32665e91fe2598af46db3ff01bd
Sudheer Shanka [Mon, 22 Aug 2016 22:11:52 +0000 (22:11 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207
am:
21ef672cab
Change-Id: Ia073a40c330038e77ff5992c056a8fe0a5924edb
Julius D'souza [Mon, 8 Aug 2016 02:08:30 +0000 (19:08 -0700)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
Bug:
18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
Jim Miller [Fri, 19 Aug 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
am:
02e9affa42
Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
Jim Miller [Fri, 19 Aug 2016 20:09:41 +0000 (20:09 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE
am:
b6f4b48df2
Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
TreeHugger Robot [Fri, 19 Aug 2016 20:03:46 +0000 (20:03 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
Sudheer Shanka [Fri, 19 Aug 2016 18:27:31 +0000 (11:27 -0700)]
resolve merge conflicts of
270947f to klp-modular-dev
Change-Id: I703a7f8eb0897e518c3df9e8c7efa19508611a47
Sudheer Shanka [Fri, 19 Aug 2016 18:01:17 +0000 (18:01 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours
am:
f368bdee06
Change-Id: I56d187b0466e674e423754818ba51ca0cdd61a3c
Sudheer Shanka [Fri, 19 Aug 2016 17:46:12 +0000 (17:46 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev
am:
de04301f9a
Change-Id: I1d04889e2227d0a9a6b86b44ce38cdc5763dfac0
Sudheer Shanka [Fri, 19 Aug 2016 17:32:47 +0000 (17:32 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb
am:
7e890c8eb5
Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
Amith Yamasani [Fri, 19 Aug 2016 17:32:44 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4
am:
29ae7b1a27
Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
Sudheer Shanka [Fri, 19 Aug 2016 17:32:01 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
a3af5c6207
Change-Id: Ibdd69f2fa346dc31224fa6357718f56aa26ded1d
Amith Yamasani [Fri, 19 Aug 2016 17:31:47 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours
am:
9be12f8986
Change-Id: Ie692388b7c4ad6492444347ac128d8cf83dd9e21
Sudheer Shanka [Fri, 19 Aug 2016 17:31:43 +0000 (17:31 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev
am:
5e55214ab7
Change-Id: If6174229b0b6d378b7cf6c5f5618ce70d04c400b