drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,168 Commits 1 Branch 0 Tags
Commit Graph

120168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
4891a9f9cf am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes" 
* commit 'e46e60041215249a285384cd2282de9f4d956a04':
  Assign AID_EVERYONE gid to newly-created processes
 2014-06-04 20:55:02 +00:00
Robin Lee
e46e600412 Merge "Assign AID_EVERYONE gid to newly-created processes" 2014-06-04 20:51:55 +00:00
Tim Murray
af2e7bc2e0 am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit 'fdb15a76a30de169aac63d4c2260aa293477557e':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-04 17:39:54 +00:00
Tim Murray
fdb15a76a3 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-04 10:25:54 -07:00
Tim Murray
1afc29ae38 Merge "Add support for mixed 32/64 APKs using RenderScript." 2014-06-03 21:36:19 +00:00
Adam Lesinski
7e547e0d72 Merge "Add --pseudo-localize option to generate resources for pseudolocales." 2014-06-03 20:11:13 +00:00
Tim Murray
f0c62b2676 Add support for mixed 32/64 APKs using RenderScript. 
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
 2014-06-03 12:30:53 -07:00
Igor Viarheichyk
a191d0464f Add --pseudo-localize option to generate resources for pseudolocales. 
Update help output with new option, remove mention of obsolete zz_ZZ
pseudolocale.

Change-Id: Ie2cfc8d11ef6a57e2b9a2333514a7340a3a8c075
 2014-06-03 12:07:50 -07:00
Narayan Kamath
73f7cd98d6 Merge "Fix build." 2014-06-03 13:56:03 +00:00
Narayan Kamath
26c6c03196 Fix build. 
Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
 2014-06-03 14:54:52 +01:00
Narayan Kamath
7cb13f8a0a Merge "Scan for renderscript files before deciding ABIs." 2014-06-03 12:20:05 +00:00
Narayan Kamath
d47e38b634 Scan for renderscript files before deciding ABIs. 
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
 2014-06-03 12:58:35 +01:00
Narayan Kamath
7ed98c43f8 Merge "Add an --abi argument to "pm install"" 2014-06-03 11:10:02 +00:00
Narayan Kamath
6431d11cd4 Add an --abi argument to "pm install" 
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
 2014-06-03 11:11:47 +01:00
Narayan Kamath
032c5c054c Merge "Log process abis during start." 2014-06-03 09:57:03 +00:00
Mike Lockwood
8868d1290a am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '1c725866da02c3e1f62fb416ea3450caed406f2a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:25:35 +00:00
Mike Lockwood
750e78bb76 am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '27eb205e21e7715764084085f382d690e0406c63':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:25:28 +00:00
Mike Lockwood
1c725866da Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 2014-06-02 18:21:17 +00:00
Mike Lockwood
27eb205e21 Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 2014-06-02 18:20:39 +00:00
Martin Blumenstingl
986b46d179 MtpDatabase JNI: Fixed incorrect method name in ALOGE. 
Change-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9
 2014-05-31 16:17:11 +02:00
Martin Blumenstingl
17a24c58bb MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue(). 
The jstring "stringValue" was not never freed.
In the case where "str" was NULL the whole cleanup part (see "goto out")
was even skipped.
This patch makes getObjectPropertyValue() behave like
getObjectPropertyList().

Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
 2014-05-31 16:17:11 +02:00
Nick Kralevich
daa0ee137d am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks." 
* commit '4f8785f28e6305d427cc3e483248828c9b9b06a2':
  SELinuxMMAC additions to perform policy versioning checks.
 2014-05-31 05:27:46 +00:00
Nick Kralevich
4f8785f28e Merge "SELinuxMMAC additions to perform policy versioning checks." 2014-05-31 05:25:14 +00:00
Nick Kralevich
89b88f2269 am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 
* commit '3a9835d4914bc959a37eefecf4d5d0d20852e3e7':
  Allow SELinuxPolicyInstallReceiver to update new policy files.
 2014-05-31 05:09:37 +00:00
Nick Kralevich
3a9835d491 Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 2014-05-31 05:07:13 +00:00
Elliott Hughes
79067b3cb2 am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '5568e0e45fff7ffe5061770cb527b22d09cf5519':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:26:36 +00:00
Elliott Hughes
5568e0e45f Merge "Move frameworks/base off private libcore.ICU API." 2014-05-31 02:22:24 +00:00
Elliott Hughes
570f44b4ab Move frameworks/base off private libcore.ICU API. 
Change-Id: I55355b7ea68174063f31d6bb08a71bcb9dc76d62
 2014-05-30 19:20:20 -07:00
Chris Craik
4d31c5474b am ce7fa780: Merge "Fix a resource race bug in PathCache" 
* commit 'ce7fa780cdee2730b570cc34066f15c74d44e6ef':
  Fix a resource race bug in PathCache
 2014-05-30 17:59:51 +00:00
