OSDN Git Service
Jeff Sharkey [Wed, 7 Dec 2016 22:52:12 +0000 (22:52 +0000)]
Merge "Yet another set of installd Binder methods." am:
77f764d66f
am:
f2de2d1892
Change-Id: I97a8ff8ea5e798977061ca6bfa2e6f41c46f4dc8
Jeff Sharkey [Wed, 7 Dec 2016 22:47:59 +0000 (22:47 +0000)]
Merge "Yet another set of installd Binder methods."
am:
77f764d66f
Change-Id: I92f820a6e51824f93a68109f74ce66d73679c28e
Jeff Sharkey [Wed, 7 Dec 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Yet another set of installd Binder methods."
Jeff Sharkey [Wed, 7 Dec 2016 17:37:27 +0000 (10:37 -0700)]
Yet another set of installd Binder methods.
Pretty straightforward refactoring.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: I6e79fe1a3663807c24eb28dca684b539df398c13
Jeff Sharkey [Wed, 7 Dec 2016 06:53:45 +0000 (06:53 +0000)]
Merge "Move more installd methods to Binder." am:
f69c024050
am:
7e7ce45e1c
Change-Id: Icf76d4f7895fd77d21d05572519b9a0fdc7665c4
Jeff Sharkey [Wed, 7 Dec 2016 06:45:24 +0000 (06:45 +0000)]
Merge "Move more installd methods to Binder."
am:
f69c024050
Change-Id: I8389e2fd000f1e90e22b83777ebaf44f26c90c61
Jeff Sharkey [Wed, 7 Dec 2016 06:39:27 +0000 (06:39 +0000)]
Merge "Move more installd methods to Binder."
Dan Willemsen [Wed, 7 Dec 2016 02:41:56 +0000 (02:41 +0000)]
Merge "Revert "Move installd back to Android.mk."" am:
1ae0486a54
am:
23ce729c01
Change-Id: Ide925ed4c52981361680c31ed1e1e8d1a9268dd7
Dan Willemsen [Wed, 7 Dec 2016 02:38:55 +0000 (02:38 +0000)]
Merge "Revert "Move installd back to Android.mk.""
am:
1ae0486a54
Change-Id: I3a57d5d8a62aa17b834091b142fd07c0d436708c
Treehugger Robot [Wed, 7 Dec 2016 02:35:35 +0000 (02:35 +0000)]
Merge "Revert "Move installd back to Android.mk.""
Jeff Sharkey [Tue, 6 Dec 2016 06:39:32 +0000 (23:39 -0700)]
Move more installd methods to Binder.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: I1fcaaaaad34c2f9a3d6a15443ef1764186669865
Dan Willemsen [Tue, 6 Dec 2016 23:44:57 +0000 (15:44 -0800)]
Revert "Move installd back to Android.mk."
This reverts commit
00b6f68c5c72252542a1e8c5dda4b420ed02c947 and
converts the new entries to Android.bp now that Soong supports AIDL.
Test: mmma -j framework/native/cmds/installd
Test: /data/nativetest64/installd_utils_test/installd_utils_test; fails
the same before/after
Change-Id: I327eb0bc28fa84cda669ec0df59da82ee10caf1f
Bill Yi [Wed, 7 Dec 2016 00:08:18 +0000 (00:08 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
ecea1bfeae
am:
00f28dbb60
Change-Id: I9ffe228d5914b08c8581cfa583f7824d76edfdb6
Jeff Sharkey [Wed, 7 Dec 2016 00:03:17 +0000 (17:03 -0700)]
Merge commit '
5c3b2b4267ad0ba4f7e7e8e38b91a8aeb1eb30a0' into dec6
Change-Id: I28754671bdbe34c768f5babd4e8028a93391f45e
Bill Yi [Wed, 7 Dec 2016 00:00:59 +0000 (00:00 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
ecea1bfeae
Change-Id: I4c7f09b30207177815a24548a95e1bd823eeae85
Jeff Sharkey [Tue, 6 Dec 2016 23:52:32 +0000 (16:52 -0700)]
Merge commit '
f5c3b20f062ca646572ee6c07713eba691971c95' into dec6
Change-Id: I96a76c752bb1cd478bfd88f384537951c7b694e2
Jeff Sharkey [Tue, 6 Dec 2016 23:49:17 +0000 (23:49 +0000)]
Merge "DO NOT MERGE. Check and restorecon cache/code_cache directories." am:
661cbb7f1b -s ours
am:
bfbe5c7af8 -s ours
Change-Id: Id81e151e506fbdb469b69dbccb494040ba5256d9
Jeff Sharkey [Tue, 6 Dec 2016 23:44:48 +0000 (23:44 +0000)]
Merge "DO NOT MERGE. Check and restorecon cache/code_cache directories."
am:
661cbb7f1b -s ours
Change-Id: Iddc4eb1f1a90dda1020c4d9a7375c2b4d8dcfdc6
Bill Yi [Tue, 6 Dec 2016 23:07:48 +0000 (15:07 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Jeff Sharkey [Tue, 6 Dec 2016 22:24:25 +0000 (22:24 +0000)]
Merge "Shuffle installd Binder implementation around."
Jeff Sharkey [Tue, 6 Dec 2016 22:24:17 +0000 (22:24 +0000)]
Merge "DO NOT MERGE. Check and restorecon cache/code_cache directories."
Fabien Sanglard [Tue, 6 Dec 2016 19:38:10 +0000 (19:38 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev am:
fefc4f4e94 am:
afee0c9de4 am:
68fcdf6a93
am:
f09debed94
Change-Id: Id69c2786538319906619351f14d8cbe27d6899a1
Fabien Sanglard [Tue, 6 Dec 2016 19:37:58 +0000 (19:37 +0000)]
Fix security vulneratibly
31960359 am:
dffa078205 am:
b8b076e553 am:
46dd3c89e5
am:
04f62d5b99
Change-Id: I6f28a439b03be3fc7151313fc4f963c532196118
Fabien Sanglard [Tue, 6 Dec 2016 19:34:10 +0000 (19:34 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev am:
fefc4f4e94 am:
afee0c9de4
am:
68fcdf6a93
Change-Id: I438cd8b4b922d9a76fda92d1e24a4a02c2e0f0c5
Fabien Sanglard [Tue, 6 Dec 2016 19:33:58 +0000 (19:33 +0000)]
Fix security vulneratibly
31960359 am:
dffa078205 am:
b8b076e553
am:
46dd3c89e5
Change-Id: I7664021716dc9f1a1e09afdbeb04a02f84195354
Fabien Sanglard [Tue, 6 Dec 2016 19:30:39 +0000 (19:30 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev am:
fefc4f4e94
am:
afee0c9de4
Change-Id: I8378cc46c5d1caaa3b018c45929b6767cefa3bb9
Fabien Sanglard [Tue, 6 Dec 2016 19:30:28 +0000 (19:30 +0000)]
Fix security vulneratibly
31960359 am:
dffa078205
am:
b8b076e553
Change-Id: Ia073be4ad2910078ac1e736ef6d2afadd849a525
Fabien Sanglard [Tue, 6 Dec 2016 19:26:58 +0000 (19:26 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev
am:
fefc4f4e94
Change-Id: I06631f20e9a9070ff3a71c03f9d4bab324a8b27b
Fabien Sanglard [Tue, 6 Dec 2016 19:26:57 +0000 (19:26 +0000)]
Fix security vulneratibly
31960359
am:
dffa078205
Change-Id: Icea9297e2e5f7467ece053ae869208758f40b954
Fabien Sanglard [Tue, 6 Dec 2016 19:22:20 +0000 (19:22 +0000)]
Merge "Fix security vulneratibly
31960359" into nyc-dev
Jeff Sharkey [Tue, 6 Dec 2016 17:02:18 +0000 (17:02 +0000)]
Merge changes I0c8d4018,Ic9dfb243,I7e442b06 am:
17892731ec
am:
6079aa6a8a
Change-Id: I975c3b4caee67b007b0fd9d435bd026494fc3dff
Jeff Sharkey [Tue, 6 Dec 2016 17:02:06 +0000 (17:02 +0000)]
DO NOT MERGE. Recursively restorecon when SELinux label changes. am:
7db6041d15 -s ours
am:
b54724ff4a -s ours
Change-Id: I7f64251ce4702bc36913489db789842bd1d1757d
Jeff Sharkey [Tue, 6 Dec 2016 17:01:58 +0000 (17:01 +0000)]
DO NOT MERGE. Ignore setxattr() failures on tmpfs. am:
4ed6507cfb -s ours
am:
b9821c87f9 -s ours
Change-Id: I7611f18bda8f198894d78f6d095bbffd444ef276
Jeff Sharkey [Tue, 6 Dec 2016 17:01:48 +0000 (17:01 +0000)]
DO NOT MERGE. Record "cache" inodes to clear while CE is locked. am:
9a998f4762 -s ours
am:
5e2b07785f -s ours
Change-Id: I10ee76a365ae41ef22c96c5aa713f809acc6d5f7
Jeff Sharkey [Tue, 6 Dec 2016 16:58:09 +0000 (16:58 +0000)]
Merge changes I0c8d4018,Ic9dfb243,I7e442b06
am:
17892731ec
Change-Id: Iadd662bf024e3acd58cf5c747d1546e457483a7b
Jeff Sharkey [Tue, 6 Dec 2016 16:58:06 +0000 (16:58 +0000)]
DO NOT MERGE. Recursively restorecon when SELinux label changes.
am:
7db6041d15 -s ours
Change-Id: Ie64c33ed2eaded73fe043955e0f954bc76f166f7
Jeff Sharkey [Tue, 6 Dec 2016 16:57:57 +0000 (16:57 +0000)]
DO NOT MERGE. Ignore setxattr() failures on tmpfs.
am:
4ed6507cfb -s ours
Change-Id: I5a8fa5606aaeaa75539a38227e78420acd4bf5bc
Jeff Sharkey [Tue, 6 Dec 2016 16:57:49 +0000 (16:57 +0000)]
DO NOT MERGE. Record "cache" inodes to clear while CE is locked.
am:
9a998f4762 -s ours
Change-Id: Id413a5bceff13dc717fa82209302662b77276165
Treehugger Robot [Tue, 6 Dec 2016 16:53:04 +0000 (16:53 +0000)]
Merge changes I0c8d4018,Ic9dfb243,I7e442b06
* changes:
DO NOT MERGE. Recursively restorecon when SELinux label changes.
DO NOT MERGE. Ignore setxattr() failures on tmpfs.
DO NOT MERGE. Record "cache" inodes to clear while CE is locked.
Jeff Sharkey [Tue, 6 Dec 2016 16:32:04 +0000 (09:32 -0700)]
Shuffle installd Binder implementation around.
Instead of writing wrapper methods in InstalldNativeService.cpp,
this change shifts the Binder implementation over into the existing
commands.cpp file. This will let us migrate all methods over, and
then perform one final file rename to InstalldNativeService.cpp.
The downside of this approach is that we no longer have a giant kill
switch to quickly switch back.
Moves the moveCompleteApp() method over to Binder.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: I53550e05bc2b65155c3de18424f67b1a95450a6f
Jeff Sharkey [Mon, 31 Oct 2016 17:22:19 +0000 (11:22 -0600)]
DO NOT MERGE. Check and restorecon cache/code_cache directories.
To speed up boot times, we recently relaxed SELinux restorecon logic
to only consider relabeling app storage when the top level SELinux
label changed.
However, if an app manually deletes either their cache or code_cache
directories, installd will helpfully recreate those directories at
the next boot, but they'll be stuck with incorrect SELinux labels
which an app can't fix. (Our historically aggressive restorecons had
relabeled them, which is why we didn't observe until now.)
This change checks the labels of the cache/code_cache directories,
and runs a restorecon if needed, fixing the issue above.
Test: delete cache and verify recreated with correct label
Bug:
32504081
Change-Id: I0114ae4129223e5909b1075d56a9b1145ebc5ef4
Jeff Sharkey [Wed, 21 Sep 2016 00:21:42 +0000 (18:21 -0600)]
DO NOT MERGE. Recursively restorecon when SELinux label changes.
PackageManager has been pretty aggressive about asking installd to
restorecon over app data when it thinks something might have
changed. However, in the vast majority of cases these are no-op
requests, and we waste a bunch of time recursively walking all
private data, easily costing 60+ seconds on dogfooder devices.
This change updates the initial "create_app_data" command to kick off
a recursive restorecon if it detects that the top-level SELinux label
on the app private data directory changes. The "create_app_data"
command is designed to ensure that an app's storage is ready, so
PackageManager always calls it at least once per boot before apps
can run. (This change means that PackageManager no longer needs to
make separate "restorecon_app_data" calls.)
Test: booted, verified that a label change triggered restorecon
Bug:
30768146
Change-Id: I0c8d4018cf8ff888d0ae07a82adc3d61a6002aad
Jeff Sharkey [Fri, 22 Jul 2016 17:38:54 +0000 (11:38 -0600)]
DO NOT MERGE. Ignore setxattr() failures on tmpfs.
Bug:
30210614
Change-Id: Ic9dfb2439b4b1056e1a58552be2e84f4e524321e
Jeff Sharkey [Fri, 15 Jul 2016 00:16:22 +0000 (18:16 -0600)]
DO NOT MERGE. Record "cache" inodes to clear while CE is locked.
There are two situations where we need to clear cached data from
all users, including those whose CE storage might still be locked:
1. When PackageManager is clearing caches to try making room for
package updates.
2. When the device fingerprint changes, we need to clear code caches
for all apps.
To enable this, we now record the inode number of the "cache" and
"code_cache" directories in xattrs of the parent directory. This is
just enough information to find the cache directories to enable
deleting files inside. When preparing CE storage for an app, we now
create these two directories and immediately write the inode numbers.
Bug:
26056125
Change-Id: I7e442b0676a695acf962593469793a93b03c8aee
Yifan Hong [Tue, 6 Dec 2016 15:47:31 +0000 (15:47 +0000)]
Merge "Check and write some error in atrace." am:
7b50c02030
am:
89c634b6ea
Change-Id: Id42e740d49987d2a4e92d4c8e1bd39cc7f2c4042
Yifan Hong [Tue, 6 Dec 2016 15:41:08 +0000 (15:41 +0000)]
Merge "Check and write some error in atrace."
am:
7b50c02030
Change-Id: I562794bbe7dc52268ad2b477e0dca58a7b79d365
Treehugger Robot [Tue, 6 Dec 2016 15:07:54 +0000 (15:07 +0000)]
Merge "Check and write some error in atrace."
Colin Cross [Tue, 6 Dec 2016 02:01:25 +0000 (02:01 +0000)]
Merge "Convert vulkan to Android.bp" am:
e421c0710f
am:
78bde35997
Change-Id: I2a90a2c075892d39085ba1984da053648e807c4c
Colin Cross [Tue, 6 Dec 2016 01:58:25 +0000 (01:58 +0000)]
Merge "Convert vulkan to Android.bp"
am:
e421c0710f
Change-Id: Icd0b77b032179c8e8ce5c6009848e23916c990d5
Colin Cross [Tue, 6 Dec 2016 01:52:13 +0000 (01:52 +0000)]
Merge "Convert vulkan to Android.bp"
Android Build Merger (Role) [Tue, 6 Dec 2016 00:31:32 +0000 (00:31 +0000)]
Merge changes from topic 'am-
1b0390d7a24849e3956bb6a993789c51' into nyc-mr1-dev-plus-aosp
* changes:
Merge changes from topic 'bind' am:
7726057707 am:
b20213cf7d
Initial Binder interface for installd. am:
9087400f3c am:
5b62e60a38
Move installd back to Android.mk. am:
00b6f68c5c am:
db792601f6
Christopher Tate [Tue, 6 Dec 2016 00:31:20 +0000 (00:31 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab am:
953c05276e am:
e37a4dc7c4 am:
8ed5e3d7ca am:
9d5dd3f584
am:
9ef37cdcdc
Change-Id: If8528d119a88f444b6dba5e1328be93c93123897
Jeff Sharkey [Tue, 6 Dec 2016 00:30:06 +0000 (00:30 +0000)]
Merge changes from topic 'bind' am:
7726057707
am:
b20213cf7d
Change-Id: I2d2d45e881f2bc6eaa2d63e37a8228324c37e8af
Jeff Sharkey [Tue, 6 Dec 2016 00:29:49 +0000 (00:29 +0000)]
Initial Binder interface for installd. am:
9087400f3c
am:
5b62e60a38
Change-Id: Ife94a52967367f9f80d5aee5ac2e151a116c60f5
Jeff Sharkey [Tue, 6 Dec 2016 00:28:36 +0000 (00:28 +0000)]
Move installd back to Android.mk. am:
00b6f68c5c
am:
db792601f6
Change-Id: I43e8540a0564c147621cd696361e1decaf33b76b
Christopher Tate [Tue, 6 Dec 2016 00:28:19 +0000 (00:28 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab am:
953c05276e am:
e37a4dc7c4 am:
8ed5e3d7ca
am:
9d5dd3f584
Change-Id: Ic7effb22aa05c626d007aef30ab572363197cad3
Christopher Tate [Tue, 6 Dec 2016 00:24:19 +0000 (00:24 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab am:
953c05276e am:
e37a4dc7c4
am:
8ed5e3d7ca
Change-Id: I634d3910a329dd10a90086c5c116ae716b2187af
Jeff Sharkey [Tue, 6 Dec 2016 00:24:17 +0000 (00:24 +0000)]
Merge changes from topic 'bind'
am:
7726057707
Change-Id: I6e0198eceaa85c97bf3b72791e4e5e1df5086091
Jeff Sharkey [Tue, 6 Dec 2016 00:24:08 +0000 (00:24 +0000)]
Initial Binder interface for installd.
am:
9087400f3c
Change-Id: I4912defb2edafb60d429d90679bffe88589fcad9
Colin Cross [Mon, 5 Dec 2016 21:26:22 +0000 (13:26 -0800)]
Convert vulkan to Android.bp
See build/soong/README.md for more information.
Test: mma -j
Change-Id: Ic7f0af683a5ef093df718ed746a73a7fa2a9ce0b
Jeff Sharkey [Tue, 6 Dec 2016 00:22:39 +0000 (00:22 +0000)]
Move installd back to Android.mk.
am:
00b6f68c5c
Change-Id: Iad4819473f6b25f6ac7aa31e23661b564cd49f0e
Christopher Tate [Tue, 6 Dec 2016 00:22:18 +0000 (00:22 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab am:
953c05276e
am:
e37a4dc7c4
Change-Id: Ie0e23d8fc47bf2cb87181ddf1a03dd439fc0f3f4
Christopher Tate [Tue, 6 Dec 2016 00:17:19 +0000 (00:17 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950 am:
02e4440eab
am:
953c05276e
Change-Id: If6e16f080e701171d7c9b69adbeaab3a6910b63a
Jeff Sharkey [Tue, 6 Dec 2016 00:14:53 +0000 (00:14 +0000)]
Merge changes from topic 'bind'
* changes:
Initial Binder interface for installd.
Move installd back to Android.mk.
Christopher Tate [Tue, 6 Dec 2016 00:13:48 +0000 (00:13 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d am:
abe293b950
am:
02e4440eab
Change-Id: I66e7e982176555f09bf298325754d708ef0ecac0
Christopher Tate [Tue, 6 Dec 2016 00:09:47 +0000 (00:09 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev am:
79b74d787d
am:
abe293b950
Change-Id: I7f8ce6dbb313d592b97b41a982e629680eba36c4
Christopher Tate [Tue, 6 Dec 2016 00:06:18 +0000 (00:06 +0000)]
resolve merge conflicts of
13c5c34 to mnc-dev
am:
79b74d787d
Change-Id: I383dde0596fe37282db3bb62f7ad65e763fdd1dc
Fabien Sanglard [Mon, 5 Dec 2016 23:06:29 +0000 (15:06 -0800)]
Fix security vulneratibly
31960359
BufferQueueCore features a variable mLastQueuedSlot which is not
initialized in its constructor resulting in security vulnerability
Bug:
31960359
Change-Id: If892f59f6288d8b81b1e312995832a20c8341494
Tests: Manually on Angler
Christopher Tate [Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)]
resolve merge conflicts of
13c5c34 to mnc-dev
Change-Id: I7f57cde153648f48ff038400aa437b76971d4771
Christopher Tate [Mon, 5 Dec 2016 21:23:36 +0000 (21:23 +0000)]
Correct overflow check in Parcel resize code am:
8b64307e95
am:
ed6937ae2c
Change-Id: I9ea154fd1f2ca3a69f756066fb49efc99e889224
Christopher Tate [Mon, 5 Dec 2016 21:20:07 +0000 (21:20 +0000)]
Correct overflow check in Parcel resize code
am:
8b64307e95
Change-Id: I371fb7c6aaf34d44d69c740eea95fe3ba125164a
Yifan Hong [Mon, 5 Dec 2016 20:58:05 +0000 (12:58 -0800)]
Check and write some error in atrace.
Bug:
33305299
Test: compiles
Change-Id: I88c7ede6cbf68ca10d980e448456bb4ef2a73592
Jeff Sharkey [Mon, 5 Dec 2016 18:18:55 +0000 (11:18 -0700)]
Initial Binder interface for installd.
Define an AIDL for installd, starting with a single method. Publish
that interface for the system to start using. We'll circle back and
migrate more methods in future CLs.
Migrating installd to Binder will allow us to get rid of one of
the few lingering text-based command protocols, improving system
maintainability and security.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: Icdb5320082567e0355d8f76f413f01cfacf0fb99
Jeff Sharkey [Sun, 4 Dec 2016 21:02:00 +0000 (14:02 -0700)]
Move installd back to Android.mk.
An upcoming CL will be compiling an AIDL for installd, which the new
build system doesn't support yet.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: I47f9ef21eb6040072c402d40ae42a95d7bd0e61d
Yifan Hong [Sat, 3 Dec 2016 23:16:03 +0000 (23:16 +0000)]
Merge "Fix includes; use IBase instead of IBinder." am:
bd5dc9df53
am:
a7a0658efb
Change-Id: Ib4bfc9615322d30bdb7bb0aef9e245119f1f95e5
Yifan Hong [Sat, 3 Dec 2016 23:09:03 +0000 (23:09 +0000)]
Merge "Fix includes; use IBase instead of IBinder."
am:
bd5dc9df53
Change-Id: Ic75eab82059ff0d1bf483f11d55fb9a6a74dd539
Treehugger Robot [Sat, 3 Dec 2016 23:04:24 +0000 (23:04 +0000)]
Merge "Fix includes; use IBase instead of IBinder."
Yifan Hong [Tue, 29 Nov 2016 17:59:32 +0000 (09:59 -0800)]
Fix includes; use IBase instead of IBinder.
Test: mma
Change-Id: I2604772ff952ed451cc87be330ed131452db8eff
Yifan Hong [Fri, 2 Dec 2016 19:34:16 +0000 (19:34 +0000)]
Merge "Check for errors for IServiceManager::get and list." am:
a09202e9ac
am:
aa51c8c56f
Change-Id: Ia7637633ddf235421b5fc1a6164780bda71f1b0d
Yifan Hong [Fri, 2 Dec 2016 19:25:46 +0000 (19:25 +0000)]
Merge "Check for errors for IServiceManager::get and list."
am:
a09202e9ac
Change-Id: I530107b1067810c4107cf22f4408d910190c9f7b
Treehugger Robot [Fri, 2 Dec 2016 19:19:33 +0000 (19:19 +0000)]
Merge "Check for errors for IServiceManager::get and list."
Nick Vaccaro [Thu, 1 Dec 2016 03:40:32 +0000 (03:40 +0000)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
am:
1f24f0f597 -s ours
Change-Id: I3e5c0ce93106c190191a9471f4e077b7cfb00cc8
Casey Dahlin [Thu, 1 Dec 2016 03:40:20 +0000 (03:40 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am:
e81a4f1518 am:
2dbc712abe am:
7be8fd60ea
am:
5879e8e632
Change-Id: I361b7c6adb0326bf166ab574b234154985d11cc8
Casey Dahlin [Thu, 1 Dec 2016 02:18:20 +0000 (18:18 -0800)]
resolve merge conflicts of
5fef0c6 to nyc-mr1-dev-plus-aosp
Change-Id: I2362661ac567a1fe73b660499ecfb1a20f27c0db
Yifan Hong [Thu, 1 Dec 2016 01:28:58 +0000 (17:28 -0800)]
Check for errors for IServiceManager::get and list.
Test: compiles
Change-Id: I65b858b1ebd5d45739db05fcadb58ae48fd3337e
Jinguang Dong [Wed, 30 Nov 2016 06:28:30 +0000 (06:28 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am:
2792ff4527
am:
83f8bba2a5
Change-Id: Ie5a2b0f7cc37092618a7d35083cf53bf9f7f4212
Jinguang Dong [Wed, 30 Nov 2016 06:22:31 +0000 (06:22 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
am:
2792ff4527
Change-Id: Ia8c1ac3f9eff3680ed64235cb01043d0b7c434b9
Treehugger Robot [Wed, 30 Nov 2016 06:11:21 +0000 (06:11 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
Jinguang Dong [Tue, 29 Nov 2016 05:55:57 +0000 (13:55 +0800)]
surfaceflinger:Fix potential crash issue when do AIDL FUZZ
test
There will be trigger exception when we provide invalid
inputs parameter for surfaceflinger JNI interface
Test: 1.Run adb shell and open AIDLer tools;
2.change to Dir /sdcard/elong.AIDLer
3.run commond service list > service_list.txt
4.Rerun AIDL FUZZ test
Change-Id: I0a63adc1e8ae5d9c9e43cb6df6aa13503c40a0c5
Fabien Sanglard [Tue, 29 Nov 2016 07:36:58 +0000 (07:36 +0000)]
Fix SF security vulnerability:
32660278 am:
2d8a2432e0 am:
e5c91fe2e2 am:
9d14ab5409 am:
275b2347ef am:
aff7827b4f am:
c8684d517a am:
57dbf1c224 am:
b17adaa85f am:
c261a17e51 am:
ce40ad2441
am:
97ce922887
Change-Id: I198eccaf1f86d250088edb48bd5ef3dcb4cebc00
Fabien Sanglard [Tue, 29 Nov 2016 07:36:41 +0000 (07:36 +0000)]
Fix SF security vulnerability:
32706020 am:
d073eb7a3f am:
230b943c6b am:
a928cc7169 am:
0517da2c5a am:
b0dff427a1 am:
1852db9aa3 am:
d4f7a66cf6
am:
0646227ad2
Change-Id: I8c2d45d95b205e32545f39f7ccf746b1707ca682
Jeff Sharkey [Tue, 29 Nov 2016 07:36:25 +0000 (07:36 +0000)]
Check and restorecon cache/code_cache directories. am:
397ec26675
am:
6437218b85
Change-Id: I947b61f97b8a8c53f9072a3a3900566d91b5c6e8
Ruben Brunk [Tue, 29 Nov 2016 07:35:58 +0000 (07:35 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am:
4e1d67bd32
am:
323f83ef75
Change-Id: If4b5699338640018b9fbb2a636ad33e906404a78
Ruben Brunk [Tue, 29 Nov 2016 07:35:47 +0000 (07:35 +0000)]
Do not set VR mode feature as handset default. am:
5ce292f55b
am:
f0f8f0a99d
Change-Id: I9749d2c9ec2210771ca19a3bc0f7b50c3264be99
Steve Pfetsch [Tue, 29 Nov 2016 07:35:02 +0000 (07:35 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am:
103ba31665
am:
b3f571bc1e
Change-Id: I065826c95fd835e79ed90dda6cbe8086624eb1a4
Steve Pfetsch [Tue, 29 Nov 2016 07:34:47 +0000 (07:34 +0000)]
Revert "services: surfaceflinger: ASAN fix" am:
598f6d5429
am:
d5156b70ff
Change-Id: I87e368e8ee4770d02fbe75a031f01ff163e0c372
Felipe Leme [Tue, 29 Nov 2016 07:34:33 +0000 (07:34 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am:
7781eccbc3
am:
dca861e167
Change-Id: I19219da414ef75e519c5a03f8590ff5cabcc9b71
Christopher Tate [Thu, 3 Nov 2016 20:32:41 +0000 (13:32 -0700)]
Correct overflow check in Parcel resize code
Bug
31929765
Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467
Felipe Leme [Mon, 28 Nov 2016 22:29:38 +0000 (14:29 -0800)]
resolve merge conflicts of
dfc9df4 to nyc-mr1-dev-plus-aosp
Change-Id: I5da1f949bc1edb7dae110f3ab2a7328f9b1b02e9
Nicolas Geoffray [Mon, 28 Nov 2016 13:33:11 +0000 (13:33 +0000)]
Merge "Adjust installd with new dexopt return values." am:
b29c82b67e
am:
f118868549
Change-Id: I663a65ac5070782052a2a8676bc1df14074a49bb
OSDN Git Service
