175142 Commits

Author SHA1 Message Date
John Hoford
6463dd5247 Merge "add comment about xor not being porter/duff Bug: 21934855" 2015-06-30 22:34:44 +00:00
John Hoford
6ba4cb7773 add comment about xor not being porter/duff
Bug: 21934855

Change-Id: I99394bd8a7a40a220c05118564b532f2533da38a
2015-06-30 19:53:41 +00:00
Stephen Hines
61e8329bb8 Merge "Replace parentheses with curly braces to fix vector doc bug." 2015-06-30 01:11:15 +00:00
Stephen Hines
6c304d36b9 Replace parentheses with curly braces to fix vector doc bug.
https://code.google.com/p/android/issues/detail?id=178299

Change-Id: I3ae31d48a39e8db9976fdedde560e870b23e2c83
2015-06-29 18:06:10 -07:00
Yang Ni
0eba40194e Merge "Add Java doc comments on script group name reuse" 2015-06-29 22:39:50 +00:00
Yang Ni
3020953243 Add Java doc comments on script group name reuse
b/21999787

Change-Id: Id9a7bad4ce91f3afdd82a1288cf94430f3aef9bb
(cherry picked from commit dbb6fd58a4b113f8761ce825ad5b91e50c170971)
2015-06-29 15:38:25 -07:00
Yusuke Sato
16d520fce6 Merge "Rename ZipEntryName to ZipString" 2015-06-29 17:49:33 +00:00
Wale Ogunwale
ffe72f70e0 Merge "Use the correct lock to protect members in PolicyControl" 2015-06-29 15:09:30 +00:00
tiger_huang
e8befb3531 Use the correct lock to protect members in PolicyControl
Members in PolicyControl can be accessed by multiple threads via the
public functions called by PhoneWindowManager. Most of the functions
are called with the window-manager-lock held, but reloadFromSetting()
is an exception.

In this patch, we acquire the window-manager-lock before calling
reloadFromSetting() to ensure accessing the members with the same
lock held.

Change-Id: I54ac5cab2a2d74c568fa96145f7a6741c6d99e36
2015-06-29 09:22:01 +00:00
Yusuke Sato
f162faaa12 Rename ZipEntryName to ZipString
Also add a 4th parameter to StartIteration(). This is for
https://android-review.googlesource.com/#/c/156771/.

Bug: 21957428
Change-Id: Ifbf9aec2f04b214b57e99c306282d7c0d39675a9
2015-06-25 14:58:16 -07:00
Tenghui Zhu
78db19c25a Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN." 2015-06-25 21:07:14 +00:00
Lazar Trsic
b561f39d01 Limit dotProduct value to 1.0f, so acosf would not return NaN.
Due to precision loss of float math, we sometimes get 1.000001f for
dotProduct. This causes NaN result from acosf() and floor() funcs.

At the moment, this does not cause any problems on ARM, as casting
NaN to int results in 0. On mips however (possibly on x86), such cast
gives INT_MAX, so crash occurs when trying to use the resulting value.

Change-Id: I8e0285a0306a65b8469d9f4885c19665066fc4c8
2015-06-25 11:11:55 +02:00
Narayan Kamath
fdb70dc434 Merge "Fix filedescriptor leakage in MediaMetadataRetriever" 2015-06-25 08:33:50 +00:00
harvey_tsai
e1856e4829 Fix filedescriptor leakage in MediaMetadataRetriever
setDataSource(String) throws an IllegalArgumentException
when an IOException or FileNotFoundException occurs, but doesn't
close FileDescriptor accordingly.

Change-Id: Ib6e0f1418afeeb19e03abd4bedb4cc845a58b6b4
2015-06-25 09:31:18 +01:00
Narayan Kamath
a78c0e0b9a Merge "Fixed Javadoc typos" 2015-06-25 08:27:47 +00:00
Philipp Hasper
802aa0f8a2 Fixed Javadoc typos
Simple single character typos

Change-Id: I17660dbb3b7ee6597637e8d76770f434ebf202ea
2015-06-25 08:09:43 +00:00
Andreas Gampe
08592bd0f7 Merge "Frameworks/base: Add tracing system properties" 2015-06-25 03:44:45 +00:00
Andreas Gampe
cadcd51e05 Frameworks/base: Add tracing system properties
Add system properties to support zygote-started method tracing.
These are needed as the limit on system properties does not allow
the reuse of the runtime extra options system property.

