174744 Commits

Author SHA1 Message Date
Andreas Gampe
399fa8a60a Frameworks/base: Make IDENTITY_MATRIX final
Bug: 19797138
Change-Id: I127f24b7060a0c4dab401ce8e3057d362c6d6b06
2015-03-17 21:31:42 +00:00
Andreas Gampe
9568772acb Merge "Frameworks/base: Fix format string in Geofence" 2015-03-17 21:30:49 +00:00
Andreas Gampe
1414a6291d Frameworks/base: Fix format string in Geofence
%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.

Bug: 19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247
2015-03-17 21:30:20 +00:00
Andreas Gampe
aae42eb261 Merge "Frameworks/base: Fix format string in Camera" 2015-03-17 20:52:21 +00:00
Andreas Gampe
02ffb2aad9 Frameworks/base: Fix format string in Camera
One cannot print a boolean with %d. That will result in an exception.

Bug: 19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
2015-03-17 20:51:38 +00:00
Andreas Gampe
be549f9b8e Merge "Frameworks/base: Fix precedence bug" 2015-03-17 20:36:21 +00:00
Andreas Gampe
869d26fda0 Frameworks/base: Fix precedence bug
Explicit cast has higher precedence than shift.

Bug: 19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
2015-03-17 20:31:22 +00:00
Andreas Gampe
0ae488e1cb Merge "Frameworks/base: Use || instead of |" 2015-03-17 20:28:53 +00:00
Andreas Gampe
e1b9262084 Frameworks/base: Use || instead of |
Nothing wrong with | in this case, but || is canonical.

Bug: 19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
2015-03-17 20:27:42 +00:00
Andreas Gampe
4d9076437c Merge "Frameworks/base: Fix trivial equals implementation" 2015-03-17 20:25:20 +00:00
Andreas Gampe
610b2c778c Frameworks/base: Fix trivial equals implementation
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.

Bug: 19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
2015-03-17 20:24:45 +00:00
riddle_hsu
2541306ad5 [ActivityManager] Avoid killing unrelated processes.
Kernel will reuse process id, when wrap-around happens,
there may be just after a pid is freed, a new thread/process
uses the pid immediately.

For examples, there may be a process with pid 1234 killed
by lowmemorykiller or itself (app.killed=false).
Before the death recipient enters AMS, a new thread/process
is started with pid 1234, then when appDiedLocked executes,
this new pid 1234 will be killed again.

It is especially easy happens to zygote:
During zygote starting process, it will stop 5 daemons threads.
And restart the 5 threads after fork is called, so it has
larger pid range to hit the resue case.
https://code.google.com/p/android/issues/detail?id=160661

Solution:
If the dead event is from binder, it is not necessary
to call killProcessQuiet again, because it should really
be dead.
Keep no checking for killProcessGroup because zygote does
not have record under /acct/, and also the parameter uid
has restriction that will not kill another application
which reuses the pid.

Change-Id: Iec4a4884ae641c4d036f4d024ce463f7a351a17b
2015-03-17 18:22:51 +08:00
Mykola Kondratenko
b159633aa3 hwui : fix memory leak due to duplicate in shadow cache
New ShadowTask with the ShadowDescription key that already
exists in the shadow LruCache will leak as it is not being
added.

Fix adds check for the existing key that is common in the hwui
code but missing for the TessellationCache::precacheShadow
function.

Change-Id: I37fd5ec82f8b8da5d1ec0f2ab9fd04c5f8534367
2015-03-17 08:57:41 +01:00
Mathieu Chartier
008ec61e0c Merge "Change jit properties to be debug properties" 2015-03-17 02:04:34 +00:00
Andreas Gampe
345a8f69ea Merge "Frameworks/base: Fix a comparison" 2015-03-17 00:12:25 +00:00
Mathieu Chartier
1ad10ef1e4 Change jit properties to be debug properties
Bug: 19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
2015-03-16 16:22:52 -07:00
Yang Ni
cc1ca488e2 Added copyright notice and formatted to convention
Pure format change. No other changes at all.

Change-Id: I74a53aa67ef0960f70becaf288b85be40066a0ae
2015-03-16 15:53:18 -07:00
Andreas Gampe
5eb421221b Merge "Frameworks/base: Force long computation" 2015-03-16 20:37:02 +00:00
Andreas Gampe
f3e581c99f Merge "Frameworks/base: Check before foreach in Script" 2015-03-16 19:17:45 +00:00
Andreas Gampe
3d33314e03 Merge "Frameworks/base: Use equals for Integer comparison" 2015-03-16 19:10:40 +00:00
Andreas Gampe
6878ee57b4 Merge "Revert "Frameworks/base: Fix a constructor"" 2015-03-16 17:51:15 +00:00
Andreas Gampe
8c80efeaeb Revert "Frameworks/base: Fix a constructor"
The constructor was public API, doh. Gotta do this differently.

This reverts commit 33c5b2a62f3e62382c41e24c6b527119978816a0.

Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
2015-03-16 17:51:01 +00:00
Andreas Gampe
007e207bde Merge "Frameworks/base: Fix null-pointer check" 2015-03-16 16:59:14 +00:00
Andreas Gampe
d61cbf9a08 Merge "Frameworks/base: Fix a constructor" 2015-03-16 16:51:01 +00:00
Robert Greenwalt
079cfa64ec Merge "Frameworks/base: Fix a hashCode implementation" 2015-03-16 16:17:51 +00:00
Andreas Gampe
5abcd06b1f Merge "Frameworks/base: Fix always-false equals" 2015-03-16 15:28:53 +00:00
John Reck
386dcbddf5 Merge "Frameworks/base: Fix missing cast" 2015-03-16 14:56:52 +00:00
Andreas Gampe
63662320ae Frameworks/base: Force long computation
Ensure that an int-based computation is carried out as long.

