OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "Delete vdex file in delete_odex."
Nicolas Geoffray [Fri, 26 May 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Delete vdex file in delete_odex."
am: 99dedeb690

Change-Id: Idccc7fa241cdbb72b0ac5672978350a269ac8378

7 years agoMerge "Delete vdex file in delete_odex."
Nicolas Geoffray [Fri, 26 May 2017 10:21:25 +0000 (10:21 +0000)]
Merge "Delete vdex file in delete_odex."

7 years agoDelete vdex file in delete_odex.
Nicolas Geoffray [Thu, 25 May 2017 12:58:06 +0000 (13:58 +0100)]
Delete vdex file in delete_odex.

bug: 38513395
Test: unfortunately no unit test here, so after discussing
      with agampe@ just relied on build.

Change-Id: I305ddaadc813673fb55473f5e8ca357f39cf98f3

7 years agoMerge "Add thread usage output to lshal."
Steven Moreland [Thu, 25 May 2017 22:58:30 +0000 (22:58 +0000)]
Merge "Add thread usage output to lshal."
am: 4a3e0a9767

Change-Id: Ie0a5eb6b3f1c502e9cf6c70e10354ce133985348

7 years agoMerge "Add thread usage output to lshal."
Treehugger Robot [Thu, 25 May 2017 22:42:24 +0000 (22:42 +0000)]
Merge "Add thread usage output to lshal."

7 years agoMerge "SF: Call makeCurrent after presenting each display"
Season Li [Thu, 25 May 2017 01:06:02 +0000 (01:06 +0000)]
Merge "SF: Call makeCurrent after presenting each display"
am: 7bb8779a79

Change-Id: If22c0369b968a72dcbac8b97061f5555c18e8432

7 years agoMerge "SF: Call makeCurrent after presenting each display"
Treehugger Robot [Thu, 25 May 2017 00:59:58 +0000 (00:59 +0000)]
Merge "SF: Call makeCurrent after presenting each display"

7 years agoAdd thread usage output to lshal.
Steven Moreland [Wed, 24 May 2017 18:23:08 +0000 (11:23 -0700)]
Add thread usage output to lshal.

This output shows how many threads are in use at a give time.

Test: lshal, manual
Bug: 35099601
Change-Id: I3a22bb131b828cdd77e73e7810229d9c68a496d3

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.

Test: see https://android-review.googlesource.com/#/c/372703/
Change-Id: I4abc84fb3d4b74964fabcad5a2568ff01a6c5dbb

7 years agoMerge "Fix a anr bug caused by sendFinishedSignal logical error"
gaoshang [Wed, 24 May 2017 16:18:23 +0000 (16:18 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error"
am: 77bee3b429

Change-Id: If794d0ec576c91fc8554bf974d7409966b306cba

7 years agoMerge "Fix a anr bug caused by sendFinishedSignal logical error"
Treehugger Robot [Wed, 24 May 2017 16:10:16 +0000 (16:10 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error"

7 years agoFix a anr bug caused by sendFinishedSignal logical error
gaoshang [Wed, 17 May 2017 06:36:46 +0000 (14:36 +0800)]
Fix a anr bug caused by sendFinishedSignal logical error

Because of eliminate multiple benign overflow conditions see:
https://android-review.googlesource.com/#/c/172237/
Changed the do while loop resulting in a logical difference.

When the chainIndex-- to 0, the loop is not run.
It is the most important cycle, it will push head seq to mSeqChains.
If not run, will lead to a batch of seq can not corrected finish.
Eventually leading to the occurrence of anr.

Signed-off-by: gaoshang <gaoshang@xiaomi.com>
Test: Input dispatche process
Bug: 38366215
Change-Id: I87e609dfcb00ac7b8e82c6de789df094e7c25efd

7 years agoMerge "Support halt the trace when schd-dbg hit deadline"
Howard Chen [Thu, 18 May 2017 03:03:38 +0000 (03:03 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline"
am: f232542c03

Change-Id: I45b92a5340d8bbc6aa0898b0a1ef073223e49cf6

7 years agoMerge "Support halt the trace when schd-dbg hit deadline"
Howard Chen [Thu, 18 May 2017 02:50:48 +0000 (02:50 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline"

7 years agoMerge "Make the binder_lock category optional"
Howard Chen [Wed, 17 May 2017 07:38:36 +0000 (07:38 +0000)]
Merge "Make the binder_lock category optional"
am: 61e58d5a47

Change-Id: I6fec33b45edd7665d26f4c5ad5e9c7f4f7ce7d21

7 years agoMerge "Make the binder_lock category optional"
Treehugger Robot [Wed, 17 May 2017 07:28:41 +0000 (07:28 +0000)]
Merge "Make the binder_lock category optional"

7 years agoMake the binder_lock category optional
Howard Chen [Wed, 10 May 2017 08:32:11 +0000 (16:32 +0800)]
Make the binder_lock category optional

The binder_lock event type has been deprecated after binder
driver uses fine grained locking. This patch makes "binder_lock"
an optional category for atrace to support system w/ w/o FGL.

Bug: 37559846
Test: pixel phone with "atrace --async_start binder_lock"
Merged-In: I691efd355e903a26629f896a56a664502e5807f7
Change-Id: I691efd355e903a26629f896a56a664502e5807f7

7 years agoMerge "Add lshal --neat option"
Yifan Hong [Mon, 15 May 2017 20:12:09 +0000 (20:12 +0000)]
Merge "Add lshal --neat option"
am: 3a6828d50b

Change-Id: I15e00e281522c2ff59f885636c49d3ac41fc8eee

7 years agoMerge "Add lshal --neat option"
Treehugger Robot [Mon, 15 May 2017 20:05:51 +0000 (20:05 +0000)]
Merge "Add lshal --neat option"

7 years agoAdd lshal --neat option
Yifan Hong [Fri, 12 May 2017 23:56:43 +0000 (16:56 -0700)]
Add lshal --neat option

... that doesn't output explanatory text and title line.

Test: lshal --neat
Test: lshal
Test: lshal --neat -itrpc

Change-Id: I269a5d284903dc0e9bc3be96379ed41aecea8ddb
Fixes: 38211518

7 years agoMerge "Actually remove dead processes from lshal"
Yifan Hong [Sat, 13 May 2017 01:33:34 +0000 (01:33 +0000)]
Merge "Actually remove dead processes from lshal"
am: 28765c6184

Change-Id: I8142135cfc9afe8af63fa00f35cb83ac3a4f1372

7 years agoMerge "Actually remove dead processes from lshal"
Treehugger Robot [Sat, 13 May 2017 01:25:34 +0000 (01:25 +0000)]
Merge "Actually remove dead processes from lshal"

7 years agoActually remove dead processes from lshal
Yifan Hong [Fri, 12 May 2017 23:33:57 +0000 (16:33 -0700)]
Actually remove dead processes from lshal

Test: run lshal with and without the change

Change-Id: Id8c52a5be3253f5ff9c1cb851459a16e01ca5dda
Fixes: 35765788

7 years agoMerge changes from topic 'lshal_debug'
Yifan Hong [Fri, 12 May 2017 22:38:48 +0000 (22:38 +0000)]
Merge changes from topic 'lshal_debug'
am: d4f5bb4c17

Change-Id: I0d7b068421152d9c2bfb1c53718abcb7e09c26a1

7 years agoMerge changes from topic 'lshal_debug'
Yifan Hong [Fri, 12 May 2017 22:21:25 +0000 (22:21 +0000)]
Merge changes from topic 'lshal_debug'

* changes:
  Add tests to lshal.
  Add `lshal debug` command.
  Lshal: support commands.

7 years agoAdd tests to lshal.
Yifan Hong [Wed, 10 May 2017 21:33:05 +0000 (14:33 -0700)]
Add tests to lshal.

Test: lshal_test
Bug: 37954458
Change-Id: I1914e6274974ed5eb0ce2d655f1333d2344b49f5

7 years agoAdd `lshal debug` command.
Yifan Hong [Wed, 10 May 2017 02:33:08 +0000 (19:33 -0700)]
Add `lshal debug` command.

Supported command:
    lshal debug android.hardware.foo@1.0::IFoo option option

Test: adb unroot && lshal --debug ; echo $?
Test: adb unroot && lshal debug android.hardware.nfc@1.0::INfc ; echo $?
Test: adb root && lshal --debug ; echo $?
Test: adb root && lshal debug android.hardware.nfc@1.0::INfc ; echo $?

Bug: 37954458
Change-Id: Ia2f4c9c0d3fb0a7bb26e76f01d02f49dc426e7f8

7 years agoLshal: support commands.
Yifan Hong [Wed, 10 May 2017 01:49:45 +0000 (18:49 -0700)]
Lshal: support commands.

Support the following commands:
  lshal list
  lshal list -itrpc
  lshal help
  lshal help list
  lshal list -h
  lshal list --help

Test: run these commands
Bug: 37725279
Change-Id: I970fbc8d250d43f57e92f783229e0645d7e8df4e

7 years agoMerge "Remove obsolete DEXOPT_SAFEMODE."
Nicolas Geoffray [Thu, 11 May 2017 09:48:59 +0000 (09:48 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
am: 4fa2b96d21

Change-Id: I652a433fb0e042b79e4289faf74b8b4c6cd84f91

7 years agoMerge "Remove obsolete DEXOPT_SAFEMODE."
Nicolas Geoffray [Thu, 11 May 2017 09:42:23 +0000 (09:42 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."

7 years agoMerge "lshal: remove "// static" comments"
Yifan Hong [Thu, 11 May 2017 00:30:23 +0000 (00:30 +0000)]
Merge "lshal: remove "// static" comments"
am: 8d2f788a05

Change-Id: Id2eacee2cd265922954cc3b480015c6fe9efa6d1

7 years agoMerge "lshal: remove "// static" comments"
Yifan Hong [Thu, 11 May 2017 00:23:58 +0000 (00:23 +0000)]
Merge "lshal: remove "// static" comments"

7 years agoMerge "Add explicit default copy constructor"
Yi Kong [Wed, 10 May 2017 23:53:19 +0000 (23:53 +0000)]
Merge "Add explicit default copy constructor"
am: c9810011e9

Change-Id: I4d6198e65c54f3f620c031da3d9fa395d6d3762f

7 years agoMerge "Add explicit default copy constructor"
Treehugger Robot [Wed, 10 May 2017 23:35:33 +0000 (23:35 +0000)]
Merge "Add explicit default copy constructor"

7 years agolshal: remove "// static" comments
Steven Moreland [Tue, 9 May 2017 23:43:46 +0000 (16:43 -0700)]
lshal: remove "// static" comments

Test: pass
Change-Id: I4d710c8aaad87cfcd7896800a5ab24f812775703

7 years agoAdd explicit default copy constructor
Yi Kong [Wed, 10 May 2017 21:27:39 +0000 (14:27 -0700)]
Add explicit default copy constructor

Definition of implicit copy constructor is deprecated if it has a
user-declared destructor. This triggers -Wdeprecated compiler warning
and breaks the build in latest Clang update.

Test: Build
Bug: 37752547
Change-Id: I467d5ff3b4cca4644c7ec8c99ae35556029ce509

7 years agoMerge "Switch from libcrypto_static to libcrypto target"
Alex Klyubin [Wed, 10 May 2017 19:40:11 +0000 (19:40 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"
am: 612c12b293

Change-Id: I12980dcc8ea7b809b87199e9d7959202a7abc385

7 years agoMerge "Switch from libcrypto_static to libcrypto target"
Alex Klyubin [Wed, 10 May 2017 19:25:30 +0000 (19:25 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"

7 years agoRemove obsolete DEXOPT_SAFEMODE.
Nicolas Geoffray [Fri, 5 May 2017 13:32:51 +0000 (14:32 +0100)]
Remove obsolete DEXOPT_SAFEMODE.

installd side of the change.

bug:37929796
Test: build
(cherry picked from commit bad623a225d0b3d94f30f8654bd4684969e90d4c)

Change-Id: Ice855d20184443a641e081efa4ec943326ccefdd

7 years agoMerge "Always unlink the out_vdex_file."
Nicolas Geoffray [Wed, 10 May 2017 09:11:48 +0000 (09:11 +0000)]
Merge "Always unlink the out_vdex_file."
am: fbb09a7192

Change-Id: If1eed0f380172f05b4fbd7a8f853a9d7db6f4aa7

7 years agoMerge "Always unlink the out_vdex_file."
Nicolas Geoffray [Wed, 10 May 2017 08:52:29 +0000 (08:52 +0000)]
Merge "Always unlink the out_vdex_file."

7 years agoAlways unlink the out_vdex_file.
Nicolas Geoffray [Tue, 9 May 2017 13:20:09 +0000 (14:20 +0100)]
Always unlink the out_vdex_file.

Even if we pass the same vdex file as input and output to
dex2oat, make sure we unlink it if dex2oat failed.

bug:38113240
Test: manual, killing dex2oat invocation
Change-Id: I406014f97a2c3b2bd646e13b5d86dfa0eaa2692f

7 years agoSwitch from libcrypto_static to libcrypto target
Alex Klyubin [Mon, 8 May 2017 21:12:57 +0000 (14:12 -0700)]
Switch from libcrypto_static to libcrypto target

libcrypto target offers the same static library as libcrypto_static.
Thus, there's no need to use libcrypto_static.

Test: make dumpstate
      dumpstate binary unchanged by this commit
Bug: 26160319

Change-Id: I62ca775870482386f0bb7ce1e2f8c94cf6f0342a

7 years agoMerge "Fix lshal --init-vintf may have empty <instance> tags."
Yifan Hong [Sat, 6 May 2017 00:19:06 +0000 (00:19 +0000)]
Merge "Fix lshal --init-vintf may have empty <instance> tags."
am: 4a9b7174ca

Change-Id: Ic6eeff994ab0fb8e2e30dd7c200d9eab512cf057

7 years agoMerge "Fix lshal --init-vintf may have empty <instance> tags."
Treehugger Robot [Sat, 6 May 2017 00:11:31 +0000 (00:11 +0000)]
Merge "Fix lshal --init-vintf may have empty <instance> tags."

7 years agoMerge "Handle safe mode in PackageManager."
Nicolas Geoffray [Fri, 5 May 2017 08:46:01 +0000 (08:46 +0000)]
Merge "Handle safe mode in PackageManager."
am: 7a45fd929a

Change-Id: Icd7bf11cb3bdc3acdf3414a3ba13cd7964e13f3b

7 years agoMerge "Handle safe mode in PackageManager."
Nicolas Geoffray [Fri, 5 May 2017 08:37:16 +0000 (08:37 +0000)]
Merge "Handle safe mode in PackageManager."

7 years agoMerge "Add 'override' specifier to overridden destructor methods"
Yi Kong [Thu, 4 May 2017 22:20:11 +0000 (22:20 +0000)]
Merge "Add 'override' specifier to overridden destructor methods"
am: 44c9a3766f

Change-Id: Ib41b7fef7b07cf7df6125cf1f09a58eb223d714c

7 years agoMerge "Add 'override' specifier to overridden destructor methods"
Yi Kong [Thu, 4 May 2017 22:13:17 +0000 (22:13 +0000)]
Merge "Add 'override' specifier to overridden destructor methods"

7 years agoAdd 'override' specifier to overridden destructor methods
Yi Kong [Tue, 2 May 2017 23:55:24 +0000 (16:55 -0700)]
Add 'override' specifier to overridden destructor methods

Test: Build
Bug: 37752547
Change-Id: I157e1c2aa5d9d08fcab6055a3ca48c6ed8a050fc

7 years agoMerge "Add const specifier to SortLayersByZ comparator"
Yi Kong [Thu, 4 May 2017 00:21:10 +0000 (00:21 +0000)]
Merge "Add const specifier to SortLayersByZ comparator"
am: 40f0088f45

Change-Id: Ia7316e218e388b6f3760374751b32bb992c6441a

7 years agoMerge "Add const specifier to SortLayersByZ comparator"
Yi Kong [Thu, 4 May 2017 00:14:49 +0000 (00:14 +0000)]
Merge "Add const specifier to SortLayersByZ comparator"

7 years agoMerge "installd create_data_user_ce_path uses dir instead of symlink"
Tom Cherry [Wed, 3 May 2017 23:46:44 +0000 (23:46 +0000)]
Merge "installd create_data_user_ce_path uses dir instead of symlink"
am: f8af02fffa

Change-Id: I22a693a5bf288876413bbb3b1dfe2c364944deaa

7 years agoMerge "installd create_data_user_ce_path uses dir instead of symlink"
Tom Cherry [Wed, 3 May 2017 23:42:58 +0000 (23:42 +0000)]
Merge "installd create_data_user_ce_path uses dir instead of symlink"

7 years agoFix lshal --init-vintf may have empty <instance> tags.
Yifan Hong [Wed, 3 May 2017 20:13:23 +0000 (13:13 -0700)]
Fix lshal --init-vintf may have empty <instance> tags.

Test: on bullhead, lshal --init-vintf | grep "<instance></instance>"

Change-Id: Ic6ab977adcdc5293015e9daba506b625629e5352
Fixes: 37311367

7 years agoAdd const specifier to SortLayersByZ comparator
Yi Kong [Wed, 3 May 2017 20:26:48 +0000 (13:26 -0700)]
Add const specifier to SortLayersByZ comparator

No functionality change.

Test: build
Bug: 37752547
Change-Id: I33ffccbd7bc67031680e3fe7e9263de5402a9cde

7 years agoMerge "Lshal: note debug in help"
Steven Moreland [Wed, 3 May 2017 16:21:06 +0000 (16:21 +0000)]
Merge "Lshal: note debug in help"
am: 1a1d34791e

Change-Id: Ifbefa79cf620eb4ef0fb98ffb3c987b40a55b51e

7 years agoMerge "Lshal: note debug in help"
Treehugger Robot [Wed, 3 May 2017 16:15:21 +0000 (16:15 +0000)]
Merge "Lshal: note debug in help"

7 years agoHandle safe mode in PackageManager.
Nicolas Geoffray [Wed, 3 May 2017 12:21:37 +0000 (13:21 +0100)]
Handle safe mode in PackageManager.

installd side of the change.

bug:37929796
Test: manual OTA with a safemode app.
Change-Id: I1cdb034b9e27b72ad606a4935172d0040364c380

7 years agoMerge "Remove warnings in Rect.h"
Colin Cross [Wed, 3 May 2017 02:06:43 +0000 (02:06 +0000)]
Merge "Remove warnings in Rect.h"
am: 13996341b8

Change-Id: I77287527167d9673310f5fd16f919b7e7bd4d08c

7 years agoMerge "Remove warnings in Rect.h"
Treehugger Robot [Wed, 3 May 2017 02:00:25 +0000 (02:00 +0000)]
Merge "Remove warnings in Rect.h"

7 years agoLshal: note debug in help
Steven Moreland [Wed, 3 May 2017 00:27:52 +0000 (17:27 -0700)]
Lshal: note debug in help

Test: pass
Bug: 37725279
Change-Id: I2f43628e42f2cb334083dcb4f7d174100021a745

7 years agoRemove warnings in Rect.h
Colin Cross [Tue, 2 May 2017 22:59:14 +0000 (15:59 -0700)]
Remove warnings in Rect.h

Fixes:
frameworks/native/include/ui/Rect.h:53:69: error: format specifies type 'unsigned int' but the argument has type 'unsigned long' [-Werror,-Wformat]

Bug: 31751828
Test: m -j checkbuild
Change-Id: Ic8a2ce741f550651f943805382adc035a8da1096

7 years agoMerge "Revert "Disable input-vdex when doing speed-profile.""
Nicolas Geoffray [Tue, 2 May 2017 13:27:20 +0000 (13:27 +0000)]
Merge "Revert "Disable input-vdex when doing speed-profile.""
am: eebbf2e371

Change-Id: I4caaf298f66d2fcf4fe53cc053fcbedadc42e6c1

7 years agoMerge "Revert "Disable input-vdex when doing speed-profile.""
Treehugger Robot [Tue, 2 May 2017 13:23:17 +0000 (13:23 +0000)]
Merge "Revert "Disable input-vdex when doing speed-profile.""

7 years agoMerge "Remove redundant dependencies"
Steven Moreland [Mon, 1 May 2017 23:29:59 +0000 (23:29 +0000)]
Merge "Remove redundant dependencies"
am: c0a1cdc42b

Change-Id: I196fab3e127ebee6041591c37f63e07c08f11aa8

7 years agoMerge "Remove redundant dependencies"
Treehugger Robot [Mon, 1 May 2017 23:19:24 +0000 (23:19 +0000)]
Merge "Remove redundant dependencies"

7 years agoRemove redundant dependencies
Steven Moreland [Mon, 1 May 2017 17:19:17 +0000 (10:19 -0700)]
Remove redundant dependencies

android.hidl.base@1.0 and android.hidlmanager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: Ia22e134d3882f2e503e540dda332fc17213b6bb0

7 years agoMerge "Update installd to new compiler filters."
Nicolas Geoffray [Thu, 27 Apr 2017 11:51:14 +0000 (11:51 +0000)]
Merge "Update installd to new compiler filters."
am: f41404045a

Change-Id: I1fb833977506a03f55c309bcda6458f1620304e8

7 years agoMerge "Update installd to new compiler filters."
Nicolas Geoffray [Thu, 27 Apr 2017 11:40:05 +0000 (11:40 +0000)]
Merge "Update installd to new compiler filters."

7 years agoRevert "Disable input-vdex when doing speed-profile."
Nicolas Geoffray [Mon, 24 Apr 2017 13:34:59 +0000 (13:34 +0000)]
Revert "Disable input-vdex when doing speed-profile."

https://android-review.googlesource.com/#/c/377754/ is fixing vdex and delayout.

bug: 37558732
Test: device boots, vdex works on OTA, input-vdex is passed
      for speed-profile

This reverts commit a2dbefc7a51482acb8d5d139c9e2f01306ef9ceb.

Change-Id: I8fcab30ec617b39769fbf7e5818e5d503d647fb4

7 years agoMerge "Add missing stdbool.h to sensor.h."
Dan Albert [Wed, 26 Apr 2017 18:47:15 +0000 (18:47 +0000)]
Merge "Add missing stdbool.h to sensor.h."
am: 237249bbe1

Change-Id: I09f91502b27dabb86e8eb0425dda55c2b071eef7

7 years agoMerge "Add missing stdbool.h to sensor.h."
Dan Albert [Wed, 26 Apr 2017 18:34:14 +0000 (18:34 +0000)]
Merge "Add missing stdbool.h to sensor.h."

7 years agoAdd missing stdbool.h to sensor.h.
Dan Albert [Tue, 25 Apr 2017 19:24:28 +0000 (12:24 -0700)]
Add missing stdbool.h to sensor.h.

This got hacked into the NDK headers ages ago, but never got
upstreamed to the frameworks.

Test: make checkbuild
Bug: https://github.com/android-ndk/ndk/issues/370
Merged-In: Id38cbc96633c1c61de36996c2dd9e6c2331bd6e7
Change-Id: Id38cbc96633c1c61de36996c2dd9e6c2331bd6e7

7 years agoUpdate installd to new compiler filters.
Nicolas Geoffray [Tue, 25 Apr 2017 11:28:28 +0000 (12:28 +0100)]
Update installd to new compiler filters.

bug:34715556
Test: build and boot aosp bullhead
Change-Id: If10fb8cdfe34f109d4caa1df56a49304025da553

7 years agoMerge "Revert "(lib)?sensorservice: Android.mk -> Android.bp""
Steven Moreland [Fri, 21 Apr 2017 02:01:04 +0000 (02:01 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp""
am: c6a6fd0516

Change-Id: Ic5c3654b19f84b12add62a2ec127fb9eda7654a4

7 years agoMerge "Revert "(lib)?sensorservice: Android.mk -> Android.bp""
Steven Moreland [Fri, 21 Apr 2017 01:57:34 +0000 (01:57 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp""

7 years agoRevert "(lib)?sensorservice: Android.mk -> Android.bp"
Steven Moreland [Fri, 21 Apr 2017 01:57:19 +0000 (01:57 +0000)]
Revert "(lib)?sensorservice: Android.mk -> Android.bp"

This reverts commit f1b07d51ed6a11a0446115934fb75c22a1badb87.

Bad internal merge and other errors.

Change-Id: If9b812916223773ee98354d0805626cf759355fd
Merged-In: Ib3a3f249c278be582de04a583e18de3c0e502d5e

7 years agoMerge "(lib)?sensorservice: Android.mk -> Android.bp"
Steven Moreland [Fri, 21 Apr 2017 00:06:55 +0000 (00:06 +0000)]
Merge "(lib)?sensorservice: Android.mk -> Android.bp"
am: 9a33cae051

Change-Id: I453692e9058d54edfb8777371814f504d3886ba0

7 years agoMerge "(lib)?sensorservice: Android.mk -> Android.bp"
Steven Moreland [Fri, 21 Apr 2017 00:03:10 +0000 (00:03 +0000)]
Merge "(lib)?sensorservice: Android.mk -> Android.bp"

7 years ago(lib)?sensorservice: Android.mk -> Android.bp
Steven Moreland [Thu, 20 Apr 2017 22:56:38 +0000 (15:56 -0700)]
(lib)?sensorservice: Android.mk -> Android.bp

Test: links
Change-Id: I2ddab32c12bf07044416f983b5cf0ae19cc12ba0

7 years agoMerge "Convert inputflinger to Android.bp"
Colin Cross [Thu, 20 Apr 2017 18:04:30 +0000 (18:04 +0000)]
Merge "Convert inputflinger to Android.bp"
am: b0a4e9bbef

Change-Id: I28a5927c81eea714b0f2a29abae102e74b7771c4

7 years agoMerge "Convert inputflinger to Android.bp"
Treehugger Robot [Thu, 20 Apr 2017 17:59:45 +0000 (17:59 +0000)]
Merge "Convert inputflinger to Android.bp"

7 years agoConvert inputflinger to Android.bp
Colin Cross [Wed, 19 Apr 2017 23:56:46 +0000 (16:56 -0700)]
Convert inputflinger to Android.bp

See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Iebdc3f4d2d560b0fdf5447dde0ac06df64826bb5
Merged-In: Iebdc3f4d2d560b0fdf5447dde0ac06df64826bb5
(cherry picked from commit 45a1b9c95de619785b68ce51b1a3e271abc4ffd9)

7 years agoMerge "libbinder: vendor_available"
Steven Moreland [Thu, 20 Apr 2017 01:46:33 +0000 (01:46 +0000)]
Merge "libbinder: vendor_available"
am: e1b504457d

Change-Id: I1113c2bd11060d526c46d7f8f9d69e4526dd4ce4

7 years agoMerge "libbinder: vendor_available"
Treehugger Robot [Thu, 20 Apr 2017 01:39:21 +0000 (01:39 +0000)]
Merge "libbinder: vendor_available"

7 years agoMerge "Fix lshal not to squash HAL entries incorrectly."
Yifan Hong [Thu, 20 Apr 2017 00:59:25 +0000 (00:59 +0000)]
Merge "Fix lshal not to squash HAL entries incorrectly."
am: 665173c59d

Change-Id: I2e64c731627f971ee28f8e2c95d98a5e5717d841

7 years agoMerge "Fix lshal not to squash HAL entries incorrectly."
Yifan Hong [Thu, 20 Apr 2017 00:51:48 +0000 (00:51 +0000)]
Merge "Fix lshal not to squash HAL entries incorrectly."

7 years agoMerge "Fix passing --classpath-dir to dex2oat for split apks."
Jeff Hao [Wed, 19 Apr 2017 22:25:39 +0000 (22:25 +0000)]
Merge "Fix passing --classpath-dir to dex2oat for split apks."
am: 24ff69485e

Change-Id: If467da70c5637b9025435ebf7e6900349564f815

7 years agoMerge "Fix passing --classpath-dir to dex2oat for split apks."
Treehugger Robot [Wed, 19 Apr 2017 22:22:32 +0000 (22:22 +0000)]
Merge "Fix passing --classpath-dir to dex2oat for split apks."

7 years agolibbinder: vendor_available
Steven Moreland [Fri, 14 Apr 2017 04:19:48 +0000 (21:19 -0700)]
libbinder: vendor_available

By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 36079834
Test: m -j libbinder
Test: attempt to compile with BOARD_VNDK_VERSION := current
(cherry picked from commit 3aa761697b93dab3e4b1acf90d14502a79a49219)
Merged-In: Iec94a66adbc852f7f23352307cf36f49a79ee3a6
Change-Id: Iec94a66adbc852f7f23352307cf36f49a79ee3a6

7 years agoFix passing --classpath-dir to dex2oat for split apks.
Jeff Hao [Wed, 19 Apr 2017 20:50:15 +0000 (13:50 -0700)]
Fix passing --classpath-dir to dex2oat for split apks.

Merged wrong version of CL in by mistake. CL should have been
cherry-picked from cc5c4e32637601432bc6359fb7ff34e4cadb6502.

Bug: 34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests

Change-Id: Ibebcdce1c9ab0de3254727c8dfc3d0de18932f1c

7 years agoMerge "Run dex2oat from the staged apk directory."
Jeff Hao [Wed, 19 Apr 2017 17:21:47 +0000 (17:21 +0000)]
Merge "Run dex2oat from the staged apk directory."
am: 296d91edc8

Change-Id: Ib3ddad33a505a74e6004123d08e64a177c7045aa

7 years agoMerge "Run dex2oat from the staged apk directory."
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Run dex2oat from the staged apk directory."

7 years agoFix lshal not to squash HAL entries incorrectly.
Yifan Hong [Tue, 18 Apr 2017 21:19:40 +0000 (14:19 -0700)]
Fix lshal not to squash HAL entries incorrectly.

Bug: 37311367
Test: lshal --init-vintf
Change-Id: I693b53f5f342c7600e4031d020792fd347e3ae83

7 years agoRun dex2oat from the staged apk directory.
Jeff Hao [Thu, 6 Apr 2017 00:11:39 +0000 (17:11 -0700)]
Run dex2oat from the staged apk directory.

The frameworks/base change makes the PackageManager pass relative paths
of previous code paths as shared library paths. This change passes the
base directory for these relative paths to dex2oat using the new switch
--base-dir.

Part of a multi-project change.

Bug: 34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests

Merged-In: Ic20aa0b6a80104d0759ac84df3eb89570604e53f
(cherry-picked from commit cc5c4e32637601432bc6359fb7ff34e4cadb6502)

Change-Id: I29e6e7365654cc1a538272591356e2253d6ec0e4

7 years agoinstalld create_data_user_ce_path uses dir instead of symlink
cjbao [Tue, 11 Apr 2017 16:12:24 +0000 (00:12 +0800)]
installd create_data_user_ce_path uses dir instead of symlink

Select whichever is real dir instead of symbolic link from either
/data/data or /data/user/0. This is to minimize path walking overhead
in kernel.

Test: Manual test
Change-Id: Ie06640624746ff40a2b5b47ead50a7f10eb2db3e
Signed-off-by: cjbao <cathy.bao@intel.com>
7 years agoMerge "Fix error BufferQueue attaching flow."
Jammy Yu [Mon, 17 Apr 2017 20:35:15 +0000 (20:35 +0000)]
Merge "Fix error BufferQueue attaching flow."
am: 0ffe45c2ed

Change-Id: I5594453f6689d2b947109f51db4b9cab14b5a59a

7 years agoMerge "Fix error BufferQueue attaching flow."
Treehugger Robot [Mon, 17 Apr 2017 20:26:40 +0000 (20:26 +0000)]
Merge "Fix error BufferQueue attaching flow."

7 years agoMerge "Update to allow multiple HALs in a manifest."
Yifan Hong [Mon, 17 Apr 2017 18:27:10 +0000 (18:27 +0000)]
Merge "Update to allow multiple HALs in a manifest."
am: dd315948db

Change-Id: I5eac918046ef39dce26276cf61bcc3db76912572