Commit Graph

49695 Commits

Author SHA1 Message Date
Dan Albert
1474f8864f Don't check if this == NULL.
Entering a method with this == NULL is undefined behavior. Clang whines
about this.

Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
2014-09-16 17:52:06 -07:00
Dan Albert
86aeb9ef15 Merge "Make string literal concatenation play nice with C++11." 2014-09-09 04:02:10 +00:00
Dan Albert
8b49125f10 Make string literal concatenation play nice with C++11.
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.

Change-Id: I2741f5be9c0b1562e0f413d1309ef9d687e89b41
2014-09-08 18:53:39 -07:00
Nick Kralevich
51eec3b987 Merge "Fix relabeling of secondary user package directories." 2014-09-08 20:37:23 +00:00
Stephen Smalley
8ac2a648b6 Fix relabeling of secondary user package directories.
When relabeling secondary user package directories, we need to use
the uid of the directory rather than the primary package UID;
otherwise, levelFrom=user will not work correctly.

Change-Id: I0d76ec6ec6fe56a566023ca5e1398efdf28fc81e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-08 15:51:55 -04:00
Brian Carlstrom
8c1642ad4e Merge "Remove obsolete prunedexcache" 2014-08-28 23:45:12 +00:00
Alex Light
5f727f8694 Remove obsolete prunedexcache
Bug: 16875245

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
2014-08-28 23:30:52 +00:00
Calin Juravle
f6e1611a8d Merge "Add vm_safe_mode to dexopt." 2014-08-27 15:50:17 +00:00
Calin Juravle
4f60ac2bbc Add vm_safe_mode to dexopt.
The flag enforces interpret-only flag for dex2oat.

Bug: 12457423

(cherry picked from commit b1efac1035)
(cherry picked from commit 97477d203e)

Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa
2014-08-27 16:16:05 +01:00
Calin Juravle
c70626a1ef Merge "Pass isa features flag to dex2oat." 2014-08-26 17:52:26 +00:00
Calin Juravle
e9eb12c291 Pass isa features flag to dex2oat.
Bug: 16716262

(cherry picked from commit 8fc7315a67)

Change-Id: I3cb1d82604612bc7212bcbdeef685bc05b695b6a
2014-08-26 18:48:30 +01:00
Calin Juravle
72deed8cd2 Merge "Fix validation of system paths in installd." 2014-08-22 17:11:52 +00:00
Calin Juravle
f53c08befc Fix validation of system paths in installd.
System apps are now installed under their own directory
(system_app_dir/app_dir/app.apk). The new path doesn't pass installd
validation because of obsolete checks which verify that the path does
not contain subdirectories past the system_app_dir.

The CL fixes the validation to accept at most on subdirectory.

Bug: 17109858

(cherry picked from commit c597b6dd89)

Change-Id: Ic5f15d1864c6af9f4c4b07dc27244ebbb521ad5e
2014-08-22 15:33:30 +01:00
Calin Juravle
5728256201 Merge "Allow apk path to contain one subdirectory." 2014-08-22 13:40:50 +00:00
Calin Juravle
9d76156266 Allow apk path to contain one subdirectory.
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.

Bug: 16888084

(cherry picked from commit fd88ff2edd)

Change-Id: I1002529b0c35852c67540d3165d1444523460592
2014-08-22 14:04:45 +01:00
Hans Boehm
efc0b35fbd Merge "Fix CAS argument type." 2014-08-16 04:28:29 +00:00
Hans Boehm
1ddaadb598 Fix CAS argument type.
Gcc apparently doesn't check; clang does.

Bug:17067219
Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
2014-08-19 13:42:54 -07:00
Elliott Hughes
703b60ce39 Merge "Use gettid directly in binder." 2014-08-16 04:08:14 +00:00
Elliott Hughes
fa6ad07c4e Use gettid directly in binder.
Bug: 17048545
Change-Id: I1df378135961e085a52f6cc5694ad74cd73aac19
2014-08-18 10:38:38 -07:00
Brian Carlstrom
ca58175c83 Merge "Disable verification based on vold.decrypt. [frameworks/native]" 2014-08-15 05:40:22 +00:00
Brian Carlstrom
f7765c4a17 Disable verification based on vold.decrypt. [frameworks/native]
Bug: 15165413

(cherry picked from commit e18987efb5)

