Andy McFadden
ad700d8545
am e950661f
: (-s ours) DO NOT MERGE - Disable DispSync resync when not needed
...
* commit 'e950661f4559c9f84f67aed9036aa1ec9a100de3':
DO NOT MERGE - Disable DispSync resync when not needed
2014-06-12 19:57:12 +00:00
Prashant Malani
7227b96a73
Merge "surfaceflinger: Replace blank/unblank with setPowerMode"
2014-06-12 03:30:50 +00:00
Mark Salyzyn
c46422ed2b
am 20914f0a
: am a4e345e1
: Merge "sensorservice: 64-bit compile issues"
...
* commit '20914f0ad3691d977f61f1d4b92b49535e8f6f33':
sensorservice: 64-bit compile issues
2014-06-12 16:13:39 +00:00
Mark Salyzyn
20914f0ad3
am a4e345e1
: Merge "sensorservice: 64-bit compile issues"
...
* commit 'a4e345e169fd9101011e358abdfb9308bc065bdb':
sensorservice: 64-bit compile issues
2014-06-12 16:09:59 +00:00
Mark Salyzyn
eeb0f39f76
Merge "inputflinger: 64-bit compile issues"
2014-06-12 05:34:42 +00:00
Mark Salyzyn
a4e345e169
Merge "sensorservice: 64-bit compile issues"
2014-06-12 03:32:07 +00:00
Andy McFadden
e950661f45
DO NOT MERGE - Disable DispSync resync when not needed
...
If app and SF events aren't using phase offsets, we don't need
to maintain the DispSync model. We just turn hardware VSYNC on
whenever something wants to draw. This avoids some edge cases
where we were doing too much resync work.
Also, updated the systrace output. The "VsyncOn" line was a
combination of SF and app event threads, and would occasionally
be very weird. Removed VsyncOn, renamed VSYNC to VSYNC-app,
and added VSYNC-sf.
Also, added more details to the --dispsync dumpsys output.
Also, renamed global constants to not look like local variables.
Bug 15516453
(cherry-pick from master I0da10b72f0d9a7b7eb5202d87cc18967f698adbd)
Change-Id: I7d6fa96f1df48f0b3abcc4b39c5dcfee88199eb6
2014-06-11 21:44:40 +00:00
Wengang Wu
1210f2ab82
am 20071e50
: am e3d37a7b
: Enable support RGBX_8888 for omap3
...
* commit '20071e5028adb6d7ced81843d33e4d0baa0768ed':
Enable support RGBX_8888 for omap3
2014-06-11 21:38:55 +00:00
Calin Juravle
14be6fa62e
am 17e1d2ca
: am 7281ca65
: Merge "Pass --top-k-profile-threshold to dex2oat if available."
...
* commit '17e1d2ca97a711ab539044912bb985a10ccbc9fd':
Pass --top-k-profile-threshold to dex2oat if available.
2014-06-11 21:37:57 +00:00
Wengang Wu
20071e5028
am e3d37a7b
: Enable support RGBX_8888 for omap3
...
* commit 'e3d37a7b55f86f5d005dd67f828dcf51fe60c0f6':
Enable support RGBX_8888 for omap3
2014-06-11 18:17:19 +00:00
Wengang Wu
e3d37a7b55
Enable support RGBX_8888 for omap3
...
Bug: 14995811
Change-Id: Iaeb5a5ad0e3bcf215613f24f2570ae0d8267c016
2014-06-11 11:13:40 -07:00
Calin Juravle
17e1d2ca97
am 7281ca65
: Merge "Pass --top-k-profile-threshold to dex2oat if available."
...
* commit '7281ca65d00171b846497abca357a005a401e16b':
Pass --top-k-profile-threshold to dex2oat if available.
2014-06-11 08:53:49 +00:00
Andy McFadden
ca1b0b455e
Merge "Replace "lower power mode" experiment"
2014-06-10 22:06:31 +00:00
Andy McFadden
645b1f7ffb
Replace "lower power mode" experiment
...
This replaces the previous low-power mode experiment, which
discarded refresh events, with a new experiment that alters
the refresh period.
(see also I2849e5ea335c0d2509fea1c315392bce7f20451d )
The feature is enabled by specifying a nonzero value for the
"refresh skip count", which indicates the number of periods
to skip. For example, the command:
adb shell service call SurfaceFlinger 1016 i32 1
sets a skip count of '1', yielding a 30Hz refresh rate on a device
with a 60Hz display. Changing the last value to '2' would set the
refresh to 20Hz. '0' returns to the default behavior.
Bug 15523257
Change-Id: I00039c22a55750e74035644c63800e4bee1c774a
2014-06-11 10:19:08 -07:00
Andy McFadden
6115f8f5c0
Merge "Disable DispSync resync when not needed"
2014-06-10 22:12:51 +00:00
Ying Wang
722e75179b
am 0cea0a22
: am d284c4cd
: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."
...
* commit '0cea0a22109ace7e3dfbb4913a1469f3f8480f6e':
Don't set LOCAL_MODULE_PATH for native tests.
2014-06-11 17:58:44 +00:00
Mark Salyzyn
55fc54970b
am 72676e7d
: am 0e1313cd
: Merge "libgui: 64-bit compile issues"
...
* commit '72676e7d0db89d477495245aa15f1a128b5c35bc':
libgui: 64-bit compile issues
2014-06-11 17:44:52 +00:00
Mark Salyzyn
db45861ff4
sensorservice: 64-bit compile issues
...
Change-Id: Ied7b779f39e71d041791729f7355b052b63903c5
2014-06-10 14:50:02 -07:00
Calin Juravle
7281ca65d0
Merge "Pass --top-k-profile-threshold to dex2oat if available."
2014-06-10 21:26:11 +00:00
Michael Wright
b37c8c5453
Merge "Fixup more potential issues / warnings in string formats"
2014-06-10 20:16:08 +00:00
Andy McFadden
5167ec68fe
Disable DispSync resync when not needed
...
If app and SF events aren't using phase offsets, we don't need
to maintain the DispSync model. We just turn hardware VSYNC on
whenever something wants to draw. This avoids some edge cases
where we were doing too much resync work.
Also, updated the systrace output. The "VsyncOn" line was a
combination of SF and app event threads, and would occasionally
be very weird. Removed VsyncOn, renamed VSYNC to VSYNC-app,
and added VSYNC-sf.
Also, added more details to the --dispsync dumpsys output.
Also, renamed global constants to not look like local variables.
Bug 15516453
Change-Id: I0da10b72f0d9a7b7eb5202d87cc18967f698adbd
2014-06-10 13:12:19 -07:00
Mark Salyzyn
5aa26b2745
inputflinger: 64-bit compile issues
...
Change-Id: I9861f96a8234d5f57b664baead7a465771b63bd5
2014-06-10 13:11:58 -07:00
Michael Wright
63ff3a84ae
Fixup more potential issues / warnings in string formats
...
Change-Id: I323e44f950b2e758dc9ff4510b2e13ca870eb849
2014-06-10 13:03:17 -07:00
Calin Juravle
4fdff46166
Pass --top-k-profile-threshold to dex2oat if available.
...
Also, don't pass --profile-file if the file is empty.
Bug: 12877748
Change-Id: I587d198e64da709930e2cea50a87fed1525281e5
2014-06-10 14:33:15 +01:00
Michael Wright
e3b129d4ff
Merge "Bump axis limit"
2014-06-10 03:12:27 +00:00
Michael Wright
25be048729
Merge "Fix warning in logging string interpolation"
2014-06-10 03:12:19 +00:00
Michael Wright
d0a4a6234f
Fix warning in logging string interpolation
...
Change-Id: I86623083f68664d31ea277958837a4c2985037b4
2014-06-09 19:03:32 -07:00
Michael Wright
8f6710fdeb
Bump axis limit
...
Change-Id: I53d18646be2b884c5022f10c7c4ea8f6cda176c8
2014-06-09 18:56:43 -07:00
Ying Wang
0cea0a2210
am d284c4cd
: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."
...
* commit 'd284c4cd78e0d42a8ee7af6e8f61c5e66cae6318':
Don't set LOCAL_MODULE_PATH for native tests.
2014-06-09 23:00:04 +00:00
Ying Wang
d284c4cd78
Merge "Don't set LOCAL_MODULE_PATH for native tests."
2014-06-09 22:52:48 +00:00
Mark Salyzyn
8f515ce1c5
libgui: 64 bit compile issues (part deux)
...
- nsecs_t printed with PRId64
- int64_t/uint64_t print issues
- some size_t printing issues.
- missing argument to BQ_LOGV
Change-Id: I493f2b578e801dc38c44f8c536faa45266720402
2014-06-09 15:42:26 -07:00
Ying Wang
8baf4fcabd
Don't set LOCAL_MODULE_PATH for native tests.
...
The build system will set it up automatically.
Change-Id: Id5ed9eff88dab2349c3b357ee09f7da9479d7d2d
2014-06-09 15:23:46 -07:00
Mark Salyzyn
72676e7d0d
am 0e1313cd
: Merge "libgui: 64-bit compile issues"
...
* commit '0e1313cdb1d5d21e4d6123f77b4238f1c8c2d564':
libgui: 64-bit compile issues
2014-06-09 21:46:25 +00:00
Mark Salyzyn
0e1313cdb1
Merge "libgui: 64-bit compile issues"
2014-06-09 21:38:00 +00:00
Mark Salyzyn
911004506d
libgui: 64-bit compile issues
...
Change-Id: I29961c1567b8431518a7d032ea43385e23b7bb37
2014-06-09 14:27:45 -07:00
Adam Connors
cb29225a5e
am 25e81681
: API Review: Update managed profiles feature flag.
...
* commit '25e816818c1aa76c60533af9710c7f9166253e51':
API Review: Update managed profiles feature flag.
2014-06-09 17:44:52 +00:00
Robin Lee
8400b2c6dd
am 04eb4227
: am c4193f1f
: Merge "Migrate keychain directories to /data/misc/user/0"
...
* commit '04eb4227b0ee880141d6ffbf170e79b78affea15':
Migrate keychain directories to /data/misc/user/0
2014-06-09 14:46:58 +00:00
Robin Lee
04eb4227b0
am c4193f1f
: Merge "Migrate keychain directories to /data/misc/user/0"
...
* commit 'c4193f1fef52314b451f55cce48ce44f94b875b6':
Migrate keychain directories to /data/misc/user/0
2014-06-09 12:51:06 +00:00
Robin Lee
c4193f1fef
Merge "Migrate keychain directories to /data/misc/user/0"
2014-06-09 12:44:34 +00:00
Calin Juravle
95081df451
am fb617aa8
: am 06642342
: Merge "Don\'t always add profile-file option to dex2oat"
...
* commit 'fb617aa82ad2b6671aa1bc37afa115418cd9091c':
Don't always add profile-file option to dex2oat
2014-06-09 10:05:06 +00:00
Calin Juravle
fb617aa82a
am 06642342
: Merge "Don\'t always add profile-file option to dex2oat"
...
* commit '066423423f04bf1c5972b1d611e01e2e17df3727':
Don't always add profile-file option to dex2oat
2014-06-09 09:56:31 +00:00
Adam Connors
25e816818c
API Review: Update managed profiles feature flag.
...
Feature flag renamed to FEATURE_MANAGED_PROFILES
Bug: 15025371
Change-Id: I999fd9484398da3266c7655d83e4266c2b76cf3a
(cherry picked from commit 17e4e6b62b
)
2014-06-09 09:17:50 +00:00
Calin Juravle
066423423f
Merge "Don't always add profile-file option to dex2oat"
2014-06-09 09:15:09 +00:00
Jesse Hall
0d7271527f
am 17cbadf0
: am 6fa169fa
: Merge "Add aarch64 EGL/GLES trampolines"
...
* commit '17cbadf0f598b0d02179262ad5b6b270850ccb94':
Add aarch64 EGL/GLES trampolines
2014-06-07 00:19:53 +00:00
Jesse Hall
17cbadf0f5
am 6fa169fa
: Merge "Add aarch64 EGL/GLES trampolines"
...
* commit '6fa169faa955ecc47872557a5d4fd89a95190d5e':
Add aarch64 EGL/GLES trampolines
2014-06-07 00:16:33 +00:00
Jesse Hall
6fa169faa9
Merge "Add aarch64 EGL/GLES trampolines"
2014-06-06 23:49:41 +00:00
Jesse Hall
30a41aa1cc
Add aarch64 EGL/GLES trampolines
...
Change-Id: Ia90e18d26ff3bdb7e643aff8d77cbaddd2ac2a03
2014-06-06 16:31:53 -07:00
Calin Juravle
57c69c3964
Don't always add profile-file option to dex2oat
...
Add profile-file option to dex2oat only if the profiler is active and
the file exists.
Bug: 12877748
Bug: 15275634
Change-Id: Icef76514c912c88311ed108f2be7a6329131f741
2014-06-06 15:13:06 +01:00
Narayan Kamath
1bc1761d36
am 0c96c35f
: am e86420e3
: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."
...
* commit '0c96c35fe47cd84f7423f925917b5dde97155e34':
Fix flattening/unflattening of android::Sensor.
2014-06-06 10:36:08 +00:00
Narayan Kamath
0c96c35fe4
am e86420e3
: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."
...
* commit 'e86420e399993e0f49e5d7733b5fc87eb9fe179b':
Fix flattening/unflattening of android::Sensor.
2014-06-06 10:33:18 +00:00