Change-Id: I23b10a95600674e8a5a65c0ea349afdc6aa152ae
2015-03-15 20:17:07 -07:00
Andreas Gampe
d538fa0fb2 Frameworks/base: Don't allocate another identity matrix
There is already an identity matrix in Matrix. Don't allocate another
one for VectorDrawable.

Change-Id: I51735f262d6680e043b0009707ec42acb2d0d1ad
2015-03-15 19:03:29 -07:00
Andreas Gampe
650989b0b5 Frameworks/base: Fix a comparison
Change-Id: I80d62869920e77110c95f20369ec2631c75f6ed4
2015-03-15 18:04:41 -07:00
Andreas Gampe
c8ddcddd13 Frameworks/base: Check before foreach in Script
According to the if below, ains == null is potentially valid. But
the foreach loop would throw a NullPointerException.

Change-Id: I4460fb1357eaa3abfe0ab9a21effb608f474ab51
2015-03-15 15:57:30 -07:00
Andreas Gampe
5c5978985a Frameworks/base: Use equals for Integer comparison
Integer == is dangerous, as equal objects may not be identical
objects. In fact, MediaFormat.setInteger was creating a new object
every time.

Change MediaFormat.setInteger and setLong to use valueOf, which
may reuse returned objects.

Change-Id: Iedcc6003adbf05c0c870aa4b3ada7f181a5b870e
2015-03-15 15:45:15 -07:00
Andreas Gampe
f2b1cff4e2 Frameworks/base: Fix null-pointer check
Change-Id: I715a21c313e909ae654e0c1aa67bdf7bcd89de76
2015-03-15 15:07:19 -07:00
Andreas Gampe
34a7d13a65 Frameworks/base: Fix a hashCode implementation
Equals uses Arrays.equals. That means two responses are equal if
the content of the data arrays is equal. By convention, the hash
code of those objects should agree. In that case one cannot use
hashCode on the array (which is the identity hash code).

Change-Id: Icce8e2e71e9142421f5dac8a0ee8a211623fb704
2015-03-15 14:38:59 -07:00
Andreas Gampe
33c5b2a62f Frameworks/base: Fix a constructor
This was meant to be a constructor, according to the comment.

Change-Id: Ief49011b392e58b37d9acb4a3f754f1828b256af
2015-03-15 14:29:16 -07:00
Andreas Gampe
007cfa73b8 Frameworks/base: Fix always-false equals
Rect != Insets.

Change-Id: I3d4ff890608e446b51f09a1b633af742f0c069d4
2015-03-15 14:19:43 -07:00
Andreas Gampe
65ac8a2bd7 Frameworks/base: Fix missing cast
Without a cast, the division is integer division.

Change-Id: I050e53778de8b1591a0be16ebbee8eed70eb1528
2015-03-15 14:10:23 -07:00
Shawn Willden
fe2b1a8298 Add KM_TAG_AUTH_TOKEN.
Change-Id: Id9a22ad32137f3e0380c2812f790bbecab511d11
2015-03-14 10:51:56 -06:00
Shawn Willden
7714a9413f Add support for KM_TAG_USER_SECURE_ID.
Change-Id: I629ab2c47ee6d42de20a963ef283e330364c8ee7
2015-03-14 10:50:32 -06:00
Dmitriy Ivanov
9aeb080eec Merge "Switch libjnigraphics to sysv-only hash style" 2015-03-13 21:35:04 +00:00
Dmitriy Ivanov
ca4f2e838c Switch libjnigraphics to sysv-only hash style
Bug: 19059885
Change-Id: I3474974983931c67dce30dfc581a8d28d8b62e6a
2015-03-13 12:49:47 -07:00
Jeff Tinker
62632e25f5 Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap" 2015-03-13 18:20:43 +00:00
Nick Kralevich
30fcd2aa8a Merge "Drop unusable SELinux APIs." 2015-03-13 18:02:47 +00:00
Stephen Smalley
16d1cce8ff Drop unusable SELinux APIs.
setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.

Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-03-13 14:09:26 -04:00
Chad Brubaker
f1654c6015 Merge "Add initial Keymaster 1.0 tests" 2015-03-13 17:48:09 +00:00
Mark Salyzyn
2018fd0251 logd: optimize statistics
logd reads /data/system/packages.xml (because it also contains
shared UIDs) and is sensitive to line break and tag name issues.

Bug: 19608965
Change-Id: I2a4a6bcfb10529e4b29c9664cbbf12842e689dd1
2015-03-12 20:29:32 +00:00
Olawale Ogunwale
53729e2933 Merge "Wait for opening apps ready before stopping freezing display" 2015-03-12 16:51:19 +00:00
Olawale Ogunwale
1b4933d10e Merge "Wait for visible wallpaper drawn before starting app transitions" 2015-03-12 16:22:07 +00:00
Lorenzo Colitti
1c24b3f110 Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/" 2015-03-12 07:49:23 +00:00
Lorenzo Colitti
7b5be4c0c7 Fix build, broken by https://android-review.googlesource.com/#/c/115890/
Change-Id: Ieafa2fb0a7f539d8f933ad9c98e3be80457da6e5
2015-03-12 16:48:12 +09:00