175129 Commits

Author SHA1 Message Date
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
John Reck
c521b10854 Merge "Fix a GL error leak issue" 2015-06-09 14:26:57 +00:00
ywen
f087c828cd Fix a GL error leak issue
glFinish() dequeues a native buffer, and it fails when
the bufeer has been abandoned, this is ok and will not
casue the app crash

GL_OUT_OF_MEMORY is generated in this case, and it is
not reset until glGetError called. This is happened in
build layer function, glGetError is called after glTexImg2d,
and get GL_OUT_OF_MEMORY, then this function return as OOM,
and app crash

Fix it by adding a glGetError after glFinish

Change-Id: I8803a726b6f609c4a2f8a6aa6bb7ff7064808932
2015-06-09 17:51:35 +05:30
Narayan Kamath
a121d34cee Merge "ICU format support for pseudolocalizes." 2015-06-09 10:29:04 +00:00
Igor Viarheichyk
cbb1e676b5 ICU format support for pseudolocalizes.
Custom parser can handle nested ICU messages even if they
are split into multiple fragments. Code reworked to encapsulate
all pseudolocalization logic in Pseudolocalizer and PseudoMethods
classes. To minimize a changelist size, some static functions
remained. Fake BiDi pseudolocalization method is reimplemented
to handle word boundaries correctly. Unit tests added.

Change-Id: I9fb4baf4e3123df5dd6d182cca02bb7b0489ca71
2015-06-09 11:28:20 +01:00
Yang Ni
1052ae00f1 Merge "Fixed ScriptGroup for outputs to globals" 2015-06-08 23:08:11 +00:00
Yang Ni
d9f5f0269d Fixed ScriptGroup for outputs to globals
b/21187932

Dependency from one kernel to another kernel -- where one reads the
other's output to a global allocation -- was not handled correctly.
This CL fixed that. Needed to make a new CTS test pass.

Change-Id: I500f9cac9d89bcaec7c186e942ba4a7d413daadb
(cherry picked from commit 85858718c0fc8f4f17ee18e5d62ec0614a8bc780)
2015-06-08 15:08:19 -07:00
Narayan Kamath
f5b7778e55 Merge "Pass MUTF-8 paths to open(2) instead of UTF-8." 2015-06-08 15:14:32 +00:00
tao.pei
d415303c4d Pass MUTF-8 paths to open(2) instead of UTF-8.
Modified UTF-8 and UTF-8 differ with respect to how they handle
non-BMP characters. Modified UTF-8 uses 2 x 3 byte encodings, one
each for the high and low surrogate, whereas UTF-8 uses a single
4 byte sequence.

File systems don't specify and encoding and therefore the file name
encoding will vary depending on how it's created. All standard
Java APIs (java.io.File / FileOutputStream etc.) use Modified UTF-8
filenames, so we assume that's the status quo.

We will also audit code from the rest of the platform to make sure
that file names are encoded consistently.

bug: 21578056

Change-Id: I8e37af7f7cc442805a48899917f8e61c8f81fba6
2015-06-08 15:14:08 +00:00
Elliott Hughes
3a5c054ac3 Merge "Fix debugging-log documentation errors." 2015-06-05 23:55:16 +00:00
Elliott Hughes
771f2d5428 Fix debugging-log documentation errors.
ART has never supported log.redirect-stdio.

Don't imply that System.out and System.err go to /dev/null.

Bug: http://b/18092307
Bug: https://code.google.com/p/android/issues/detail?id=165602
Bug: https://code.google.com/p/android/issues/detail?id=62555
Change-Id: If5304a129e8941865211deb86766531925255796
2015-06-05 15:44:51 -07:00
Michael Wright
7d72fedd7e Merge "Input command can fail (with exceptions) if the touchscreen id is not 0" 2015-06-05 12:17:10 +00:00
riddle_hsu
3fe52da421 [ActivityManager] Fix index OOB when updating visible.
If there is an Activity Z of Task T needs be visible but
isn't running, and the process P of Z is existed, it will
just to schedule launch Z.

The problem will happen when P is died (e.g. kill itself)
right before scheduleLaunchActivity. Once RemoteException
is caught, startSpecificActivityLocked will try to restart
the process and run cleanup procedure because the process
record is existed (death recipient of P has not entered AMS
yet). And assume task T contains X, Y, Z. X and Y have
declared stateNotNeeded=true, so X and Y will be removed
from task T.

Now the size of task T changes from 3 to 1. And because
activityNdx=2 when updating Z, the next round (--activityNdx)
will have exception at activities.get(activityNdx):
IndexOutOfBoundsException: Invalid index 1, size is 1

The ActivityRecord in TaskRecord is removed by below flow:

ActivityStack.ensureActivitiesVisibleLocked
 ActivityStackSupervisor.startSpecificActivityLocked
  ActivityStackSupervisor.realStartActivityLocked
   ApplicationThreadProxy.scheduleLaunchActivity -> IPC fail
  ActivityManagerService.startProcessLocked
   ActivityManagerService.handleAppDiedLocked
    ActivityStackSupervisor.handleAppDiedLocked
     ActivityStack.handleAppDiedLocked
      ActivityStack.removeHistoryRecordsForAppLocked
       ActivityStack.removeActivityFromHistoryLocked
        task.removeActivity(r) -> mActivities.remove(r)

There is also similar patch to solve the same problem:
https://android-review.googlesource.com/143780/

Change-Id: Iac646bcb8ed3d3cfb2bda14e05e11abfcfe980d1
2015-06-05 16:38:38 +08:00
Chris Craik
34a63ba4d7 Merge "Ensure RenderScript tracing is always balanced via try/finally" 2015-06-04 17:24:16 +00:00