OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "Add lshal --neat option" am: 3a6828d50b
Yifan Hong [Mon, 15 May 2017 20:14:39 +0000 (20:14 +0000)]
Merge "Add lshal --neat option" am: 3a6828d50b
am: 702ca32b5a

Change-Id: Ide589b0a4487a0a50e43fcda179bba7ad5600fc4

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 agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:49:35 +0000 (18:49 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457 am: fa765bacf8 am: 146f77fc3c am: 4a1e3105bf am: 380e1aa3e9
am: 0cb4516f42

Change-Id: Icb6b6a7f0887ef003897cb12c044d8826f07791a

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:46:34 +0000 (18:46 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457 am: fa765bacf8 am: 146f77fc3c am: 4a1e3105bf
am: 380e1aa3e9

Change-Id: I7eed6fe471d204a4b8ff1b82b2b7739925294b6e

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:43:32 +0000 (18:43 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457 am: fa765bacf8 am: 146f77fc3c
am: 4a1e3105bf

Change-Id: I74d66fa6fa15003235ba8e07db5327d54e4fa3f7

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:40:03 +0000 (18:40 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457 am: fa765bacf8
am: 146f77fc3c

Change-Id: Id3334d9c0eefe429cf28fea41365024f313b807b

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:37:03 +0000 (18:37 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8 am: f571b41457
am: fa765bacf8

Change-Id: I9365e5aec00280a9466908a8f3a9e525757283ed

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:34:02 +0000 (18:34 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd am: 1102b311c8
am: f571b41457

Change-Id: I739439543fd954b15a6da5909a47873e9a6dd029

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:31:01 +0000 (18:31 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51 am: f4a1a4e7fd
am: 1102b311c8

Change-Id: I2fc05fc6415e981f3fe13770697c810309312729

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:28:01 +0000 (18:28 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209 am: 2c86168b51
am: f4a1a4e7fd

Change-Id: I7ecadb481757312b22c4b47a6f8040c0e7a18d72

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:25:00 +0000 (18:25 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209
am: 2c86168b51

Change-Id: I82f10a43940d6038946f25870c8394900d5219fb

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:21:59 +0000 (18:21 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17
am: cc184e4209

Change-Id: I20d492d5b3728ccf2ef68695d54b79f1a3c8371a

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:19:31 +0000 (18:19 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4
am: e7c7be2c17

Change-Id: I79e844eff3739ea737d20f381da6fa4da9852015

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:16:30 +0000 (18:16 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours
am: bec844f6d4

Change-Id: I48d94557a005c4b0b46bf339ca685e9d1d231d97

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2
Dan Stoza [Mon, 15 May 2017 18:13:30 +0000 (18:13 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2
am: 057ae95ab2  -s ours

Change-Id: I2c6441b19650f31c7bbab9ce22191ae162ba9e58

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e
Dan Stoza [Mon, 15 May 2017 18:02:29 +0000 (18:02 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e
am: 7cb9cd3df2

Change-Id: Iff706258762cac4bfb7d97af7d365412d9ee661d

7 years agolibgui: Check slot received from IGBP in Surface
Dan Stoza [Mon, 15 May 2017 17:59:58 +0000 (17:59 +0000)]
libgui: Check slot received from IGBP in Surface
am: ac93b3a30e

Change-Id: I6ab9bc7f577634c0bf23359b5eb60e6dd07e4854

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" am: 28765c6184
Yifan Hong [Sat, 13 May 2017 01:36:32 +0000 (01:36 +0000)]
Merge "Actually remove dead processes from lshal" am: 28765c6184
am: d52b085d44

Change-Id: Ia86f84007a37f5ae158d85bd3fc0f947e5d84c37

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 agoFixes vsync behavior in power mode transitions. am: 4de4ee3cb3
Matthew Bouyack [Sat, 13 May 2017 00:21:01 +0000 (00:21 +0000)]
Fixes vsync behavior in power mode transitions. am: 4de4ee3cb3
am: c6e23d9959

Change-Id: I0fba407c14811a81b1ad2926fca5130f8f65638d

7 years agoFixes vsync behavior in power mode transitions.
Matthew Bouyack [Sat, 13 May 2017 00:18:59 +0000 (00:18 +0000)]
Fixes vsync behavior in power mode transitions.
am: 4de4ee3cb3

Change-Id: I78e718bc1f9098e0da58257587062c11a8bd7e3a

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' am: d4f5bb4c17
Yifan Hong [Fri, 12 May 2017 22:46:09 +0000 (22:46 +0000)]
Merge changes from topic 'lshal_debug' am: d4f5bb4c17
am: a7f366d411

Change-Id: Ie7f3af47145cfd581a8484a8c397518c01cdda40

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 agoFixes vsync behavior in power mode transitions.
Matthew Bouyack [Fri, 12 May 2017 19:49:32 +0000 (12:49 -0700)]
Fixes vsync behavior in power mode transitions.

Calling EventThread::onScreenAcquired enables hardware vsync and
calling EventThread::onScreenReleased disables hardware vsync.

The power modes 'NORMAL' and 'DOZE' should have hardware vsync
enabled while power modes 'OFF' and 'DOZE_SUSPEND' should have
hardware vsync disabled.

This change correctly handles the transitions from 'OFF' to
'DOZE_SUSPEND' and from either 'OFF' or 'DOZE_SUSPEND' to
'NORMAL'. Previously these cases were handled incorrectly.

Note that redundant calls to onScreenAcquired or onScreenReleased
are safe.

Fixes bug: 38232221

Change-Id: I7b00f97a67b157366364b3d26fe94533da07c263

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." am: 4fa2b96d21
Nicolas Geoffray [Thu, 11 May 2017 09:59:07 +0000 (09:59 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am: 4fa2b96d21
am: d1058fb90c

Change-Id: Ic9dd064d8eb66f1dd99302c0cfed83a5e4ca2233

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" am: 8d2f788a05
Yifan Hong [Thu, 11 May 2017 00:34:24 +0000 (00:34 +0000)]
Merge "lshal: remove "// static" comments" am: 8d2f788a05
am: 7d6944d40a

Change-Id: I36367aa4f5bd756d31855186066cd2e930e32414

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" am: c9810011e9
Yi Kong [Thu, 11 May 2017 00:04:39 +0000 (00:04 +0000)]
Merge "Add explicit default copy constructor" am: c9810011e9
am: 3bf99597b4

Change-Id: I1866cb30496b1ad3d49171e1b2b44dcfe44575a3

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" am: 612c12b293
Alex Klyubin [Wed, 10 May 2017 19:43:11 +0000 (19:43 +0000)]
Merge "Switch from libcrypto_static to libcrypto target" am: 612c12b293
am: 4c246fe5df

Change-Id: I6f49fd3560dc03de06cba7e06e039e98e55d697e

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." am: fbb09a7192
Nicolas Geoffray [Wed, 10 May 2017 09:21:15 +0000 (09:21 +0000)]
Merge "Always unlink the out_vdex_file." am: fbb09a7192
am: e5a1bc620b

Change-Id: Ib4ecf1c85ec826edee1de3cd11e565d0ecaf7114

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." am: 4a9b7174ca
Yifan Hong [Sat, 6 May 2017 00:28:25 +0000 (00:28 +0000)]
Merge "Fix lshal --init-vintf may have empty <instance> tags." am: 4a9b7174ca
am: 0a1b8a1128

Change-Id: I007fb20df553c2cec9d9e88a9ae79a4f523acfc6

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." am: 7a45fd929a
Nicolas Geoffray [Fri, 5 May 2017 08:54:06 +0000 (08:54 +0000)]
Merge "Handle safe mode in PackageManager." am: 7a45fd929a
am: de18423ff8

Change-Id: Ia6806efa144248a36114b6e65329d60ab960c698

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" am: 44c9a3766f
Yi Kong [Thu, 4 May 2017 22:23:10 +0000 (22:23 +0000)]
Merge "Add 'override' specifier to overridden destructor methods" am: 44c9a3766f
am: dcb3ee039d

Change-Id: I4041248d20ad6a811761058f9bf5faeab3f8d6bd

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" am: 40f0088f45
Yi Kong [Thu, 4 May 2017 00:23:41 +0000 (00:23 +0000)]
Merge "Add const specifier to SortLayersByZ comparator" am: 40f0088f45
am: f2995e72f4

Change-Id: I0eeb4aa44ae0ee2072da9b6b5cad173f7009d9b0

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" am: f8af02fffa
Tom Cherry [Wed, 3 May 2017 23:51:43 +0000 (23:51 +0000)]
Merge "installd create_data_user_ce_path uses dir instead of symlink" am: f8af02fffa
am: 21ea7683bc

Change-Id: Ie8b0042f30066c59e22c2da99abc2adff400e79a

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" am: 1a1d34791e
Steven Moreland [Wed, 3 May 2017 16:23:36 +0000 (16:23 +0000)]
Merge "Lshal: note debug in help" am: 1a1d34791e
am: 8ddafb99ba

Change-Id: I5c5ea05746b910c0078cd5b15462a8aba88d731e

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" am: 13996341b8
Colin Cross [Wed, 3 May 2017 02:09:13 +0000 (02:09 +0000)]
Merge "Remove warnings in Rect.h" am: 13996341b8
am: 671461ed45

Change-Id: I435ef0c8c74fee7e843d4b8d4b013772c157187d

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."" am: eebbf2e371
Nicolas Geoffray [Tue, 2 May 2017 13:29:50 +0000 (13:29 +0000)]
Merge "Revert "Disable input-vdex when doing speed-profile."" am: eebbf2e371
am: b8d5b100d1

Change-Id: Ia1f63e5b40cc049ead4cd47256874d4e4097690b

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" am: c0a1cdc42b
Steven Moreland [Mon, 1 May 2017 23:33:31 +0000 (23:33 +0000)]
Merge "Remove redundant dependencies" am: c0a1cdc42b
am: 03a732f115

Change-Id: I54548eea7810d33a8213fe68e050e65c6d10c824

7 years agolibgui: Check slot received from IGBP in Surface
Dan Stoza [Mon, 1 May 2017 23:31:53 +0000 (16:31 -0700)]
libgui: Check slot received from IGBP in Surface

Checks that the slot number received from mGraphicBufferProducer in
Surface::dequeueBuffer is on the interval [0, NUM_BUFFER_SLOTS) to
protect against a malicious BnGraphicBufferProducer.

Bug: 36991414
Change-Id: I1a76fd1bcce1c558f1c0c30f03638278288ed4fa

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." am: f41404045a
Nicolas Geoffray [Thu, 27 Apr 2017 11:58:07 +0000 (11:58 +0000)]
Merge "Update installd to new compiler filters." am: f41404045a
am: d9cfce8e4d

Change-Id: I9ec817d7cd810eca9b9a41c388e05e7a2f86fe29

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." am: 237249bbe1
Dan Albert [Wed, 26 Apr 2017 18:50:42 +0000 (18:50 +0000)]
Merge "Add missing stdbool.h to sensor.h." am: 237249bbe1
am: 39565941e7

Change-Id: I6998be0bc0d3673045af44c008e621faaf884771

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"" am: c6a6fd0516
Steven Moreland [Fri, 21 Apr 2017 02:03:35 +0000 (02:03 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp"" am: c6a6fd0516
am: 4fe57dd57d

Change-Id: Ie46dfeb8c57c4edeedbf474a7f5cb414e3ab686e

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