OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "Initial work on a Dumpstate class."
TreeHugger Robot [Wed, 28 Sep 2016 03:48:26 +0000 (03:48 +0000)]
Merge "Initial work on a Dumpstate class."

7 years agoMerge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev am...
Peng Xu [Wed, 28 Sep 2016 03:39:45 +0000 (03:39 +0000)]
Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev am: 0627130b28
am: 30a47097fe

Change-Id: Ib3dde85ccea2fada1b6afc62e228298d9a520842

7 years ago[sensorservice] Fix inconsistent states in SensorDevice am: 4f707f8b3d
Peng Xu [Wed, 28 Sep 2016 03:39:34 +0000 (03:39 +0000)]
[sensorservice] Fix inconsistent states in SensorDevice am: 4f707f8b3d
am: 86b20dcef4

Change-Id: I3112afafc8a912b459e6be5243396e7ca8c7ba93

7 years agoMerge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev
Peng Xu [Wed, 28 Sep 2016 03:36:53 +0000 (03:36 +0000)]
Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev
am: 0627130b28

Change-Id: Ifa7a7da62d5862a261c491db9c2ed701e18ad59b

7 years ago[sensorservice] Fix inconsistent states in SensorDevice
Peng Xu [Wed, 28 Sep 2016 03:36:52 +0000 (03:36 +0000)]
[sensorservice] Fix inconsistent states in SensorDevice
am: 4f707f8b3d

Change-Id: I1090cee6b4b81e10d0b5bc31ab879b1a3788d407

7 years agoMerge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev
Peng Xu [Wed, 28 Sep 2016 03:31:35 +0000 (03:31 +0000)]
Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev

7 years agoInitial work on a Dumpstate class.
Felipe Leme [Wed, 21 Sep 2016 22:01:39 +0000 (15:01 -0700)]
Initial work on a Dumpstate class.

dumpstate used to be a C binary that had to be "converted" to C++ in
order to use the zip_writer library, but it still keeps most of its C
idioms.

This change is the first step towards a new Dumpstate class; for now, it
just moves the state defined on dumpstate.h to it.

BUG: 26379932
Test: manual / refactored code

Change-Id: Ie689b87c4469a8951c35f3e642d7faa0722b0c03

7 years agoFix dumpsys timeouts.
Felipe Leme [Tue, 27 Sep 2016 16:21:08 +0000 (09:21 -0700)]
Fix dumpsys timeouts.

Both dumpstate and dumpsys can timeout when a child process hangs;
usually these values match, except when running dumpsys to dump all
services, in which case we need a timeout for all services (90s) and
individual timeouts for each service (10s).

BUG: 26379932
Test: manual
Change-Id: I37129ba9980976aa9bfe8eb132cdd0870fd93e59

7 years agoFixed C++ style on refactored function and variable names.
Felipe Leme [Tue, 27 Sep 2016 01:26:11 +0000 (18:26 -0700)]
Fixed C++ style on refactored function and variable names.

As described on
https://google.github.io/styleguide/cppguide.html#Function_Names :