Bug: 21760614

(cherry picked from commit 98f406f6f31660d0f5ee32113ffadc720b426dc6)

Change-Id: I3785cc5715acadbee81ef7b45081ed780f1351d3
2015-06-24 18:44:05 -07:00
Alan Viverette
c2a3071379 Merge "Duplicate description on AccessibilityEvent" 2015-06-24 22:47:03 +00:00
Mathieu Chartier
9a65f9ddd0 Merge "Add an AM option to start with allocation tracking" 2015-06-24 20:55:38 +00:00
Man Cao
cfa78b2080 Add an AM option to start with allocation tracking
The new option "--track-allocation" is to work with the new
allocation tracker in ART.

Bug:20037135
Change-Id: Ic5f8945ab4c1f167c27b05ad0d11d04bac680c1f
2015-06-24 13:29:29 -07:00
Hiroshi Yamauchi
299a339335 Merge "Clarify art.gc.gc-count-rate-histogram runtime stat." 2015-06-24 18:13:00 +00:00
Hiroshi Yamauchi
169bca74e9 Clarify art.gc.gc-count-rate-histogram runtime stat.
(cherry pick commit 2d6327d0adaf6ca3d13e1e082f55680cfefcc449)

Bug: 21491908
Change-Id: I84d93aa73eebc327513c4663a6b606e2dad9a0b7
2015-06-23 13:28:25 -07:00
Wale Ogunwale
e6734b6b12 Merge "Fix javadoc for Adapter.getViewTypeCount()" 2015-06-23 17:03:51 +00:00
Minhyeok Jeong
ab1c9e0774 Fix javadoc for Adapter.getViewTypeCount()
Remove duplicate words.

Change-Id: Iaeeb8f74313d2ca88c28e4b3672316367b16ca2d
2015-06-21 04:51:22 +09:00
Wale Ogunwale
5acb30de6f Merge "Apply the scale to surfaceinsets when computing crop region" 2015-06-19 20:34:47 +00:00
Nick Kralevich
1c7f0860c7 Merge "overlaytests: fix testrunner.py md5sum invocation" 2015-06-19 19:34:29 +00:00
Stephen Smalley
415fa1f5c0 overlaytests: fix testrunner.py md5sum invocation
The overlaytests testrunner.py script wants to invoke adb shell md5sum
to compute the md5 of a file, but wrongly invokes it as md5.  Maybe
it used to have that name, but it doesn't exist under that name in master.
Fix it.

Change-Id: I3ec4be162fab0cd3915f010f9b1add37b5397973
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-06-19 14:37:58 -04:00
seunghyun85.lee
92d9c81835 Apply the scale to surfaceinsets when computing crop region
While in computing surface crop region, magnification specs are
not applied to surface insets from LayoutParams.

So, in case magnification specs are set,
surface crop region should be calculated considering scale factor.

(For instance, using TouchZoom in Accessibility
at AppsPermissionActivity in market app)

Bug: 20863078
Change-Id: I9e7e21e502b29208f2856918d6fcda050f515595
Signed-off-by: Seunghyun Lee <seunghyun85.lee@lge.com>
2015-06-19 07:56:31 -07:00
Wale Ogunwale
ce7dba6bdf Merge "[ActivityManager] Fix index OOB when updating visible." 2015-06-18 14:38:20 +00:00
Narayan Kamath
b77bc86924 Merge "Delete android.speech.srec.*" 2015-06-17 13:15:03 +00:00
Narayan Kamath
3cd78b4fa3 Delete android.speech.srec.*
This code had an undeclared dependency on libsrec_jni which
we no longer build.

bug: 21855957

(cherry picked from commit b39dfe87b89e3773910202f2e94b9860236551d9)

Change-Id: I6c97f22916766714ae899cf51f1b56cde308af8e
2015-06-17 14:14:23 +01:00
Narayan Kamath
a01d46963a Merge "ZipFileRO: Use precise widths for zip file types." 2015-06-17 13:13:26 +00:00
Narayan Kamath
407753c456 ZipFileRO: Use precise widths for zip file types.
getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.

This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.

Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".

bug: 21622286

(cherry picked from commit 4600dd053dbdbd4b95f3b11057a1cc55b99f9c77)

