OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94 am: afee0c9de4...
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

7 years agoFix security vulneratibly 31960359 am: dffa078205 am: b8b076e553 am: 46dd3c89e5
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

7 years agoMerge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94 am: afee0c9de4
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

7 years agoFix security vulneratibly 31960359 am: dffa078205 am: b8b076e553
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

7 years agoMerge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94
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

7 years agoFix security vulneratibly 31960359 am: dffa078205
Fabien Sanglard [Tue, 6 Dec 2016 19:30:28 +0000 (19:30 +0000)]
Fix security vulneratibly 31960359 am: dffa078205
am: b8b076e553

Change-Id: Ia073be4ad2910078ac1e736ef6d2afadd849a525

7 years agoMerge "Fix security vulneratibly 31960359" into nyc-dev
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

7 years agoFix security vulneratibly 31960359
Fabien Sanglard [Tue, 6 Dec 2016 19:26:57 +0000 (19:26 +0000)]
Fix security vulneratibly 31960359
am: dffa078205

Change-Id: Icea9297e2e5f7467ece053ae869208758f40b954

7 years agoMerge "Fix security vulneratibly 31960359" into nyc-dev
Fabien Sanglard [Tue, 6 Dec 2016 19:22:20 +0000 (19:22 +0000)]
Merge "Fix security vulneratibly 31960359" into nyc-dev

7 years agoMerge changes I0c8d4018,Ic9dfb243,I7e442b06 am: 17892731ec
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

7 years agoDO NOT MERGE. Recursively restorecon when SELinux label changes. am: 7db6041d15 ...
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

7 years agoDO NOT MERGE. Ignore setxattr() failures on tmpfs. am: 4ed6507cfb -s ours
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

7 years agoDO NOT MERGE. Record "cache" inodes to clear while CE is locked. am: 9a998f4762 ...
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

7 years agoMerge changes I0c8d4018,Ic9dfb243,I7e442b06
Jeff Sharkey [Tue, 6 Dec 2016 16:58:09 +0000 (16:58 +0000)]
Merge changes I0c8d4018,Ic9dfb243,I7e442b06
am: 17892731ec

Change-Id: Iadd662bf024e3acd58cf5c747d1546e457483a7b

7 years agoDO NOT MERGE. Recursively restorecon when SELinux label changes.
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

7 years agoDO NOT MERGE. Ignore setxattr() failures on tmpfs.
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

7 years agoDO NOT MERGE. Record "cache" inodes to clear while CE is locked.
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

7 years agoMerge changes I0c8d4018,Ic9dfb243,I7e442b06
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.

7 years agoDO NOT MERGE. Recursively restorecon when SELinux label changes.
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

7 years agoDO NOT MERGE. Ignore setxattr() failures on tmpfs.
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

7 years agoDO NOT MERGE. Record "cache" inodes to clear while CE is locked.
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

7 years agoMerge "Check and write some error in atrace." am: 7b50c02030
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

7 years agoMerge "Check and write some error in atrace."
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

7 years agoMerge "Check and write some error in atrace."
Treehugger Robot [Tue, 6 Dec 2016 15:07:54 +0000 (15:07 +0000)]
Merge "Check and write some error in atrace."

7 years agoMerge "Convert vulkan to Android.bp" am: e421c0710f
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

7 years agoMerge "Convert vulkan to Android.bp"
Colin Cross [Tue, 6 Dec 2016 01:58:25 +0000 (01:58 +0000)]
Merge "Convert vulkan to Android.bp"
am: e421c0710f

Change-Id: Icd0b77b032179c8e8ce5c6009848e23916c990d5

7 years agoMerge "Convert vulkan to Android.bp"
Colin Cross [Tue, 6 Dec 2016 01:52:13 +0000 (01:52 +0000)]
Merge "Convert vulkan to Android.bp"

7 years agoMerge changes from topic 'am-1b0390d7a24849e3956bb6a993789c51' into nyc-mr1-dev-plus...
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

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
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

7 years agoMerge changes from topic 'bind' am: 7726057707
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

7 years agoInitial Binder interface for installd. am: 9087400f3c
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

7 years agoMove installd back to Android.mk. am: 00b6f68c5c
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

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
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

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
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

7 years agoMerge changes from topic 'bind'
Jeff Sharkey [Tue, 6 Dec 2016 00:24:17 +0000 (00:24 +0000)]
Merge changes from topic 'bind'
am: 7726057707

Change-Id: I6e0198eceaa85c97bf3b72791e4e5e1df5086091

7 years agoInitial Binder interface for installd.
Jeff Sharkey [Tue, 6 Dec 2016 00:24:08 +0000 (00:24 +0000)]
Initial Binder interface for installd.
am: 9087400f3c

Change-Id: I4912defb2edafb60d429d90679bffe88589fcad9

7 years agoConvert vulkan to Android.bp
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

7 years agoMove installd back to Android.mk.
Jeff Sharkey [Tue, 6 Dec 2016 00:22:39 +0000 (00:22 +0000)]
Move installd back to Android.mk.
am: 00b6f68c5c

