OSDN Git Service
Calin Juravle [Fri, 3 Mar 2017 00:30:34 +0000 (00:30 +0000)]
Merge changes from topic 'secondary-dex' am:
ad79651822
am:
ba1d417eca
Change-Id: Ie579b31a131b475449fec93f0bf5527677022edd
Calin Juravle [Fri, 3 Mar 2017 00:30:20 +0000 (00:30 +0000)]
DEXOPT_FORCE may be passed for primary apk as well. am:
2ab108c5be
am:
b77cb8b653
Change-Id: I83f8e20747b6f001a7ec44a1f708d71811a81f51
Calin Juravle [Fri, 3 Mar 2017 00:30:07 +0000 (00:30 +0000)]
[Installd] Clean up logic for secondary dex oat files am:
c9eab382fa
am:
1061d48614
Change-Id: I3a694e80f33e6fced4a9e3c3643cca4e953dc93a
Calin Juravle [Fri, 3 Mar 2017 00:29:54 +0000 (00:29 +0000)]
Add installd logic for compiling secondary dex files am:
80a2125b85
am:
51b4f988c9
Change-Id: Ida2a90bfc65ae7892937cfe76df162f777496b3a
Calin Juravle [Fri, 3 Mar 2017 00:16:05 +0000 (00:16 +0000)]
Merge changes from topic 'secondary-dex'
am:
ad79651822
Change-Id: Idcdf7a84b25376aca209ded1cdbb5d1831578810
Calin Juravle [Fri, 3 Mar 2017 00:15:37 +0000 (00:15 +0000)]
DEXOPT_FORCE may be passed for primary apk as well.
am:
2ab108c5be
Change-Id: I684e155161c626f407f5bfab874108cf30f06a81
Calin Juravle [Fri, 3 Mar 2017 00:15:04 +0000 (00:15 +0000)]
[Installd] Clean up logic for secondary dex oat files
am:
c9eab382fa
Change-Id: Ib344fdf483df92e954321726b5d2c22abbe46c4a
Calin Juravle [Fri, 3 Mar 2017 00:14:34 +0000 (00:14 +0000)]
Add installd logic for compiling secondary dex files
am:
80a2125b85
Change-Id: I117e7dbaafed5b7183c53517dc27cc7dbc3540fc
Calin Juravle [Thu, 2 Mar 2017 23:54:22 +0000 (23:54 +0000)]
Merge changes from topic 'secondary-dex'
* changes:
Fix the ownership of compiler artifacts for secondary dex files
DEXOPT_FORCE may be passed for primary apk as well.
[Installd] Clean up logic for secondary dex oat files
Add installd logic for compiling secondary dex files
Calin Juravle [Tue, 31 Jan 2017 21:53:00 +0000 (13:53 -0800)]
DEXOPT_FORCE may be passed for primary apk as well.
Remove the check that DEXOPT_FORCE is not set for primary apks. PM will
set it when forcing compilation.
Bug:
32871170
Test: adb shell cmd package compile -f m speed pkgname
(cherry picked from commit
259702336f5826d2a205a2b038cb5a3263fb10e9)
Change-Id: Id34cd1ec929a1e196caf61651a18eb9c275b2590
Merged-In: I690608c48a2c486230ca7d2328ac5c6181427328
Calin Juravle [Wed, 15 Feb 2017 20:44:14 +0000 (12:44 -0800)]
Fix the ownership of compiler artifacts for secondary dex files
odex, vdex and art files should be owned by the app and not by system.
Test: verify odex and vdex owner:
adb shell cmd package compile -m speed --secondary-dex -f
com.google.android.gms
adb shell ls
/data/user/0/com.google.android.gms/app_chimera/m/
00000004/oat/arm64/
-al
-rw-r--r-- 1 u0_a17 u0_a17
5640832 2017-02-02 18:00
DynamiteModulesA_GmsCore_prodmnc_alldpi_release.odex
-rw-r--r-- 1 u0_a17 u0_a17
3016818 2017-02-15 12:42
DynamiteModulesA_GmsCore_prodmnc_alldpi_release.vdex
Bug:
35389574
Bug:
32871170
(cherry picked from commit
944d0def1a628bcbd76056683085efd2b999fe5b)
Change-Id: I1f0d09d04807b6284d42f0cf89956322a4214d5f
Merged-In: I0650265cedcc572d43bb1fc0d0758ae43ea890b2
Calin Juravle [Wed, 25 Jan 2017 09:17:17 +0000 (01:17 -0800)]
[Installd] Clean up logic for secondary dex oat files
Add a new method to installd, reconcileSecondaryOdex, which checks if
the given dex files still exist and if not, deletes the oat files that
were generated for it.
Test: devices bots
adb shell cmd package reconcile-secondary-dex
com.android.google.gms (after artificially/temporarily renaming some
dex files)
Bug:
32871170
(cherry picked from commit
bd9683607d391a29b1422a50f8972267e9bddc47)
Change-Id: Icb5c71b43a0e531d5be5d900149e707d0fe0a8de
Merged-In: I8465a7be9fd4e44e191ad40f7bd0f41c8b2d6f73
Calin Juravle [Tue, 17 Jan 2017 22:43:25 +0000 (14:43 -0800)]
Add installd logic for compiling secondary dex files
Secondary dex compilation takes almost the same path as primary apk
compilation.
The main difference is in the fact that for secondary dex files we
create the oat dir on the fly and execute dexoptanalyzer (the equivalent
of GetDexOptNeeded) to check if we really need to perform the
compilation.
Test: adb shell cmd package compile -f -m speed --secondary-dex com.google.android.gms
Bug:
32871170
(cherry picked from commit
42451c029b0e87990e5833daea2286bb12c21df5)
Change-Id: Ie5efe6eccc6b8c91ca7bd7c9e680aa7288d79ae8
Merged-In: I2c56d57322899968a338ccabffca575d66f8ee08
Elliott Hughes [Wed, 1 Mar 2017 23:40:07 +0000 (23:40 +0000)]
Merge "Move dumpstate to calling getprop." am:
16401044cb
am:
599dc3588a
Change-Id: Ic71ec9f048e3d47ed9be4b12903d5de172edae18
Elliott Hughes [Wed, 1 Mar 2017 23:35:38 +0000 (23:35 +0000)]
Merge "Move dumpstate to calling getprop."
am:
16401044cb
Change-Id: Ic55dcb53917eb7a885bf32532e36b08354a1f0f0
Elliott Hughes [Wed, 1 Mar 2017 23:27:07 +0000 (23:27 +0000)]
Merge "Move dumpstate to calling getprop."
Elliott Hughes [Tue, 28 Feb 2017 18:14:22 +0000 (10:14 -0800)]
Move dumpstate to calling getprop.
There's no obvious reason for reinventing the wheel like this (given that
dumpstate already spends most of its time calling out to other utilities),
and I keep having to come and fix this code.
(This time the problem being that there's no longer a limit on system
property names.)
Bug: http://b/
33926793
Test: ran dumpstate
Merged-In: I08281680df5aabfdb39228abf8c2aab089cc8b9e
Change-Id: I08281680df5aabfdb39228abf8c2aab089cc8b9e
Yifan Hong [Wed, 1 Mar 2017 06:12:34 +0000 (06:12 +0000)]
Merge "lshal --vintf to create a skeleton hal manifest." am:
73d5aef51e
am:
86c2f1cb0c
Change-Id: I37a103eed5dd0d383faec6fffe552d0020d69b41
Yifan Hong [Wed, 1 Mar 2017 06:10:04 +0000 (06:10 +0000)]
Merge "lshal --vintf to create a skeleton hal manifest."
am:
73d5aef51e
Change-Id: Ibd6873caa3d7c9bb9949b1d21666430a0cd7890a
Treehugger Robot [Wed, 1 Mar 2017 06:05:13 +0000 (06:05 +0000)]
Merge "lshal --vintf to create a skeleton hal manifest."
Yifan Hong [Wed, 1 Mar 2017 03:38:24 +0000 (19:38 -0800)]
lshal --vintf to create a skeleton hal manifest.
Run it as follows:
lshal --init-vintf=/data/a.xml
lshal --init-vintf > /data/a.xml
Test: lshal --init-vintf with and without path argument
Bug:
35852743
Change-Id: Ief9385fc2764a487d1a70644699e01133bdc8a8e
Steven Moreland [Wed, 1 Mar 2017 03:58:24 +0000 (03:58 +0000)]
Merge "lshal: separate timeout for hwservicemanager list" am:
180bb92608
am:
b67f970cfe
Change-Id: I6f240558cf45aa840abea2aed5af5ec559f7b209
Steven Moreland [Wed, 1 Mar 2017 03:55:56 +0000 (03:55 +0000)]
Merge "lshal: separate timeout for hwservicemanager list"
am:
180bb92608
Change-Id: I4ca38f7831505366201ca7a480dae358ecfc39ba
Treehugger Robot [Wed, 1 Mar 2017 03:50:11 +0000 (03:50 +0000)]
Merge "lshal: separate timeout for hwservicemanager list"
Steven Moreland [Wed, 1 Mar 2017 01:52:58 +0000 (17:52 -0800)]
lshal: separate timeout for hwservicemanager list
Bug:
35752836
Test: lshal works
Change-Id: I201da49e375d2d5e9ea67dfdf34ef2d5a8b537b0
Martijn Coenen [Tue, 28 Feb 2017 09:14:19 +0000 (09:14 +0000)]
Merge "Truncate trace output files." am:
09ab378326
am:
d62093dae4
Change-Id: I5d4cf03c1ecc81851a71d23f13adb02838d14bdf
Martijn Coenen [Tue, 28 Feb 2017 09:11:48 +0000 (09:11 +0000)]
Merge "Truncate trace output files."
am:
09ab378326
Change-Id: Iec36d0074c6e5fd90c3f9b39d07feef89ddb4b31
Martijn Coenen [Tue, 28 Feb 2017 09:08:33 +0000 (09:08 +0000)]
Merge "Truncate trace output files."
Jesse Hall [Sun, 26 Feb 2017 06:01:53 +0000 (06:01 +0000)]
Merge changes I6437dc95,I77261381 am:
d9f506fd47
am:
1a04c987e1
Change-Id: Ie2b1a07adc7dda6a1bbdd9fda09d9956a02ba0d0
Jesse Hall [Sun, 26 Feb 2017 05:58:55 +0000 (05:58 +0000)]
Merge changes I6437dc95,I77261381
am:
d9f506fd47
Change-Id: Ib3af51d0e71015bbc60f39bf209517b749bd80c0
Jesse Hall [Sun, 26 Feb 2017 05:54:04 +0000 (05:54 +0000)]
Merge changes I6437dc95,I77261381
* changes:
vulkan: update Vulkan headers to 1.0.38
vulkan: Update Vulkan headers to 1.0.22
Jesse Hall [Fri, 24 Feb 2017 23:13:45 +0000 (15:13 -0800)]
vulkan: update Vulkan headers to 1.0.38
Test: make ; mmm frameworks/native/vulkan
Change-Id: I6437dc951bd694cb848f75d0de7eb7dbe8a4d1fe
Jesse Hall [Tue, 26 Jul 2016 22:20:40 +0000 (15:20 -0700)]
vulkan: Update Vulkan headers to 1.0.22
Meaningful changes to platform code:
* VKAPI_ATTR is now defined properly when building for 32-bit ARMv8a.
* The pData parameter to vkCmdUpdateBuffer changed from uint32_t* to
void*. Alignment is still required to be four bytes (by spec), and
the size parameter was always supposed to be bytes, not words.
Bug:
29460769
Test: make ; mmm frameworks/native/vulkan
Change-Id: I77261381e5702a3b2bc1d1ea4c0606151547be47
(cherry picked from commit
56d386a7a46c8ac36df8820c3ccf3da048ef1970)
Yifan Hong [Wed, 22 Feb 2017 18:41:44 +0000 (18:41 +0000)]
Merge "lshal: Fix timeout causes unexpected exits." am:
057e74631b
am:
fdf61aa557
Change-Id: Ie3f025b610fd8b523b4f03c2c9b5d62b7966f309
Yifan Hong [Wed, 22 Feb 2017 18:40:04 +0000 (18:40 +0000)]
Merge "lshal: Fix timeout causes unexpected exits."
am:
057e74631b
Change-Id: Iadfbc11f8bbfc45759f2214d0811922cbb173758
Yifan Hong [Wed, 22 Feb 2017 18:28:23 +0000 (18:28 +0000)]
Merge "lshal: Fix timeout causes unexpected exits."
Martijn Coenen [Wed, 22 Feb 2017 08:25:31 +0000 (09:25 +0100)]
Truncate trace output files.
To avoid creating trace files with garbage at the end.
Bug:
35588070
Test: atrace runs
Change-Id: I26ef4c652ca2e2dd8ff9d11d4f380b44791cb960
Yifan Hong [Tue, 21 Feb 2017 22:59:00 +0000 (14:59 -0800)]
lshal: Fix timeout causes unexpected exits.
with thread::detach the background thread keeps running even after
the thread object is destroyed; the background thread will access
caller's stack memory, causing segfault. Change it to a thread join
to avoid the issue. To avoid waiting too long on the child thread,
send a SIGINT if timeout (child thread's signal handler will then
call pthread_exit() to terminate the thread).
Since we are using pthread_* functions, change usage of std::thread
to pthread_t for consistency.
Test: lshal
Test: run lshal with IPC_CALL_TIMEOUT set to zero will no longer
cause SIGSEGV and SIGABRT (test 10 times)
Bug:
35623669
Change-Id: I4eef8ffd8ff399793648e861ca4c1a2bdcc7ec50
Isaac Chen [Tue, 21 Feb 2017 18:03:09 +0000 (18:03 +0000)]
Merge "Removed build time variable ENABLE_CPUSETS." am:
52a60e08fb
am:
33f4b64f23
Change-Id: Ia6f3940b52c28741a43be171c930d0cdd77fb454
Isaac Chen [Tue, 21 Feb 2017 17:52:35 +0000 (17:52 +0000)]
Merge "Removed build time variable ENABLE_CPUSETS."
am:
52a60e08fb
Change-Id: Ic5d351f18a0c839212987c5fcbb803a7c07ac5cb
Isaac Chen [Tue, 21 Feb 2017 02:05:22 +0000 (02:05 +0000)]
Merge "Removed build time variable ENABLE_CPUSETS."
Isaac Chen [Thu, 16 Feb 2017 03:51:51 +0000 (11:51 +0800)]
Removed build time variable ENABLE_CPUSETS.
Use runtime check, cpuset_enabled(), instead of build time varianble
usually set in BoardConfog.mk.
Bug:
34726944
Test: Tested on Sailfish
without cpuset mounted
with cpuset mounted, but without schedtune
with cpuset mounted and with schedtune
Change-Id: I00153628db62abfbaa0ba75d571ba1bda0611ff3
Yifan Hong [Sat, 18 Feb 2017 01:07:20 +0000 (01:07 +0000)]
Merge "Fix lshal cannot be run without root" am:
6481ebfbc3
am:
8d6362fc44
Change-Id: Id188e2657e393b0463c936435d2d8273bc3a80cf
Yifan Hong [Sat, 18 Feb 2017 01:05:34 +0000 (01:05 +0000)]
Merge "Fix lshal cannot be run without root"
am:
6481ebfbc3
Change-Id: Ic269ab86b933557ee171961f78d6e49e0d4df315
Treehugger Robot [Sat, 18 Feb 2017 01:03:15 +0000 (01:03 +0000)]
Merge "Fix lshal cannot be run without root"
Yifan Hong [Fri, 17 Feb 2017 21:38:47 +0000 (13:38 -0800)]
Fix lshal cannot be run without root
Root cause is invoking copy constructor on a Return<T> object
implicitly, while the old object contains a failed status and
gets destroyed. Use the move constructor instead to fix this.
Test: adb unroot && adb shell lshal
Change-Id: I44710166cc5d7da30bf54b10d1860be1b91dc98a
Martijn Coenen [Fri, 17 Feb 2017 18:55:08 +0000 (18:55 +0000)]
Merge "atrace: Don't output service lookup/notification errors." am:
9753b43355 am:
acc03d821b
am:
b4951bb3c5
Change-Id: I1795408b3731916b08d5c716bacebc1892a9760a
Martijn Coenen [Fri, 17 Feb 2017 18:50:40 +0000 (18:50 +0000)]
Merge "atrace: Don't output service lookup/notification errors." am:
9753b43355
am:
acc03d821b
Change-Id: Id61287c635379735bc0c78dea8571720594de52f
Martijn Coenen [Fri, 17 Feb 2017 18:45:38 +0000 (18:45 +0000)]
Merge "atrace: Don't output service lookup/notification errors."
am:
9753b43355
Change-Id: I08da77d7664543aa1922a23792fa68f9094323ef
Treehugger Robot [Fri, 17 Feb 2017 18:38:53 +0000 (18:38 +0000)]
Merge "atrace: Don't output service lookup/notification errors."
Martijn Coenen [Fri, 17 Feb 2017 13:57:38 +0000 (14:57 +0100)]
atrace: Don't output service lookup/notification errors.
Bug:
34933232
Test: android.atrace.cts.AtraceHostTests
Change-Id: If981106fb1bf7db24b9fd173c6936a1e189756f0
Yifan Hong [Thu, 16 Feb 2017 18:18:59 +0000 (18:18 +0000)]
Merge changes from topic 'lshal' am:
7e894fc94f am:
c972254b58
am:
fc025cd2aa
Change-Id: If5e30cbb533aa16de6b2f565104102ecec66c87a
Yifan Hong [Thu, 16 Feb 2017 18:14:58 +0000 (18:14 +0000)]
Merge changes from topic 'lshal' am:
7e894fc94f
am:
c972254b58
Change-Id: I1b5c1eceb88b57a50331340709c50507eb8f9bf8
Yifan Hong [Thu, 16 Feb 2017 18:10:31 +0000 (18:10 +0000)]
Merge changes from topic 'lshal'
am:
7e894fc94f
Change-Id: Iede25dfbf58f71b56cec13733bd8f5ddbeb95c31
Yifan Hong [Thu, 16 Feb 2017 18:02:51 +0000 (18:02 +0000)]
Merge changes from topic 'lshal'
* changes:
lshal: Add option to print cmd lines instead of pids.
lshal: Add timeout for IPC calls.
lshal: Allow selecting columns and sorting by column.
lshal: Refactor lshal to use an Lshal class; combined instance column with interface column
Yifan Hong [Wed, 15 Feb 2017 01:33:50 +0000 (17:33 -0800)]
lshal: Add option to print cmd lines instead of pids.
Add -m to arguments of lshal. When this flag is set,
/proc/{pid}/cmdline is printed instead of a plain PID.
If the file doesn't exist, it will be striped out from
the PID column as well (the process is considered died
and won't hold a reference to the binder object.)
Test: lshal -icm
Bug:
35160832
Change-Id: I4345bf06112a1f87ce91bec6f6f787703e46cd17
Yifan Hong [Tue, 14 Feb 2017 23:43:31 +0000 (15:43 -0800)]
lshal: Add timeout for IPC calls.
IPC calls into interfaces should be done fault-torelently.
Add a timeout for each IPC call made so that lshal won't be
indefinitely blocked even if the interface don't reply
promptly.
Bug:
35317039
Test: lshal
Change-Id: Icb8157716ad68bddb5b33304b9063aa6f233985d
Yifan Hong [Tue, 14 Feb 2017 01:51:59 +0000 (17:51 -0800)]
lshal: Allow selecting columns and sorting by column.
Examples: see tests below.
Test: lshal
Test: lshal -intpac
Test: lshal --sort=i
Test: lshal --sort=p
Bug:
34984175
Change-Id: Ia09823776a206868a5d58a2ede153a4538147756
Yifan Hong [Sat, 11 Feb 2017 01:49:58 +0000 (17:49 -0800)]
lshal: Refactor lshal to use an Lshal class; combined instance column with interface column
We need to be able to select columns, sort columns,
and do IPC calls fault-tolerently.
Refactoring lshal.cpp into an Lshal class for more
objective-oriented programming, so that global variables
can be avoided and less parameters will need
to be passed around.
Test: lshal outputs identical output as without this CL, except
with the column merged.
Change-Id: I9668c998da692222aef96ae67bbab8066172543d
Steven Moreland [Tue, 14 Feb 2017 03:54:22 +0000 (03:54 +0000)]
Merge "Revert "dumpsys: add option to list hardware services."" am:
9555a5d497 am:
d2390bea79
am:
8d3069503e
Change-Id: I6f4d5148e41181a4498fe1bcc3b2e9e0551785fb
Steven Moreland [Tue, 14 Feb 2017 03:52:21 +0000 (03:52 +0000)]
Merge "Revert "dumpsys: add option to list hardware services."" am:
9555a5d497
am:
d2390bea79
Change-Id: Ib70ddc0635bc3a502dbc9f7eb31c5716860e9833
Steven Moreland [Tue, 14 Feb 2017 03:50:21 +0000 (03:50 +0000)]
Merge "Revert "dumpsys: add option to list hardware services.""
am:
9555a5d497
Change-Id: I022d2e803e169907c32fc7e263090ec2896d94c5
Treehugger Robot [Tue, 14 Feb 2017 03:44:52 +0000 (03:44 +0000)]
Merge "Revert "dumpsys: add option to list hardware services.""
Steven Moreland [Mon, 13 Feb 2017 23:44:17 +0000 (23:44 +0000)]
Revert "dumpsys: add option to list hardware services."
This reverts commit
6270dd1bf7f4a6eaa0e36b2cbb0f9bdd4790b5d8.
Reason for revert: obsolete, removed in favor of lshal
Test: dumpsys_test
Change-Id: I06e256a5bd0995727a3d6f3f88f79a623b1474f3
Yifan Hong [Mon, 13 Feb 2017 19:43:23 +0000 (19:43 +0000)]
Merge changes from topic 'lshal' am:
c9bc03729b am:
d99d31d5d3
am:
5581e229a6
Change-Id: I526b604879c5c5103a7d0f9a66471534383c6175
Yifan Hong [Mon, 13 Feb 2017 19:40:23 +0000 (19:40 +0000)]
Merge changes from topic 'lshal' am:
c9bc03729b
am:
d99d31d5d3
Change-Id: I615d885788739a2d3d2f11204ad23833a77d96d5
Yifan Hong [Mon, 13 Feb 2017 19:37:54 +0000 (19:37 +0000)]
Merge changes from topic 'lshal'
am:
c9bc03729b
Change-Id: I5051bdae873e53c21dcd6e949e7c47da4482a192
Yifan Hong [Mon, 13 Feb 2017 19:32:37 +0000 (19:32 +0000)]
Merge changes from topic 'lshal'
* changes:
Dump client PIDs for passthrough HALs.
Fix permissions for lshal
Yifan Hong [Fri, 3 Feb 2017 23:23:47 +0000 (15:23 -0800)]
Dump client PIDs for passthrough HALs.
* This is done with registerPassthroughClient in IServiceManager; when a
service is retrieved through the passthrough service manager, its PID
will be recoreded by the binderized service manager.
* The action of dumping all available dynamic libraries is now done by
dumpAllLibraries.
Bug:
34712252
Test: lshal
Change-Id: I7f08e3255ffed0f46435843504e0e225d0d9bbc9
Yifan Hong [Fri, 3 Feb 2017 21:40:04 +0000 (13:40 -0800)]
Fix permissions for lshal
Instead of IServiceManager::debugDump, lshal now relies
on list and get. lshal itself will call getDebugInfo
on each interface, so that each interface can check if
the call is from a root user, then decide to leak
addresses or not.
Bug:
34899586
Test: lshal
Change-Id: I8eb9168c3b071b8b1f27dbeaa0ac27d2067200d7
quddusc [Thu, 9 Feb 2017 21:38:47 +0000 (21:38 +0000)]
Merge "NDK docs: Fixed in-line comments for A8 and ARGB444 bitmap configurations. Test: Verified changes with romainguy@. Related bugs: b/
26922523" am:
270fff6a7c am:
f9c7e2a002
am:
3d2dbf4d2f
Change-Id: Ice33e4e60d90f303652d2a993e90e3c58f3e261f
quddusc [Thu, 9 Feb 2017 21:35:09 +0000 (21:35 +0000)]
Merge "NDK docs: Fixed in-line comments for A8 and ARGB444 bitmap configurations. Test: Verified changes with romainguy@. Related bugs: b/
26922523" am:
270fff6a7c
am:
f9c7e2a002
Change-Id: I228a0f7ed82d88e64ddade491f5aece700c9d9dd
quddusc [Thu, 9 Feb 2017 21:32:41 +0000 (21:32 +0000)]
Merge "NDK docs: Fixed in-line comments for A8 and ARGB444 bitmap configurations. Test: Verified changes with romainguy@. Related bugs: b/
26922523"
am:
270fff6a7c
Change-Id: Ibfc593ff8a9d913e083b8fda4341ca5110ba87a1
quddusc [Thu, 9 Feb 2017 21:26:19 +0000 (21:26 +0000)]
Merge "NDK docs: Fixed in-line comments for A8 and ARGB444 bitmap configurations. Test: Verified changes with romainguy@. Related bugs: b/
26922523"
Quddus Chong [Wed, 8 Feb 2017 18:38:21 +0000 (10:38 -0800)]
NDK docs: Fixed in-line comments for A8 and ARGB444 bitmap configurations.
Test: Verified changes with romainguy@.
Related bugs: b/
26922523
Change-Id: Id51445b09896407e808b519f3ee2f4be90f5b7eb
wyau [Tue, 7 Feb 2017 04:34:25 +0000 (04:34 +0000)]
Merge "SurfaceFlinger supports ClearClientTarget for Sideband" am:
6560727f37 am:
adde06b9e8
am:
1f94c41f83
Change-Id: I4a1819a3aa9f4c5aa7233225bdae29435272cade
wyau [Tue, 7 Feb 2017 04:16:12 +0000 (04:16 +0000)]
Merge "SurfaceFlinger supports ClearClientTarget for Sideband" am:
6560727f37
am:
adde06b9e8
Change-Id: I68e33ab1173bbae30e8d22ae86397ec081051f7f
wyau [Tue, 7 Feb 2017 04:13:40 +0000 (04:13 +0000)]
Merge "SurfaceFlinger supports ClearClientTarget for Sideband"
am:
6560727f37
Change-Id: Idfeaf9f6e29eda948b44a1110ae18a5099a0977e
wyau [Tue, 7 Feb 2017 04:07:15 +0000 (04:07 +0000)]
Merge "SurfaceFlinger supports ClearClientTarget for Sideband"
Gray Huang [Wed, 11 Jan 2017 05:41:09 +0000 (13:41 +0800)]
SurfaceFlinger supports ClearClientTarget for Sideband
When clearing the layer's intersection with the dirty region,
HWC2::Composition::Sideband layer needs to be cleared as well.
Bug:
33443134
Test: manual - enter PIP mode with Live Channel
Change-Id: I4fecc7b5db8a2bf220b681bd087264290d1a2443
Yunlian Jiang [Fri, 3 Feb 2017 02:51:14 +0000 (02:51 +0000)]
Merge "Fix warning: macro redefined" am:
909ef30a63 am:
f62690cdaf
am:
d1f7b9d025
Change-Id: Ifa71e97d5ade8685f2f31400afd1727034321b4d
Yunlian Jiang [Fri, 3 Feb 2017 02:48:46 +0000 (02:48 +0000)]
Merge "Fix warning: macro redefined" am:
909ef30a63
am:
f62690cdaf
Change-Id: If7255629f0be37af2c08da90e9010423d73decfc
Yunlian Jiang [Fri, 3 Feb 2017 02:46:15 +0000 (02:46 +0000)]
Merge "Fix warning: macro redefined"
am:
909ef30a63
Change-Id: Ia1b083546fe41a81acf83e0cb0b8921700aa1bfa
Treehugger Robot [Fri, 3 Feb 2017 02:39:19 +0000 (02:39 +0000)]
Merge "Fix warning: macro redefined"
Android Build Merger (Role) [Thu, 2 Feb 2017 20:23:07 +0000 (20:23 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
64cae76fe0" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Feb 2017 20:23:04 +0000 (20:23 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
a27b8d6f0b" into nyc-mr2-dev-plus-aosp
Fabien Sanglard [Thu, 2 Feb 2017 20:22:59 +0000 (20:22 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd
am:
64cae76fe0
Change-Id: I4ede153f15364c3e261e5e93c896ee79a084c2ec
Fabien Sanglard [Thu, 2 Feb 2017 20:22:57 +0000 (20:22 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd
am:
a27b8d6f0b
Change-Id: Ia4ab81ceb6f16145b4f10128fc64038e48d19b44
Android Build Merger (Role) [Thu, 2 Feb 2017 20:22:55 +0000 (20:22 +0000)]
Merge "Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667 am:
b6fa70b9fb" into nyc-mr2-dev-plus-aosp
Fabien Sanglard [Thu, 2 Feb 2017 20:22:45 +0000 (20:22 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667
am:
41ab86fb1f
Change-Id: I49c6fa4e733d05804495de9f5986d3430178d0f9
Fabien Sanglard [Thu, 2 Feb 2017 20:22:44 +0000 (20:22 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667
am:
b6fa70b9fb
Change-Id: Ided7a6c942c7414f0d7bba3fd9e707b3f030380a
Fabien Sanglard [Thu, 2 Feb 2017 20:20:26 +0000 (20:20 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2
am:
c1038b66dd
Change-Id: I6d86ae8db2bea689c6db821c6924b4dcde6f7c41
Fabien Sanglard [Thu, 2 Feb 2017 20:20:25 +0000 (20:20 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2
am:
c1038b66dd
Change-Id: If10a72b8c856955a543cf695133b72161192b00b
Fabien Sanglard [Thu, 2 Feb 2017 20:20:14 +0000 (20:20 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607
am:
f91ee50667
Change-Id: I703ffd6b2a4ee5a7726bd7426f83256ad990835f
Fabien Sanglard [Thu, 2 Feb 2017 20:20:13 +0000 (20:20 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607
am:
f91ee50667
Change-Id: Ib4fad8fa8a393bc6233b842f0550db03708a65b1
Fabien Sanglard [Thu, 2 Feb 2017 20:18:25 +0000 (20:18 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8
am:
900cd6a1d2
Change-Id: Ieee74bcd82513fc4612c874b966ba9903e26565c
Fabien Sanglard [Thu, 2 Feb 2017 20:18:12 +0000 (20:18 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2
am:
18a5e5f607
Change-Id: Iec4b5c921b77fd29aea45bdb49cd4d7cda67edc6
Fabien Sanglard [Thu, 2 Feb 2017 20:15:54 +0000 (20:15 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e
am:
80672db6b8
Change-Id: I5008bd9cd2b14dd52d261f5934024f7526e96f7f
Fabien Sanglard [Thu, 2 Feb 2017 20:15:42 +0000 (20:15 +0000)]
Fix security vulnerability am:
45b202513b
am:
8778a131c2
Change-Id: Ic9300f2597702d6e83d80222dbc5ca7d2642f621
Fabien Sanglard [Thu, 2 Feb 2017 20:12:43 +0000 (20:12 +0000)]
Merge "Fix security vulnerability" into nyc-dev
am:
2188ad799e
Change-Id: Iac558b8fedbbfdd76ebe90867b70d57c33f8b644
OSDN Git Service