"Ordinarily, functions should start with a capital letter and have a
capital letter for each new word (a.k.a. "upper camel case" or "Pascal
case")."

and

"Data members of classes (but not structs) additionally have trailing underscores. "

BUG: 26379932
Test: manual

Change-Id: I4b7f34b941c99547af667316d4b7d5e2749827d0

7 years agoAdd socket dumps via ss to bugreports. am: d3b809baff am: e0e7206725
Lorenzo Colitti [Tue, 27 Sep 2016 13:19:27 +0000 (13:19 +0000)]
Add socket dumps via ss to bugreports. am: d3b809baff am: e0e7206725
am: 4ee346ac2f

Change-Id: Id4ece86507d3ecdfed8b482a2839700114721c2d

7 years agoAdd socket dumps via ss to bugreports. am: d3b809baff
Lorenzo Colitti [Tue, 27 Sep 2016 13:16:56 +0000 (13:16 +0000)]
Add socket dumps via ss to bugreports. am: d3b809baff
am: e0e7206725

Change-Id: I1b1e1b7c4e816e9168eeebcfe089cef6815a1720

7 years agoAdd socket dumps via ss to bugreports.
Lorenzo Colitti [Tue, 27 Sep 2016 13:14:25 +0000 (13:14 +0000)]
Add socket dumps via ss to bugreports.
am: d3b809baff

Change-Id: I85daa9d7faf6cb0067955d235e4f12fe807adf5c

7 years agoMerge "Fixed header on runCommand()."
TreeHugger Robot [Tue, 27 Sep 2016 01:06:57 +0000 (01:06 +0000)]
Merge "Fixed header on runCommand()."

7 years agoMerge "Uses new get/set property functions."
TreeHugger Robot [Tue, 27 Sep 2016 00:39:13 +0000 (00:39 +0000)]
Merge "Uses new get/set property functions."

7 years ago[sensorservice] Fix inconsistent states in SensorDevice
Peng Xu [Mon, 26 Sep 2016 18:28:32 +0000 (11:28 -0700)]
[sensorservice] Fix inconsistent states in SensorDevice

This CL avoids inconsistent disabled client list when sensorservice
is in restricted mode and a restricted sensor event connection is
destroyed.

The inconsistency can cause registerLister error in sensor CTS.

Also removed the additional logging message since they are no longer
necessary.

Bug: 28533594

Test: Running "cts-tradefed run singleCommand cts-dev --module
CtsHardwareTestCases --test android.hardware.cts.SensorBatchingTests"
continuously while keep registering and unregistering sensor listener
in a separate app (e.g. enable BreakIt mode in SensorLogger).

Change-Id: I601aea87c88511f5543a80c4921ee4822cb89dff

7 years agoFixed header on runCommand().
Felipe Leme [Mon, 26 Sep 2016 22:57:04 +0000 (15:57 -0700)]
Fixed header on runCommand().

BUG: 26379932
Fixes: 31755035
Test: manual
Change-Id: I3c1779afee8e0d601a2ed3a227999a87bb5236c7

7 years agoUses new get/set property functions.
Felipe Leme [Mon, 26 Sep 2016 16:21:21 +0000 (09:21 -0700)]
Uses new get/set property functions.

Traditionally, libcutils provided C-based functions (property_get() and
property_set()) to manage system properties, but now it provides C++
counterparts that work with std::string instead.

BUG: 23102347
BUG: 26379932
BUG: 31750617

Test: manual

Change-Id: If2c6f71896682e2d8d10a7d938e0fd83820ea9e9

7 years agoMerge "Add missing liblog dependency" am: b32a59e797 am: f12ea76ef3 am: 2851a53929
Dimitry Ivanov [Mon, 26 Sep 2016 19:15:49 +0000 (19:15 +0000)]
Merge "Add missing liblog dependency" am: b32a59e797 am: f12ea76ef3 am: 2851a53929
am: 2bc204b65b

Change-Id: If8d2fde719a2f9985c8a9748d48503ab96e9c7bf

7 years agoMerge "libgui: add a test for Sensor serialization." am: 01a0c92da0 am: cca7f83210...
David Pursell [Mon, 26 Sep 2016 19:15:36 +0000 (19:15 +0000)]
Merge "libgui: add a test for Sensor serialization." am: 01a0c92da0 am: cca7f83210 am: 36c879bb7a
am: 44c72d265c

Change-Id: Ib56d39f7017b743ebc8cc31ddd99240d0793ea5c

7 years agoMerge commit 'bc06c07ee7677168d71a9c809a8960f39340ff99' into blah
Ajay Panicker [Mon, 26 Sep 2016 19:15:22 +0000 (19:15 +0000)]
Merge commit 'bc06c07ee7677168d71a9c809a8960f39340ff99' into blah
am: 496548f784

Change-Id: Id89d0cadb3f676d4aee989d6e6a60272ff1eb694

7 years agoMerge "Add missing liblog dependency" am: b32a59e797 am: f12ea76ef3
Dimitry Ivanov [Mon, 26 Sep 2016 19:08:58 +0000 (19:08 +0000)]
Merge "Add missing liblog dependency" am: b32a59e797 am: f12ea76ef3
am: 2851a53929

Change-Id: I6ae1d8283de37feec8c2f53af018b1ff470a2786

7 years agoMerge "libgui: add a test for Sensor serialization." am: 01a0c92da0 am: cca7f83210
David Pursell [Mon, 26 Sep 2016 19:08:35 +0000 (19:08 +0000)]
Merge "libgui: add a test for Sensor serialization." am: 01a0c92da0 am: cca7f83210
am: 36c879bb7a

Change-Id: Ifb3fcb554165a0b2ef6de38e0a71898fe84a0526

7 years agoMerge "Use a system property to define extra command-line arguments."
TreeHugger Robot [Mon, 26 Sep 2016 18:33:12 +0000 (18:33 +0000)]
Merge "Use a system property to define extra command-line arguments."

7 years agoUse a system property to define extra command-line arguments.
Felipe Leme [Wed, 21 Sep 2016 17:02:25 +0000 (10:02 -0700)]
Use a system property to define extra command-line arguments.

Currently, we define 4 hardcoded init services to launch dumpstate with
different command-line options (since dumpstate must be launched by
root):

- bugreport
- bugreportplus
- bugreportwear
- bugreportremote

This approach does not scale well; a better option is to have just one
service, and let the framework pass the extra arguments through a system
property.

BUG: 31649719

Test: manual

Change-Id: I537775a7c8ea4ab04dbdaaf2bb2f513cc29f966b

7 years agoAdd socket dumps via ss to bugreports.
Lorenzo Colitti [Mon, 26 Sep 2016 04:37:45 +0000 (13:37 +0900)]
Add socket dumps via ss to bugreports.

Bug: 23113288
Change-Id: I6304425f968fcb22c75c3f6e64bf7992e34e0889

7 years agoMerge "Add missing liblog dependency" am: b32a59e797
Dimitry Ivanov [Sat, 24 Sep 2016 22:19:45 +0000 (22:19 +0000)]
Merge "Add missing liblog dependency" am: b32a59e797
am: f12ea76ef3

Change-Id: I45aaf4f8f9ff72ce0f5ea37f750616abdd3fc138

7 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 24 Sep 2016 22:16:19 +0000 (22:16 +0000)]
Merge "Add missing liblog dependency"
am: b32a59e797

