120191 Commits

Author SHA1 Message Date
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
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
Eric Laurent
ba64d298be Merge "AudioService: fix cross deadlock in VolumeStreamState" 2014-05-23 21:34:25 +00:00
Eric Laurent
fdbee869be AudioService: fix cross deadlock in VolumeStreamState
Synchronize modifications of volume index by VolumeStreamState
class mutex instead of using synchronized methods.
This avoids possible cross deadlock when modifying volume on
two stream types simultaneously and one is slave to the other.

Bug: 13730145.

Change-Id: I13406c71010ce0c2e2f08f660b6101f310396c98
2014-05-23 21:32:06 +00:00
Dmitriy Ivanov
2137d6a843 am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit 'd5ee4144c4beae54219e1b8eb10418b02dd4a63b':
  Increase start timeout for wrapped process
2014-05-23 02:35:42 +00:00
Dmitriy Ivanov
d5ee4144c4 Merge "Increase start timeout for wrapped process" 2014-05-23 02:31:37 +00:00
Christopher Tate
d6d7587ab0 am a0166b58: Merge "Activity chooser "Always" button is not working"
* commit 'a0166b58de38e0d2d67f9d847d307cf3ce7bf633':
  Activity chooser "Always" button is not working
2014-05-23 02:22:40 +00:00
Christopher Tate
a0166b58de Merge "Activity chooser "Always" button is not working" 2014-05-23 02:17:33 +00:00
Dmitriy Ivanov
c774dcee9d Increase start timeout for wrapped process
* apparently 300*1000 for valgrind is not enough
   (hammerhead aosp tot).

Change-Id: Ia3f26cb67d3aa0ebdec68f3c1a764bad5e7f4f95
2014-05-22 12:40:25 -07:00
Sebastien Hertz
b2db356dc8 am fc1ffe89: Merge "Report runtime information to DDMS"
* commit 'fc1ffe89db4bfe51856dadead2ed9c856a96ca65':
  Report runtime information to DDMS
2014-05-22 14:53:22 +00:00
Sebastien Hertz
fc1ffe89db Merge "Report runtime information to DDMS" 2014-05-22 14:47:14 +00:00
Xiong Li
e88b042d1d Activity chooser "Always" button is not working
When ResolverActivity is created with a custom list of matching
applications (rList) as in NFC case, and the alwaysUseOption is
set to true, the prferredActivity is not saved even if the user
presses the "always" button.

When a list is provided the variable mBaseResolveList will be
!= null. This will set mOrigResolveList = null.

When an activity is choosen and one of the buttons are pressed
onIntentSelected is called. The first thing this method does
is to check mAdapter.mOrigResolveList != null, however in this
case mOrigResolveList is always null, and the value is not
saved as PreferredActivity.

This problem was introduced in
6d8dfbd8149942f25f2b9643a12f1fb38f3be834.

Change-Id: I9eac41b7861b5e68ad3978af0dc0285f2a34eb88
2014-05-22 11:58:41 +02:00
Sebastien Hertz
e901dbdee2 Report runtime information to DDMS
Reports runtime's ABI and internal flags to be displayed by DDMS.

Bug: 14888999
Bug: 14888124
Change-Id: I8a2d3f22f84a093be2fbc74464af6aa7b2a2bebb
2014-05-22 10:28:12 +02:00
narayan
ab3d85ab1a am 838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '838b1e2215cbc27e77530f4c79124c088353e0e7':
  Fix NPE in PackageManagerService.
2014-05-21 20:17:52 +00:00
narayan
838b1e2215 Merge "Fix NPE in PackageManagerService." 2014-05-21 20:14:56 +00:00
narayan
0cfe875ac5 Fix NPE in PackageManagerService.
Check that each package from the setting has
a parsed pkg before we attempt to perform dex-opt
on it. If it doesn't have a parsed package, adjust
the ABI in the settings, but don't perform dexopt.
It will be dexopted later if it's still active
based on the setting.

bug: 15081286

Change-Id: Ifb6d1d5efdc9c59b251731972afa951ad930d05c
2014-05-21 21:00:48 +01:00
Jeff Sharkey
9ef2117f0e am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit 'bc06158a78297747605981702c8e41956ea1aa2d':
  Check for null in LocalSocketImpl.SocketInputStream.available()
2014-05-21 16:05:34 +00:00
Jeff Sharkey
bc06158a78 Merge "Check for null in LocalSocketImpl.SocketInputStream.available()" 2014-05-21 16:03:08 +00:00
Brian Carlstrom
e77a77d081 am ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit 'ec71fed089965c4d731eaa90344849a1775f937a':
  Improve ABI handling for shared user ids.
2014-05-21 06:46:26 +00:00
Brian Carlstrom
ec71fed089 Merge "Improve ABI handling for shared user ids." 2014-05-21 06:01:06 +00:00
Jeff Brown
b0a7f84b6d am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '63bf04d88bcc00876c30c9f2848da8c44b42185b':
  Fix NullException in QwertyKeyListener.KeyDown
2014-05-20 20:40:20 +00:00
Jeff Brown
63bf04d88b Merge "Fix NullException in QwertyKeyListener.KeyDown" 2014-05-20 20:37:44 +00:00
Narayan Kamath
b851c89d22 Improve ABI handling for shared user ids.
The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.

This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.

This also has the side effect of fixing 15081286.

bug: 15081286

Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
2014-05-20 14:09:12 +01:00
Michael Wright
889814cee0 resolved conflicts for merge of 32912e0a to stage-aosp-master
Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26
2014-05-19 22:42:58 -07:00
Michael Wright
32912e0a73 Merge "wallpaper: limit wallpaper width to sys.max_texture_size" 2014-05-20 04:04:01 +00:00
Donghan Ryu
289c273ec4 wallpaper: limit wallpaper width to sys.max_texture_size
Image wallpapers are created ~1.5x screen size.  On some devices this
may exceed the maximum supported texture size, which will either fail
allocation or fail to composite.

Bug 991597

Change-Id: I9948b09f6e00a724212e73d36901f2bbea42e2f4
2014-05-20 12:00:31 +09:00
Chris Craik
00fabcbeb0 am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit 'b1708e9b764268a06d91219a5c39ee9efd32ab00':
  Use alpha channel instead of red in drawCachedGlyphBitmap
2014-05-19 19:27:52 +00:00
Chris Craik
b1708e9b76 Merge "Use alpha channel instead of red in drawCachedGlyphBitmap" 2014-05-19 19:23:07 +00:00
Michael Wright
7099995be5 am a84d24c3: Merge "Extend support for nordic languages with Sami"
* commit 'a84d24c37a3e27cdd4f50807e9dc5fb6f14ea009':
  Extend support for nordic languages with Sami
2014-05-19 18:19:20 +00:00