Change-Id: Iad4819473f6b25f6ac7aa31e23661b564cd49f0e

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
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

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
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

7 years agoMerge changes from topic 'bind'
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.

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950
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

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d
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

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev
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

7 years agoFix security vulneratibly 31960359
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

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev
Christopher Tate [Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)]
resolve merge conflicts of 13c5c34 to mnc-dev

Change-Id: I7f57cde153648f48ff038400aa437b76971d4771

7 years agoCorrect overflow check in Parcel resize code am: 8b64307e95
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

7 years agoCorrect overflow check in Parcel resize code
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

7 years agoCheck and write some error in atrace.
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

7 years agoInitial Binder interface for installd.
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: 1375896030944031
Change-Id: Icdb5320082567e0355d8f76f413f01cfacf0fb99

7 years agoMove installd back to Android.mk.
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: 1375896030944031
Change-Id: I47f9ef21eb6040072c402d40ae42a95d7bd0e61d

7 years agoMerge "Fix includes; use IBase instead of IBinder." am: bd5dc9df53
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

7 years agoMerge "Fix includes; use IBase instead of IBinder."
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

7 years agoMerge "Fix includes; use IBase instead of IBinder."
Treehugger Robot [Sat, 3 Dec 2016 23:04:24 +0000 (23:04 +0000)]
Merge "Fix includes; use IBase instead of IBinder."

7 years agoFix 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

7 years agoMerge "Check for errors for IServiceManager::get and list." am: a09202e9ac
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

7 years agoMerge "Check for errors for IServiceManager::get and list."
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

7 years agoMerge "Check for errors for IServiceManager::get and list."
Treehugger Robot [Fri, 2 Dec 2016 19:19:33 +0000 (19:19 +0000)]
Merge "Check for errors for IServiceManager::get and list."

7 years ago[DO NOT MERGE ANYWHERE] Fix bodysensor permission
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

7 years agoMerge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am: e81a4f1518...
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

7 years agoresolve merge conflicts of 5fef0c6 to nyc-mr1-dev-plus-aosp
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