Change-Id: I8ed998f6342914164f89ce8584bca61b8daa4244

7 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 24 Sep 2016 22:07:19 +0000 (22:07 +0000)]
Merge "Add missing liblog dependency"

7 years agoAdd missing liblog dependency
Dimitry Ivanov [Sat, 24 Sep 2016 00:22:33 +0000 (17:22 -0700)]
Add missing liblog dependency

Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and recompile
Change-Id: I5d6ded54613e8a29f20495d8f977064f0af2ffd6

7 years agoMerge "libgui: add a test for Sensor serialization." am: 01a0c92da0
David Pursell [Fri, 23 Sep 2016 23:54:04 +0000 (23:54 +0000)]
Merge "libgui: add a test for Sensor serialization." am: 01a0c92da0
am: cca7f83210

Change-Id: Id8e064040f9d3a167bd3501fa16c3b5b4d4721d8

7 years agoMerge "libgui: add a test for Sensor serialization."
David Pursell [Fri, 23 Sep 2016 23:52:03 +0000 (23:52 +0000)]
Merge "libgui: add a test for Sensor serialization."
am: 01a0c92da0

Change-Id: Idac427f7e0fa170b1a70ad274f39994361fa452d

7 years agoMerge "libgui: add a test for Sensor serialization."
Treehugger Robot [Fri, 23 Sep 2016 23:44:11 +0000 (23:44 +0000)]
Merge "libgui: add a test for Sensor serialization."

7 years agoMerge commit 'bc06c07ee7677168d71a9c809a8960f39340ff99' into blah
Ajay Panicker [Fri, 23 Sep 2016 23:43:29 +0000 (16:43 -0700)]
Merge commit 'bc06c07ee7677168d71a9c809a8960f39340ff99' into blah

Change-Id: I6cbd56cd2ee42de56736642e617689c412056e42