Chris Craik
ce7fa780cd Merge "Fix a resource race bug in PathCache" 2014-05-30 17:56:42 +00:00
Narayan Kamath
b9b31f4b8e am bd4d3203: Merge "Support an ABI flag for instrumentation." 
* commit 'bd4d320344833ce67dad3a4e10a61d0502a81d0e':
  Support an ABI flag for instrumentation.
 2014-05-30 10:41:24 +00:00
Narayan Kamath
bd4d320344 Merge "Support an ABI flag for instrumentation." 2014-05-30 10:35:29 +00:00
yuyang
7061f7d791 Fix a resource race bug in PathCache 
When enabled defer rendering, it will do precache for DrawPathOp.
The paint used for creating PathTask in precache just get the address
of mFilteredPaint of OpenGLRenderer. So for the following defer
operation like DrawTextOp has possibility change the mFilteredPaint
by getPaint while another WorkerThread in PathCache is using the paint
which pointed to the same address of mFilteredPaint to generate bitmap.
As a result, it will generate a wrong bitmap for generateTexture in
PathCache. To fix it, do a copy of paint when creating PathTask.

CRs-Fixed: 664244

Change-Id: I5516f5b143458b88d3573d15b7ebb34f688800c7
 2014-05-30 08:26:37 +05:30
Narayan Kamath
246469a355 Log process abis during start. 
Adds to the info log that the activity manager emits
during every app launch.

Change-Id: Icd442334cb0e0e0fd0cc529c6b9c315a47d4aadc
 2014-05-29 18:04:57 +01:00
Wink Saville
52b4146273 am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '9cd3ff7d61ed65e8b815155747e7bbfc99c1e861':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 04:57:25 +00:00
Wink Saville
9cd3ff7d61 Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 2014-05-29 04:53:52 +00:00
Zhang Wei-e7976c
fb61bfa447 Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change. 
Change-Id: Ibe9e68295661f2f2ffaca3057d696df6a1db3f0c
 2014-05-29 04:43:19 +00:00
Brian Carlstrom
452c592191 am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart" 
* commit '197565e0e800be3c731e679914f40afa1aab98fd':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 22:31:39 +00:00
Brian Carlstrom
197565e0e8 Merge "Move to dalvik.vm.lib.2 to force default to libart" 2014-05-28 22:28:39 +00:00
Brian Carlstrom
5bc93866b0 Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175

(cherry-picked from commit 2ef5abb8d534f016582d6023054cbe69d8114b6b)

Change-Id: Icd91982c09076e87092906106cbff4a81589e8de
 2014-05-28 14:53:40 -07:00
Elliott Hughes
df0e9ed553 am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 
* commit '862be91276ec9532b3ed00d43fc7a750f1e6adb0':
  Updated Trace.h to recognize ATRACE_TAG_BIONIC.
 2014-05-28 21:41:30 +00:00
Elliott Hughes
862be91276 Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 2014-05-28 21:36:33 +00:00
Brigid Smith
461ac24b8c Updated Trace.h to recognize ATRACE_TAG_BIONIC. 
Bug: 15116468
Change-Id: I6aef941c6b6bd59347855f7265e701a3aaa08edc
 2014-05-28 14:21:06 -07:00
Narayan Kamath
98993813b3 am b75b3aaa: Merge "Build PacProcessor for 64 bit." 
* commit 'b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7':
  Build PacProcessor for 64 bit.
 2014-05-28 08:48:23 +00:00
Narayan Kamath
b75b3aaac4 Merge "Build PacProcessor for 64 bit." 2014-05-28 08:44:36 +00:00
Narayan Kamath
96132a1907 Build PacProcessor for 64 bit. 
external/chromium-libpac can now build for 64 bit.

Change-Id: I0bfd068ef4ea7d57686f11b79c32803e38bab719
 2014-05-27 17:06:18 +01:00
Narayan Kamath
34c6cb4c1a am 6b5beb31: Merge "PacProccesor: Only build for 32-bit" 
* commit '6b5beb318b439b0b3aeabf42401bfed63bfbe2e2':
  PacProccesor: Only build for 32-bit
 2014-05-27 11:00:48 +00:00
Narayan Kamath
6b5beb318b Merge "PacProccesor: Only build for 32-bit" 2014-05-27 10:57:20 +00:00
Andreas Gampe
4694175624 PacProccesor: Only build for 32-bit 
PacProcessor relies on libpac from chromium, which is not built
for 64b right now.

(cherry picked from commit f8749200c06a8714ffd46f5e2ec81be57ad4f7f4)

Change-Id: Ic128e17b7437c130df29eeab3293b9c01f01d70b
 2014-05-27 11:56:22 +01:00
Eric Laurent
b928b7c2bf am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" 
* commit 'ba64d298bee228b8e27ea17fb31fbff4b4188304':
  AudioService: fix cross deadlock in VolumeStreamState
 2014-05-23 21:37:54 +00:00