Sungmin Choi
e099ab18e6
telephony: Update comments for preferred network mode
...
Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d
2014-12-25 07:39:37 +00:00
Ian Rogers
d83ffe358d
Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"
2014-06-06 19:34:13 +00:00
Calin Juravle
bbf849b1c6
Merge "Add missing profiler options."
2014-06-06 12:06:36 +00:00
Calin Juravle
9828d067fb
Add missing profiler options.
...
Bug: 12877748
Change-Id: I311b8fb7e15d512e65631bc2a52c443a271d3d3f
2014-06-06 12:55:23 +01:00
Deepanshu Gupta
b78cc30920
Add missing dependency in layoutlib build file [DO NOT MERGE]
...
Add missing dependency on built_ext_data
Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit e345507ca4b7b83c6e0446788f4404eb697f945b)
2014-06-05 18:32:14 -07:00
Elliott Hughes
b2842e7281
Merge "[LP64] Fix access to MediaAlbumArt."
2014-06-05 18:02:04 +00:00
Elliott Hughes
9fa803be10
[LP64] Fix access to MediaAlbumArt.
...
The mSize field is a uint32_t, not a long.
Change-Id: Id3b9e6049e8998840d33fa886b676db2a8022064
2014-06-05 10:38:30 -07:00
Robin Lee
271251d739
Merge "Add Environment call: get config dir for some user"
2014-06-05 17:16:52 +00:00
Robin Lee
6959133d84
Add Environment call: get config dir for some user
...
This returns a read-only directory accessible to any app running as the
same user, containing various configuration files written by the system.
Change-Id: I635de184fc285b8fef166b782bbc1ac79f8f0687
2014-06-05 14:34:23 +00:00
Elliott Hughes
759a89782d
Merge "Minor javadoc improvements for PackageManager."
2014-06-04 21:26:49 +00:00
Elliott Hughes
c0f4ac1bb8
Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag"
2014-06-04 21:13:57 +00:00
Robin Lee
e46e600412
Merge "Assign AID_EVERYONE gid to newly-created processes"
2014-06-04 20:51:55 +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
Amaury Medeiros
dde24269c1
Minor javadoc improvements for PackageManager.
...
- Removed duplicated use of the word "the".
- Changed @return and @param explanation of getApplicationEnabledSetting,
which should get the enabled state of an application and not just one component.
Change-Id: Ide07ec84ceb5b9b5caa28efa9ba838a40ee7b514
Signed-off-by: Amaury Medeiros <amaurymedeiros@gmail.com>
2014-06-03 20:06:41 -03: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
Jianzheng Zhou
4bb74f157a
Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
...
Change-Id: Ied20e4c7e0e4aa648a76fbe80dd1f0dd30b948a9
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2014-05-30 09:54:51 +08:00
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