7 years agoMerge "Add btsnoop_hci.log to bugreport zip (1/2)" am: d95b2eb2f6
Ajay Panicker [Fri, 23 Sep 2016 23:09:50 +0000 (23:09 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)" am: d95b2eb2f6
am: 7821d52b4e

Change-Id: If0666e35c49942a980c538bf02d29010cfe70545

7 years agoMerge "Add btsnoop_hci.log to bugreport zip (1/2)"
Ajay Panicker [Fri, 23 Sep 2016 23:07:50 +0000 (23:07 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)"
am: d95b2eb2f6

Change-Id: Ida600de84569296a3c146ca54aba86f9b88a5816

7 years agoMerge "Add btsnoop_hci.log to bugreport zip (1/2)"
Ajay Panicker [Fri, 23 Sep 2016 23:01:16 +0000 (23:01 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)"

7 years agoAdd btsnoop_hci.log to bugreport zip (1/2)
Ajay Panicker [Wed, 14 Sep 2016 19:26:46 +0000 (12:26 -0700)]
Add btsnoop_hci.log to bugreport zip (1/2)

Bug: 28672558
Test: Manual
Merged-In: I2995a9fd0e8be031c022ef8f275aae35265ba452
Change-Id: I2995a9fd0e8be031c022ef8f275aae35265ba452

7 years agoAdd btsnoop_hci.log to bugreport zip (1/2)
Ajay Panicker [Wed, 14 Sep 2016 19:26:46 +0000 (12:26 -0700)]
Add btsnoop_hci.log to bugreport zip (1/2)

Bug: 28672558
Test: Manual
Change-Id: I2995a9fd0e8be031c022ef8f275aae35265ba452
(cherry picked from commit efb524693b8b77e6c77f3ebc6b9878caa5aa9715)

7 years agolibgui: add a test for Sensor serialization.
David Pursell [Fri, 23 Sep 2016 16:08:26 +0000 (09:08 -0700)]
libgui: add a test for Sensor serialization.

On a few test boards we've hit a problem with Sensor serialization
causing a SIGBUS due to misaligned access. This is being fixed in
Flattenable.h, but adding a test here to verify the fix and detect
regression seems like a good idea.

Bug: http://b/31671510
Test: adb shell /data/nativetest/libgui_test/libgui_test \
                --gtest_filter=SensorTest.*

Change-Id: I233359b04789dabe2246b95051290e101e0bd2c1

7 years agoMerge "Surface: Allow nullable IGBPs when unparceling a Surface"
TreeHugger Robot [Fri, 23 Sep 2016 05:59:09 +0000 (05:59 +0000)]
Merge "Surface: Allow nullable IGBPs when unparceling a Surface"

7 years agoMerge "binder: Replace use of resize()/memcpy() with reserve()/insert()"
Paul Liétar [Fri, 23 Sep 2016 03:12:48 +0000 (03:12 +0000)]
Merge "binder: Replace use of resize()/memcpy() with reserve()/insert()"

7 years agoMerge "Surface: Add force disconnection method." into nyc-mr1-dev am: 6cc1933af9...
Rob Carr [Fri, 23 Sep 2016 01:44:38 +0000 (01:44 +0000)]
Merge "Surface: Add force disconnection method." into nyc-mr1-dev am: 6cc1933af9 am: a92604b3cd
am: c96faf0ffb

Change-Id: I437a8df1ab65d5d2f480664c0ca537de9f6ad497

7 years agoSurface: Add force disconnection method. am: 97b9c86338 am: 962b13b9be
Robert Carr [Fri, 23 Sep 2016 01:44:26 +0000 (01:44 +0000)]
Surface: Add force disconnection method. am: 97b9c86338 am: 962b13b9be
am: a9d1c1099d

Change-Id: Iea981cfaddd2be6ecdfebbdfadd9d822f17d682f

7 years agoRecursively restorecon when SELinux label changes. am: 993de79607 am: 59d31b669b
Jeff Sharkey [Fri, 23 Sep 2016 01:30:38 +0000 (01:30 +0000)]
Recursively restorecon when SELinux label changes. am: 993de79607 am: 59d31b669b
am: e5eb9cc4ff

Change-Id: Ib7ee3de3ebcb65872d28b26ef9aa14b9a8e98b7d

7 years agoMerge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev am...
Wei Liu [Fri, 23 Sep 2016 01:30:17 +0000 (01:30 +0000)]
Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev am: 64076bac3f
am: da023f180e

Change-Id: Ibc0b375df6a8cc42689f15bde7ad1112c0140ecc

7 years agoMerge "Surface: Add force disconnection method." into nyc-mr1-dev am: 6cc1933af9
Rob Carr [Thu, 22 Sep 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Surface: Add force disconnection method." into nyc-mr1-dev am: 6cc1933af9
am: a92604b3cd

Change-Id: I791e00bc2584581066f6cda89ea0bda063ba0645

7 years agoSurface: Add force disconnection method. am: 97b9c86338
Robert Carr [Thu, 22 Sep 2016 23:34:27 +0000 (23:34 +0000)]
Surface: Add force disconnection method. am: 97b9c86338
am: 962b13b9be

Change-Id: Ie74482a867c24213a25332650b38c733e183630b

7 years agoRecursively restorecon when SELinux label changes. am: 993de79607
Jeff Sharkey [Thu, 22 Sep 2016 23:32:08 +0000 (23:32 +0000)]
Recursively restorecon when SELinux label changes. am: 993de79607
am: 59d31b669b

Change-Id: I51739d604afa86b993123bd8cc6d46c6743618a2

7 years agoMerge "Surface: Add force disconnection method." into nyc-mr1-dev
Rob Carr [Thu, 22 Sep 2016 23:24:12 +0000 (23:24 +0000)]
Merge "Surface: Add force disconnection method." into nyc-mr1-dev
am: 6cc1933af9

Change-Id: Ice30ea86acd7abfa71c0053dc1459361b4bbfb6c

7 years agoSurface: Add force disconnection method.
Robert Carr [Thu, 22 Sep 2016 23:24:11 +0000 (23:24 +0000)]
Surface: Add force disconnection method.
am: 97b9c86338

Change-Id: Ia9f9dbdcbd9527d54dacb2cdc90eda443230e8d9

7 years agoMerge "resolve merge conflicts of 9795ff6 to master"
TreeHugger Robot [Thu, 22 Sep 2016 22:49:34 +0000 (22:49 +0000)]
Merge "resolve merge conflicts of 9795ff6 to master"

7 years agoRecursively restorecon when SELinux label changes.
Jeff Sharkey [Thu, 22 Sep 2016 22:41:00 +0000 (22:41 +0000)]
Recursively restorecon when SELinux label changes.
am: 993de79607

Change-Id: Ibf9b6beaa58e7e6c2f006e8c6f064330624eb29f

7 years agoMerge "Add binder test for bug 30445380"
Connor O'Brien [Thu, 22 Sep 2016 22:36:38 +0000 (22:36 +0000)]
Merge "Add binder test for bug 30445380"

7 years agoSurface: Allow nullable IGBPs when unparceling a Surface
Eino-Ville Talvala [Thu, 22 Sep 2016 22:04:04 +0000 (15:04 -0700)]
Surface: Allow nullable IGBPs when unparceling a Surface

We will write a null IGBP, so we shouldn't error out when reading one;
leave semantics of that to higher-level code.

Test: No camera crash after lots of front-back camera switches
Bug: 31373143
Change-Id: I5f7cf7489aca721057c5731e3a79cf6f8f260774

7 years agoMerge "Surface: Add force disconnection method." into nyc-mr1-dev
Rob Carr [Thu, 22 Sep 2016 21:17:40 +0000 (21:17 +0000)]
Merge "Surface: Add force disconnection method." into nyc-mr1-dev

7 years agoresolve merge conflicts of 9795ff6 to master
Wei Liu [Thu, 22 Sep 2016 20:34:36 +0000 (13:34 -0700)]
resolve merge conflicts of 9795ff6 to master

Change-Id: I34c069a669ece0fefee18d1e90f53cc68bd74ea9

7 years agoAdd binder test for bug 30445380
Connor O'Brien [Tue, 20 Sep 2016 21:18:08 +0000 (14:18 -0700)]
Add binder test for bug 30445380

Test: Ran on fixed and unfixed kernel.
Change-Id: Ic5c49fde75af7a4606871b07a3f39c0c34824c8b
Signed-off-by: Connor O'Brien <connoro@google.com>
7 years agoMerge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev
Wei Liu [Thu, 22 Sep 2016 20:04:16 +0000 (20:04 +0000)]
Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev
am: 64076bac3f

Change-Id: Ia1f4644556e9f5632b5ce23b6379a43a2d1cba1c

7 years agoMerge "Recursively restorecon when SELinux label changes."
TreeHugger Robot [Thu, 22 Sep 2016 19:39:36 +0000 (19:39 +0000)]
Merge "Recursively restorecon when SELinux label changes."

7 years agoDumpstate should hold a wakelock to save bug report time.
Wei Liu [Thu, 22 Sep 2016 19:02:08 +0000 (19:02 +0000)]
Dumpstate should hold a wakelock to save bug report time.
am: f87959e007

Change-Id: I43fe43f8142e3084d69f336414c19a079dfb9ebc

7 years agoMerge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev
Wei Liu [Thu, 22 Sep 2016 18:37:22 +0000 (18:37 +0000)]
Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev

7 years agoRecursively restorecon when SELinux label changes.
Jeff Sharkey [Wed, 21 Sep 2016 00:21:42 +0000 (18:21 -0600)]
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 agoRecursively restorecon when SELinux label changes.
Jeff Sharkey [Wed, 21 Sep 2016 00:21:42 +0000 (18:21 -0600)]
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 agoMerge "Show masked value for sensor with permission" into cw-f-dev am: ee36adbde7
Ashutosh Joshi [Wed, 21 Sep 2016 20:22:22 +0000 (20:22 +0000)]
Merge "Show masked value for sensor with permission" into cw-f-dev am: ee36adbde7
am: 4c2518252e

Change-Id: Icc0676638901084968a175384bf3530495df93c7

7 years agoShow masked value for sensor with permission am: fba3c11b5e
Peng Xu [Wed, 21 Sep 2016 20:22:10 +0000 (20:22 +0000)]
Show masked value for sensor with permission am: fba3c11b5e
am: 08f1b67b54

Change-Id: I08b12c2eea76a8580d559a022938962b507c9962

7 years agoMerge "Show masked value for sensor with permission" into cw-f-dev
Ashutosh Joshi [Wed, 21 Sep 2016 19:25:16 +0000 (19:25 +0000)]
Merge "Show masked value for sensor with permission" into cw-f-dev
am: ee36adbde7

Change-Id: I755533dbff110702bbf851c8e0a6ec2035fa28c2

7 years agoShow masked value for sensor with permission
Peng Xu [Wed, 21 Sep 2016 19:25:15 +0000 (19:25 +0000)]
Show masked value for sensor with permission
am: fba3c11b5e

Change-Id: If4b9fd323d0f8333cd1d1dea8c1d801b43c7e157

7 years agoMerge "Show masked value for sensor with permission" into cw-f-dev
Ashutosh Joshi [Wed, 21 Sep 2016 19:16:55 +0000 (19:16 +0000)]
Merge "Show masked value for sensor with permission" into cw-f-dev

7 years agoMerge "Rename unique_fd::clear to unique_fd::reset." am: f9f04003f5 am: 44bd6ca0d0...
Josh Gao [Wed, 21 Sep 2016 07:32:18 +0000 (07:32 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset." am: f9f04003f5 am: 44bd6ca0d0 am: d1a3db64c5
am: ebbfaf3fa3

Change-Id: I85eda7ff3e72efefc378770276a6ba8db651b252

7 years agoMerge "Rename unique_fd::clear to unique_fd::reset." am: f9f04003f5 am: 44bd6ca0d0
Josh Gao [Wed, 21 Sep 2016 01:12:46 +0000 (01:12 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset." am: f9f04003f5 am: 44bd6ca0d0
am: d1a3db64c5

Change-Id: Ica8691bfa5ff84dabe9e026dfae46e8093cf4fb4

7 years agoMerge "Rename unique_fd::clear to unique_fd::reset." am: f9f04003f5
Josh Gao [Wed, 21 Sep 2016 01:10:14 +0000 (01:10 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset." am: f9f04003f5
am: 44bd6ca0d0

Change-Id: Ie664fd18862e404845b2702ff546719818190cd1

7 years agoMerge "Rename unique_fd::clear to unique_fd::reset."
Josh Gao [Wed, 21 Sep 2016 01:07:32 +0000 (01:07 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset."
am: f9f04003f5

Change-Id: I856ff1bdb5735a90e3b6c13d2f7a2deeff0388e0

7 years agoMerge "Rename unique_fd::clear to unique_fd::reset."
Josh Gao [Wed, 21 Sep 2016 01:03:06 +0000 (01:03 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset."

7 years agoRename unique_fd::clear to unique_fd::reset.
Josh Gao [Mon, 19 Sep 2016 19:44:50 +0000 (12:44 -0700)]
Rename unique_fd::clear to unique_fd::reset.

Test: m checkbuild
Change-Id: I8cbf2b538c270d8ef50ab6fdcf4fecbcd65899a8

7 years agoMerge "libvulkan: Fix count returned for incomplete wsi queries" am: 75bb94fe7e am...
Jesse Hall [Mon, 19 Sep 2016 18:13:13 +0000 (18:13 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries" am: 75bb94fe7e am: f4171ecd58 am: 7f3fdaa059
am: ebe91de21e

Change-Id: If131abf6f3bf0c35832dab458cfc17b315944970

7 years agoMerge "libvulkan: Fix count returned for incomplete wsi queries" am: 75bb94fe7e am...
Jesse Hall [Mon, 19 Sep 2016 18:05:10 +0000 (18:05 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries" am: 75bb94fe7e am: f4171ecd58
am: 7f3fdaa059

Change-Id: I731446903759e0acefa6cd453d6d25e2c2011fd3

7 years agoMerge "libvulkan: Fix count returned for incomplete wsi queries" am: 75bb94fe7e
Jesse Hall [Mon, 19 Sep 2016 18:02:08 +0000 (18:02 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries" am: 75bb94fe7e
am: f4171ecd58

Change-Id: I549bdd589575e505063de0ed4aa7fda97c481e32

7 years agoMerge "libvulkan: Fix count returned for incomplete wsi queries"
Jesse Hall [Mon, 19 Sep 2016 17:58:39 +0000 (17:58 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries"
am: 75bb94fe7e

Change-Id: I0567dca837c6a56d0af14eb0ace73318386b444d

7 years agoMerge "libvulkan: Fix count returned for incomplete wsi queries"
Jesse Hall [Mon, 19 Sep 2016 17:51:36 +0000 (17:51 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries"

7 years agolibvulkan: Fix count returned for incomplete wsi queries
Jesse Hall [Fri, 16 Sep 2016 04:26:01 +0000 (21:26 -0700)]
libvulkan: Fix count returned for incomplete wsi queries

When vkGetPhysicalDeviceSurfaceFormatsKHR,
vkGetPhysicalDevicePresentModesKHR, and vkGetSwapchainImagesKHR
returned VK_INCOMPLETE, they would overwrite the count parameter with
the number of available items, rather than the number of returned
items.

Change-Id: I6a736770f90b95ad15bfcfbe5afb4d2886817dcb
Fixes: 31490492
Test: https://gerrit.khronos.org/#/c/158/

7 years agoHWC2On1: Fall back to GLES for SolidColor am: 5df47cb648 am: d946ae67c2
Dan Stoza [Fri, 16 Sep 2016 19:49:56 +0000 (19:49 +0000)]
HWC2On1: Fall back to GLES for SolidColor am: 5df47cb648 am: d946ae67c2
am: 9e718be5fb

Change-Id: I9644bee3005e9d819fa375c41ee36b6f0e04287e

7 years agoHWC2On1: Fall back to GLES for SolidColor am: 5df47cb648
Dan Stoza [Fri, 16 Sep 2016 19:47:02 +0000 (19:47 +0000)]
HWC2On1: Fall back to GLES for SolidColor am: 5df47cb648
am: d946ae67c2

Change-Id: I9c866a4cbf23f4e8dcdaf922063c4a26f7da7c51

7 years agoHWC2On1: Fall back to GLES for SolidColor
Dan Stoza [Fri, 16 Sep 2016 19:45:01 +0000 (19:45 +0000)]
HWC2On1: Fall back to GLES for SolidColor
am: 5df47cb648

Change-Id: I485ae0aa189b5338f6f98dd3c716dd87dac60ab1

7 years agobinder: Replace use of resize()/memcpy() with reserve()/insert()
Paul Lietar [Fri, 16 Sep 2016 17:39:32 +0000 (10:39 -0700)]
binder: Replace use of resize()/memcpy() with reserve()/insert()

resize() zero initializes the vector even though data is about to be
copied to it. Moreover it does so with a loop rather than a memset.

Using reserve() and insert() is significantly faster with large
payloads, as it only has to allocate and memcpy.

Benchmarked using system/libhwbinder/tests/benchmarks

Before:
Benchmark                       Time           CPU Iterations
-------------------------------------------------------------
BM_sendVec_binder/4k        89872 ns      45885 ns      15328
BM_sendVec_binder/8k       122753 ns      57713 ns      11667
BM_sendVec_binder/16k      163825 ns      88444 ns       7500
BM_sendVec_binder/32k      261942 ns     153561 ns       4667
BM_sendVec_binder/64k      558372 ns     318525 ns       2386

After:
Benchmark                       Time           CPU Iterations
-------------------------------------------------------------
BM_sendVec_binder/4k        69052 ns      23111 ns      30000
BM_sendVec_binder/8k        71891 ns      25092 ns      27632
BM_sendVec_binder/16k       85439 ns      32822 ns      21429
BM_sendVec_binder/32k      115223 ns      43912 ns      15789
BM_sendVec_binder/64k      203960 ns      82667 ns       8750

Change-Id: Ie83c1d0a9da6f175ffd1a3fc9e0ecc6d542a909a

7 years agoHWC2On1: Fall back to GLES for SolidColor
Dan Stoza [Thu, 15 Sep 2016 23:38:42 +0000 (16:38 -0700)]
HWC2On1: Fall back to GLES for SolidColor

Even though SolidColor layers map cleanly to HWC_BACKGROUND composition
in HWC1, SurfaceFlinger never used HWC_BACKGROUND, so we can't trust
that HWC1 devices implemented it correctly. To preserve backwards
compatibility, this changes the behavior to fall back to client
composition to minimize incompatibilities with existing devices.

Bug: 30479781
Change-Id: I638339062e03f2c057b3e1624e7157587ddee7ec

7 years agoMerge "Refactored dump_file() into dumpFile()."
TreeHugger Robot [Thu, 15 Sep 2016 20:59:56 +0000 (20:59 +0000)]
Merge "Refactored dump_file() into dumpFile()."

7 years agoMerge "SF: Call makeCurrent after presenting each display"
Dan Stoza [Thu, 15 Sep 2016 20:07:48 +0000 (20:07 +0000)]
Merge "SF: Call makeCurrent after presenting each display"

7 years agoMerge "Refactored run_command functions."
TreeHugger Robot [Thu, 15 Sep 2016 18:51:01 +0000 (18:51 +0000)]
Merge "Refactored run_command functions."

7 years agoDumpstate should hold a wakelock to save bug report time.
Wei Liu [Fri, 26 Aug 2016 21:51:42 +0000 (14:51 -0700)]
Dumpstate should hold a wakelock to save bug report time.

b/30832947

Change-Id: I0a4b1fcce91caa96ccbc4e890d9968e3033487de

7 years agoMerge "Fix signature for MotionEvent#setButtonState"
TreeHugger Robot [Thu, 15 Sep 2016 14:23:04 +0000 (14:23 +0000)]
Merge "Fix signature for MotionEvent#setButtonState"

7 years agoFix signature for MotionEvent#setButtonState
Michael Wright [Wed, 14 Sep 2016 18:53:37 +0000 (19:53 +0100)]
Fix signature for MotionEvent#setButtonState

Bug: 31441257

Change-Id: I5069118d6d89f0c3a0eedf85d1d4dafbbec77ac6

7 years agoSF: Call makeCurrent after presenting each display
Season Li [Thu, 4 Aug 2016 21:32:44 +0000 (14:32 -0700)]
SF: Call makeCurrent after presenting each display

HWC can change EGLContext in each present. Restore to
default EGLContext after commiting each display.

Change-Id: I4abc84fb3d4b74964fabcad5a2568ff01a6c5dbb

7 years agoMerge "Fix google-explicit-constructor warnings in binder." am: 8b2d3da4c4 am: e00f70...
Chih-hung Hsieh [Wed, 14 Sep 2016 20:43:04 +0000 (20:43 +0000)]
Merge "Fix google-explicit-constructor warnings in binder." am: 8b2d3da4c4 am: e00f704122 am: 772819113d
am: fde6e0c2b9

Change-Id: Idfcba06c1a548ebc152b5b623c2a1b146e49291f

7 years agoMerge "Convert libui to Android.bp" am: f0346ab68e am: 55ef158c5d am: 14107b1e89
Dan Willemsen [Wed, 14 Sep 2016 20:43:00 +0000 (20:43 +0000)]
Merge "Convert libui to Android.bp" am: f0346ab68e am: 55ef158c5d am: 14107b1e89
am: 51d7c42bb9

Change-Id: Iad682bebef63f9671fa9c2ea6d34ac2d17d50ca9

7 years agoMerge "Sensor: Make switching from data injection mode to normal mode more productive...
Peng Xu [Wed, 14 Sep 2016 20:42:57 +0000 (20:42 +0000)]
Merge "Sensor: Make switching from data injection mode to normal mode more productive" am: e6a4e9b04e am: 33685d3a84 am: 0674efdbfa
am: 85171c016e

Change-Id: I4db1bfa247779e46ca57117df8fc1ee5240c95e3

7 years agoMerge changes I5041c541,I0eeafc99,Ie982d375 am: 30fcc9fc7f am: 3967e136b2 am: 6bc61379cb
Dan Stoza [Wed, 14 Sep 2016 20:42:15 +0000 (20:42 +0000)]
Merge changes I5041c541,I0eeafc99,Ie982d375 am: 30fcc9fc7f am: 3967e136b2 am: 6bc61379cb
am: fe25ad772d

Change-Id: I8d3980c738a4fa4d0815ed3be6adb1154ab17811

7 years agoSquashed: gralloc1/binder/requestor am: f62eaf5994 am: c76b6fb0c8 am: 82e5e2edc7
Dan Stoza [Wed, 14 Sep 2016 20:42:14 +0000 (20:42 +0000)]
Squashed: gralloc1/binder/requestor am: f62eaf5994 am: c76b6fb0c8 am: 82e5e2edc7
am: e506c2a73b

Change-Id: Id8d53e48594baa86c6404844cc9cb0db7594b418

7 years agolibui: Add Gralloc1On0Adapter and C++ shim am: eb03fd3a8b am: e9a0705cf5 am: 0d85101e...
Dan Stoza [Wed, 14 Sep 2016 20:42:13 +0000 (20:42 +0000)]
libui: Add Gralloc1On0Adapter and C++ shim am: eb03fd3a8b am: e9a0705cf5 am: 0d85101e33  -s ours
am: c6c81dcbcc

Change-Id: Iff66a31eaa6842116da28b2ada5b1c7534220666

7 years agolibagl: Switch from gralloc to GraphicBufferMapper am: 204240a88b am: 3a37f21808...
Dan Stoza [Wed, 14 Sep 2016 20:42:00 +0000 (20:42 +0000)]
libagl: Switch from gralloc to GraphicBufferMapper am: 204240a88b am: 3a37f21808 am: 5752748514
am: d034178751

Change-Id: I56b577befb43c20f530a14eb60b51644b4d2d916

7 years agoMerge changes I1b74d58b,I38c6e8bc am: 9f41107732 am: 263f969ab9 am: 75ef58520f
Feng Yu [Wed, 14 Sep 2016 20:41:12 +0000 (20:41 +0000)]
Merge changes I1b74d58b,I38c6e8bc am: 9f41107732 am: 263f969ab9 am: 75ef58520f
am: ae59cf0110

Change-Id: Iff1daab235812ef21ea20345873664bcd67aba12