Change-Id: Ie55ef400c9d1f231b3be64248c756ac798a11ffe
2014-08-15 10:05:32 -07:00
Hans Boehm
a0187a9c83 Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""" 2014-08-12 23:11:16 +00:00
Hans Boehm
3effababf2 Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
After fixing b/16874785.

This reverts commit f010a05c7e.

Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
2014-08-12 22:56:00 +00:00
Andreas Gampe
1a22eb7ba1 Merge "Change an accidental ALOGE to an ALOGV" 2014-08-11 18:01:48 +00:00
Alex Light
a7915d437c Change an accidental ALOGE to an ALOGV
Change-Id: If07bcef597dd9e531ce6d92c7780ba6ad5090f9a
2014-08-11 10:07:02 -07:00
Hans Boehm
f010a05c7e Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""
This reverts commit 66629e0de5.

Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
2014-08-09 01:17:13 +00:00
Hans Boehm
66629e0de5 Revert "Revert "Remove incorrect android_atomic_...64 use.""
This reverts commit 9dc5c269f7.
Adds a stdint.h include in case stdatomic.h stops including that.

Change-Id: If3dd1db1f1132c0f2dc1efb0a44617d3f36d7cfb
2014-08-08 17:14:30 -07:00
Hans Boehm
f491f497b2 Merge "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""" 2014-08-08 18:16:13 +00:00
Narayan Kamath
82e98c21f8 Merge "Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup" 2014-08-07 18:51:06 +00:00
Brian Carlstrom
0378aaf257 Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
Bug: 15927194
Change-Id: Id8bc188de68d62fd5f91a99aaaa6c8f2dea06abd
2014-08-08 22:10:06 -07:00
Hans Boehm
6e5316b1da Merge "Revert "Revert "Remove incorrect android_atomic_...64 use.""" 2014-08-07 15:32:16 +00:00
Hans Boehm
735082ea15 Merge "Revert "Remove incorrect android_atomic_...64 use."" 2014-08-06 21:46:54 +00:00
Hans Boehm
9dc5c269f7 Revert "Remove incorrect android_atomic_...64 use."
This reverts commit 88b7541d68.

Change-Id: Ie701c308451a3697bb167aff119318b932133f90
2014-08-06 22:45:13 +00:00
Hans Boehm
c11eca81e6 Merge "Remove incorrect android_atomic_...64 use." 2014-08-06 02:12:31 +00:00
Jesse Hall
e2e17e5b23 Merge "GlES2: Add NULL check" 2014-08-05 17:41:26 +00:00
Anshuman Dani
0627071cc9 GlES2: Add NULL check
Check for NULL before calling thread specific glGetString.

CRs-fixed: 569609

Change-Id: Ifee8257152ba7ca7a05df5d7b113171b71d16c82
2014-08-06 21:53:35 +05:30
Brian Carlstrom
8ce2867210 Merge "Make system use patchoat to relocate during runtime." 2014-08-05 00:35:38 +00:00
Alex Light
7365a10689 Make system use patchoat to relocate during runtime.
Make installd understand a patchoat directive and carry it out.

Bug: 15358152

Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
2014-08-05 10:22:10 -07:00
Brian Carlstrom
74b3ecf485 Merge "Disable compilation based on vold.decrypt. [frameworks/native]" 2014-08-01 08:22:51 +00:00
Brian Carlstrom
538998f204 Disable compilation based on vold.decrypt. [frameworks/native]
Bug: 15165413
Change-Id: Ibc39ab82e02e42345c6e2667ac45884f2e0cf7a4
2014-08-04 11:25:45 -07:00
Brian Carlstrom
9c49e21d80 Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]" 2014-08-01 01:50:59 +00:00
Brian Carlstrom
cf51ba1360 Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: Iff27dc2904f4f0d7c25a684cd6ba16a597f252fd
2014-07-30 14:36:35 -07:00
Christopher Ferris
e8878921db Merge "Add dumping of tombstones to dumpstate." 2014-07-23 18:56:15 +00:00
Christopher Ferris
1fe6107b66 Add dumping of tombstones to dumpstate.
Dump only those tombstones modified within the last half an hour.

Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
2014-07-23 16:33:01 -07:00
Ying Wang
e9105be32f Merge "Install symlinks in multilib build." 2014-07-23 18:56:15 +00:00
Ying Wang
c3aed1eaef Install symlinks in multilib build.
Change-Id: Ia8a4995de127c42beebb3fe603366ce29a6f94d3
2014-07-23 11:55:43 -07:00
Hans Boehm
88b7541d68 Remove incorrect android_atomic_...64 use.
Change the mExtras field in Binder.h to be a stdatomic.h atomic
value, and replace references to it with proper stdatomic.h calls.
This removes one of a small number of remaining 64 bit
android_atomic references.  It also replaces the erroneously
non-atomic read accesses to mExtras.

It would be better if this used the C++11 <atomic> facility,
but we don't quite have that yet.

Bug: 16513433
Change-Id: Ibabb88d05025187ee1ce6c7f1aa670b133a547f8
2014-07-23 11:35:13 -07:00
Elliott Hughes
76cbbc07ea Merge "Always #include <sys/...>, not <linux/...>." 2014-07-17 22:34:48 +00:00
Elliott Hughes
1e4ee9afd2 Always #include <sys/...>, not <linux/...>.
Change-Id: I9a3f574e0dd1d3ba39312254513b8b193b610c09
2014-07-18 17:54:09 -07:00
Elliott Hughes
ec535c5ba5 Fix implicit declaration of function 'prctl' in installd.
Change-Id: I469ee15a0a8a79d005b15aad5097b6c13c20ab7e
2014-07-18 17:29:15 -07:00