Change-Id: I7886cb37a229cc27c625699c80e6a6a6117d2203
2015-06-17 13:13:16 +00:00
Vladimir Marko
dc22cfed5d Merge "Don't prevent notification updates in DOS protection." 2015-06-17 09:04:35 +00:00
Dan Albert
f35f66a86b Merge "Use new sanitizer option." 2015-06-16 21:11:09 +00:00
Dan Albert
f98dae5675 Use new sanitizer option.
Change-Id: Iabc46da2820f252f6cd8cef8a447064890f3a76d
2015-06-16 14:06:49 -07:00
Mark Salyzyn
26a4060637 Merge "jni: isLoggable calls __android_log_is_loggable" 2015-06-16 14:08:41 +00:00
Mark Salyzyn
8685a4569d jni: isLoggable calls __android_log_is_loggable
Will inherit additional functionality and cache improvements

Bug: 17760225
Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4
2015-06-13 05:07:47 -07:00
Dmitriy Ivanov
8da462dea5 Merge "Add path to native libraries inside apk" 2015-06-13 00:44:01 +00:00
Chris Tate
396b83b0c8 Merge "Fix overflow/underflow problem in comparison" 2015-06-12 19:52:45 +00:00
Dmitriy Ivanov
88b85406d4 Add path to native libraries inside apk
If an application has native code (and primary abi)
include path to corresponding folder inside apk-file
to ldLibraryPath when constructing PathClassLoader

Bug: 21647354
Bug: 21667767
Bug: 21726698
Bug: 8076853
Change-Id: Ib0a2f01ee69019d3206a00c542bd7d0f58d0c481
(cherry picked from commit e56b3f63e8235ab45e081fc9d3476a3e5248ddde)
2015-06-11 10:48:22 -07:00
Andre Eisenbach
7f0b56527f Merge "Bluetooth native dumpsys logging support (3/5)" 2015-06-10 20:19:22 +00:00
Andre Eisenbach
945c52d5d7 Bluetooth native dumpsys logging support (3/5)
Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
2015-06-10 19:34:41 +00:00
Tao Bao
cfa9a98e99 Merge "Improve the reboot-to-recovery dialogs" 2015-06-10 00:43:58 +00:00
Tao Bao
e215b46482 Merge "Wait for uncrypt to finish before rebooting" 2015-06-10 00:43:47 +00:00
Christopher Ferris
6c4fc3a08e Merge "Change wtf errors from ASSERT to ERROR." 2015-06-10 00:32:25 +00:00
Christopher Ferris
70e23e0d14 Change wtf errors from ASSERT to ERROR.
Calling println_native with the value of ASSERT will set the abort
message. Unfortunately, there are numerous cases where one thread aborts,
but before that thread can communicate with debuggerd, another thread
calls wtf, which overwrites the abort message from the original
failing thread.

Fix this by changing this to an error level log message.

Bug: 21490722
(cherry picked from commit 2d073ba83c570466a7f77d1cd9193ab4a60eaee4)

Change-Id: Ib9daedf114a2e0ecc424641e4929cc4d15b0c776
2015-06-09 17:31:37 -07:00
Tao Bao
f2a91ee148 Improve the reboot-to-recovery dialogs
To address the UX comments, this CL modifies the dialogs when the
device is rebooted to install an update or to perform factory data
reset.

Bug: 20949086
(cherry picked from commit 81dce6631396012e8b722bbed6d003f584800ae1)
Change-Id: I6d0cbbbaf184806366c6581c1c2e7dbcc5d89a17
2015-06-09 14:59:15 -07:00
Tao Bao
fa861429f7 Wait for uncrypt to finish before rebooting
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. For larger packages, uncrypt may be
killed before it finishes the work after the timeout. Change to monitor
the uncrypt status and show the progress to user.

Needs matching changes in bootable/recovery/uncrypt, system/core and
external/sepolicy.

Also pick up the two NPE fixes in commits
9bb765448df43d41e0a3edb7de1d1641c9251c35 and
da3f63ffb87397943546a7c5c893ce98f2489df2.

Bug: 20012567
Bug: 20949086
(cherry picked from commit 90237f7beb55dae79cdcba5271f96be778573737)
Change-Id: Ibf2fc80032967e5f6cda3cd469005dd29665c87c
2015-06-09 14:58:13 -07:00