7 years agoCheck for errors for IServiceManager::get and list.
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

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am: 2792ff4527
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

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
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

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
Treehugger Robot [Wed, 30 Nov 2016 06:11:21 +0000 (06:11 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"

7 years agosurfaceflinger:Fix potential crash issue when do AIDL FUZZ
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

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409...
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

7 years agoFix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169...
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

7 years agoCheck and restorecon cache/code_cache directories. am: 397ec26675
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

7 years agoMerge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd32
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

7 years agoDo not set VR mode feature as handset default. am: 5ce292f55b
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

7 years agoMerge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665
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

7 years agoRevert "services: surfaceflinger: ASAN fix" am: 598f6d5429
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

7 years agoMerge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report...
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

7 years agoCorrect overflow check in Parcel resize code
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

7 years agoresolve merge conflicts of dfc9df4 to nyc-mr1-dev-plus-aosp
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

7 years agoMerge "Adjust installd with new dexopt return values." am: b29c82b67e
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

7 years agoMerge "Adjust installd with new dexopt return values."
Nicolas Geoffray [Mon, 28 Nov 2016 13:25:26 +0000 (13:25 +0000)]
Merge "Adjust installd with new dexopt return values."
am: b29c82b67e

Change-Id: Ib0f3811c5891d6871d7b9d44c615954b06f261c6

7 years agoMerge "Adjust installd with new dexopt return values."
Nicolas Geoffray [Mon, 28 Nov 2016 13:15:55 +0000 (13:15 +0000)]
Merge "Adjust installd with new dexopt return values."

7 years agoAdjust installd with new dexopt return values.
Nicolas Geoffray [Fri, 25 Nov 2016 11:33:31 +0000 (11:33 +0000)]
Adjust installd with new dexopt return values.

Bug: 30937355
Test: device boots, mimic system update, apps get updated.
Change-Id: I9539892dfcdd0cc722a292140accd7525ee132d0

7 years ago[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Wed, 23 Nov 2016 16:44:15 +0000 (08:44 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission

Bug: 33094188
Change-Id: I1d91e855163954666a18b2f8daadb2639b946b24

7 years agoMerge "Fix clang static analyzer warnings." am: b10d705f51
Manoj Gupta [Wed, 23 Nov 2016 06:44:06 +0000 (06:44 +0000)]
Merge "Fix clang static analyzer warnings." am: b10d705f51
am: 87b2535ff8

Change-Id: I24784df53a0574974f822ee01e2a1f13729176c5

7 years agoMerge "Fix clang static analyzer warnings."
Manoj Gupta [Wed, 23 Nov 2016 06:40:36 +0000 (06:40 +0000)]
Merge "Fix clang static analyzer warnings."
am: b10d705f51

Change-Id: Ibdd7df4af9766b5d00515254cbb8d5e9370a4971

7 years agoMerge "Fix clang static analyzer warnings."
Treehugger Robot [Wed, 23 Nov 2016 06:35:32 +0000 (06:35 +0000)]
Merge "Fix clang static analyzer warnings."

7 years agoMerge "atrace: support HAL services as well." am: 1aea108920
Martijn Coenen [Tue, 22 Nov 2016 09:55:14 +0000 (09:55 +0000)]
Merge "atrace: support HAL services as well." am: 1aea108920
am: 7d7cd0cc88

Change-Id: I52a8b3ffcc4bea2b2adb290de6a989b225f447e4

7 years agoMerge "atrace: support HAL services as well."
Martijn Coenen [Tue, 22 Nov 2016 09:49:27 +0000 (09:49 +0000)]
Merge "atrace: support HAL services as well."
am: 1aea108920

Change-Id: Iac0430699cd15f59ed68b41d20010165a50a50e2

7 years agoMerge "atrace: support HAL services as well."
Treehugger Robot [Tue, 22 Nov 2016 09:43:23 +0000 (09:43 +0000)]
Merge "atrace: support HAL services as well."

7 years agoatrace: support HAL services as well.
Martijn Coenen [Wed, 16 Nov 2016 15:00:26 +0000 (16:00 +0100)]
atrace: support HAL services as well.

Also poke services that are only registered with
hwbinder, so that they update their props (trace
categories) immediately.

Bug: 31262344
Test: builds, atrace works
Change-Id: I355ddd5f950acc27d598cd972e63f9711426b943

7 years agoMerge "atrace.rc: move to post-fs trigger" am: 3749a60b42
Wei Wang [Sun, 20 Nov 2016 16:31:01 +0000 (16:31 +0000)]
Merge "atrace.rc: move to post-fs trigger" am: 3749a60b42
am: 5b30ae185e

Change-Id: Ibb5370034f45a00e1ec9166abc4a66afc32b4847

7 years agoMerge "atrace.rc: move to post-fs trigger"
Wei Wang [Sun, 20 Nov 2016 16:26:31 +0000 (16:26 +0000)]
Merge "atrace.rc: move to post-fs trigger"
am: 3749a60b42

Change-Id: Ib2675cf4047d6ce1b9b6285538bb7f7be7ed1649

7 years agoMerge "atrace.rc: move to post-fs trigger"
Treehugger Robot [Sun, 20 Nov 2016 16:22:22 +0000 (16:22 +0000)]
Merge "atrace.rc: move to post-fs trigger"

7 years agoatrace.rc: move to post-fs trigger
Wei Wang [Sun, 20 Nov 2016 04:49:09 +0000 (20:49 -0800)]
atrace.rc: move to post-fs trigger

Test: manually
Bug: 32025203
Change-Id: I787984fc8ab7151ecce9e62a25fa03b0ecf263cd

7 years agoMerge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5
Colin Cross [Fri, 18 Nov 2016 01:58:23 +0000 (01:58 +0000)]
Merge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5
am: 7354c237ea

Change-Id: I43d772721d8ad9538b0ced7bb9592ad0f1dd0dd8

7 years agoMerge "Fix warnings in framworks/native/opengl/include"
Colin Cross [Fri, 18 Nov 2016 01:55:54 +0000 (01:55 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"
am: d12c9369d5

Change-Id: Ifbbccbd890d3ab80910586c52f263e903e36dbbd

7 years agoMerge "Fix warnings in framworks/native/opengl/include"
Treehugger Robot [Fri, 18 Nov 2016 01:50:49 +0000 (01:50 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"

7 years agoMerge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am: e81a4f1518...
Casey Dahlin [Wed, 16 Nov 2016 00:03:50 +0000 (00:03 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am: e81a4f1518 am: 2dbc712abe
am: 7be8fd60ea

Change-Id: Ic4a1d4bff81e892786296d3670559487f8d14070

7 years agoFix integer overflow in unsafeReadTypedVector am: 65a8f07e57 am: 894ba10a5f
Casey Dahlin [Wed, 16 Nov 2016 00:03:37 +0000 (00:03 +0000)]
Fix integer overflow in unsafeReadTypedVector am: 65a8f07e57 am: 894ba10a5f
am: b7a1cc50d2

Change-Id: Id199d45df5b34f3415bf1754cb324bce6a7ed983

7 years agoMerge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am: e81a4f1518
Casey Dahlin [Tue, 15 Nov 2016 23:57:19 +0000 (23:57 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev am: e81a4f1518
am: 2dbc712abe

Change-Id: I14abc8f99e191328ac70176c90ba4f57e617a45e

7 years agoFix integer overflow in unsafeReadTypedVector am: 65a8f07e57
Casey Dahlin [Tue, 15 Nov 2016 23:57:07 +0000 (23:57 +0000)]
Fix integer overflow in unsafeReadTypedVector am: 65a8f07e57
am: 894ba10a5f

Change-Id: If93da0dbcbf78ea65e3ac950c5539861587526bb

7 years agoMerge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev
Casey Dahlin [Tue, 15 Nov 2016 23:49:37 +0000 (23:49 +0000)]
Merge "Fix integer overflow in unsafeReadTypedVector" into nyc-dev
am: e81a4f1518

Change-Id: I0b6ed467fc45cf8d6d233730a5a3d4b6dd3eafa7