118124 Commits

Author SHA1 Message Date
Dave Allison
b94904ab6d am 3fc3b9fd: Merge "ART profiler usage."
* commit '3fc3b9fd1bf71351bf1ff2d49d6e10b6acabf068':
  ART profiler usage.
2014-03-07 15:38:26 -08:00
Dave Allison
3fc3b9fd1b Merge "ART profiler usage." 2014-03-07 22:25:43 +00:00
Dave Allison
0efbd9a463 ART profiler usage.
This is a change to add args to some of the profiler related
functions, including installd commands.

Also read properties and set command line options for the runtime
profiling parameters.

Changed calls to isDexOptNeeded() to isDexOptNeededInternal().  This
needs additional arguments passed for profiles.

Bug: 12877748
Change-Id: I1a426c9309d760bac0cf92daa298defee62287c1

Conflicts:
	core/jni/AndroidRuntime.cpp
2014-03-07 12:32:44 -08:00
Narayan Kamath
51ec4ec51f am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"
* commit '5de03b18ea455c0250cbd01912282f28d8635910':
  Don't assume that size_t is 32-bit
2014-03-07 08:08:21 -08:00
Narayan Kamath
6ac6263dcc am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"
* commit '28ccb4f7d9bbea65c8cb1807e332a46ef37bc619':
  Don't use size_t for variables that store uint32_t value
2014-03-07 08:08:18 -08:00
Narayan Kamath
cd4874cfdc am d265bcc4: Merge "Inform libcore of time format pref. changes."
* commit 'd265bcc4b555ab75009f8ceb32cc90007a621b41':
  Inform libcore of time format pref. changes.
2014-03-07 08:08:05 -08:00
Narayan Kamath
5de03b18ea Merge "Don't assume that size_t is 32-bit" 2014-03-07 16:04:50 +00:00
Narayan Kamath
28ccb4f7d9 Merge "Don't use size_t for variables that store uint32_t value" 2014-03-07 16:04:28 +00:00
Narayan Kamath
d265bcc4b5 Merge "Inform libcore of time format pref. changes." 2014-03-07 13:50:04 +00:00
Narayan Kamath
27ad525c7e Inform libcore of time format pref. changes.
- Introduce a boolean extra for intent TIME_CHANGED that
  specifies if the user wants a 24 hour format or not.
- Have the ActivityManagerService inform running processes
  of changes to this preference.
- Add plumbing in ActivityThread to inform j.t.DateFormat

Change-Id: I05fafb903ae54e39c03a048b7a219dc5a93fd472
2014-03-07 13:48:04 +00:00
Martijn Coenen
1507c18f87 am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."
* commit '29e55bef771ee1453017fbf73bb4de62d356e4fc':
  NFC: getNdefMessage() should throw exception if no tag in field.
2014-03-06 07:51:13 -08:00
Martijn Coenen
29e55bef77 Merge "NFC: getNdefMessage() should throw exception if no tag in field." 2014-03-06 14:33:11 +00:00
Ashok Bhat
e92416dfeb Don't assume that size_t is 32-bit
Crypto data was being copied to java jint array in chunks of
size_t. This will not work on LP64 as size_t will be 64-bit.
This patch changes copy to use int32_t chunks instead of size_t.

Change-Id: I75d910a1182ad2f58f432cd172127f048b4c393b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-03-06 12:36:47 +00:00
Ashok Bhat
58fad0bf14 Don't use size_t for variables that store uint32_t value
The local variables width, height, displayWidth and
displayHeight are set to the corresponding members
of VideoFrame class. As the members of VideoFrame are
uint32_t, the local variables have been changed to
uint32_t.

As these local variables are passed to a java method,
the change of size_t to uint32_t ensures that the size
of the actual parameter (i.e uint32_t) is now same as
the size of the formal parameter (i.e. jint) for all
platforms.

Change-Id: Icd14de0142bfd4e6ba52a3e6aff3d80b323a0de4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-03-06 11:33:20 +00:00
Jason Sams
9a9916b58f am 2383f220: Merge "Validate objects are from the correct context."
* commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa':
  Validate objects are from the correct context.
2014-03-05 16:56:02 -08:00
Jason Sams
2383f2200a Merge "Validate objects are from the correct context." 2014-03-06 00:50:24 +00:00
Jason Sams
678cc7fe9f Validate objects are from the correct context.
Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
2014-03-05 16:09:02 -08:00
David 'Digit' Turner
9c6f41e3eb am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
* commit 'be7b8f4f4c62239ad20202e4bbe8120d5e3dcf82':
  aidl: Support building with updated host sysroot.
2014-03-05 15:14:31 -08:00
David 'Digit' Turner
be7b8f4f4c Merge "aidl: Support building with updated host sysroot." 2014-03-05 23:10:45 +00:00
David 'Digit' Turner
ea6d2197ba aidl: Support building with updated host sysroot.
This patch fixes tools/aidl/Type.cpp to compile with
a more recent SDK host toolchain sysroot (that has not
been submitted yet).

The main issue is that the code uses ssize_t which is
defined in <sys/types.h>, but didn't include the header
directly.

Apparently, this no longer compiles when using the Ubuntu
10.04 libc6-dev headers (the current SDK toolchain is
based on Ubuntu 8.04), so perform an explicit include
to fix this.

NOTE: This doesn't break the Windows SDK build.

Change-Id: Idcacf8f8d1c606b39bf8aa75ab409aa0c2a3cd5a
2014-03-05 23:57:46 +01:00
Brian Carlstrom
485e3b4594 am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"
* commit '5c126c3d1703d8bef9a55dcc01f1fabf17811f60':
  Add dex2oat-flags plumbing to AndroidRuntime
2014-03-05 11:26:44 -08:00
Brian Carlstrom
5c126c3d17 Merge "Add dex2oat-flags plumbing to AndroidRuntime" 2014-03-05 19:23:48 +00:00
Brian Carlstrom
3beff1e023 Add dex2oat-flags plumbing to AndroidRuntime
Change-Id: Idaa7e5351e146d76e1972cbe4d93af69f0b999a6
2014-03-04 14:08:46 -08:00
Dave Platt
7d8262cb55 am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"
* commit '22f66b76f5e49704f3be76ad3fff7e4b5456864d':
  Harden NsdManager against null-dereference crashes
2014-03-04 13:59:57 -08:00
Dave Platt
22f66b76f5 Merge "Harden NsdManager against null-dereference crashes" 2014-03-04 21:55:56 +00:00
Dave Platt
3fc376b733 Harden NsdManager against null-dereference crashes
Due to race conditions or programming errors, the NsdManager
can attempt to process an asynchronous status message (and issue
a callback to the listener) after the listener has already been
removed from the NsdManager state.  This causes dereferencing of
null objects, and a crash.

Split out the three async-queue message cases:  these are ones
in which message.arg2 does not hold an NsdManager array index
and the code should not interpret this field as if it were.

Add an explicit check for "null listener" (the array index in the
message has already been released), log a warning, and exit early.

Safeguard accesses to the "NSD service type" string from a (possibly
null) NsdServiceInfo object... return a constant "?" string rather
than crashing.

Bug: 9016259

Change-Id: I40aabdfc65d86fdd0eaac7a1e7e56e6ff69796cf
2014-03-04 13:25:02 -08:00
Craig Mautner
7a93aa2fc2 am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task"
* commit 'a0b4d0ce471cf10888bac4d4ec5b97fd562ad756':
  Avoid duplication of AppWindowToken in created Task
2014-03-04 09:10:36 -08:00
Craig Mautner
a0b4d0ce47 Merge "Avoid duplication of AppWindowToken in created Task" 2014-03-04 15:19:17 +00:00
Yevgen Pronenko
c36a5b9c36 Avoid duplication of AppWindowToken in created Task
When WindowManagerService creates a new Task, it passes atoken to the
Task constructor. In this case atoken is added to mAppTokens list by
the Task constructor and then it is added manually again by calling
newTask.mAppTokens.add(atoken). As a result, the same atoken is present
in mAppTokens list twice.

When another window token is added to the list, it may be placed in
beetwen duplicated tokens and corresponding window will be hidden from
the screen by corresponding duplicated windows.
From user perspective it means that some windows will not be displayed
on the screen.

The issue is fixed by avoid adding atoken to mAppTokens list manually
when it was added already in Task constructor.

Change-Id: I10628e68186160fffdde07beb7d84ab3cecb7051
2014-03-04 15:07:34 +01:00
Victoria Lease
3ce2b57d15 am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families."
* commit '9404752d50a60319f0d2f53c212fad7c7cd8fb8e':
  Add casual/cursive/sans-serif-smallcaps font families.
2014-03-03 15:44:13 -08:00
Victoria Lease
9404752d50 Merge "Add casual/cursive/sans-serif-smallcaps font families." 2014-03-03 23:38:54 +00:00
Tim Murray
fb51a4301c am 8377a4fd: Merge "Fix null check for BaseObj.equals."
* commit '8377a4fd03d4fc367e0cb07af748ae941d9960a9':
  Fix null check for BaseObj.equals.
2014-03-03 11:12:01 -08:00
Tim Murray
8377a4fd03 Merge "Fix null check for BaseObj.equals." 2014-03-03 19:09:08 +00:00
Victoria Lease
2b96157f92 Add casual/cursive/sans-serif-smallcaps font families.
Bug: 12384866
Change-Id: I7482d228279a63ea92cb605de314b2f7d0ad483f
2014-03-03 08:50:46 -08:00
Ying Wang
26026c6278 am dd72b6e7: Merge "Fix indirect misuse of ."
* commit 'dd72b6e76c5d5e819809bd3d2ef4ff6f700af759':
  Fix indirect misuse of $(my-dir).
2014-03-01 09:27:42 -08:00
Ying Wang
dd72b6e76c Merge "Fix indirect misuse of $(my-dir)." 2014-03-01 17:25:10 +00:00
Ying Wang
f794d63425 Fix indirect misuse of $(my-dir).
Change-Id: I20a98a8e1378da3a53e6a6d599c8fc0100f7f87a
2014-02-28 18:04:37 -08:00
Tim Murray
78214c9531 Fix null check for BaseObj.equals.
Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f
2014-02-28 16:57:47 -08:00
Nick Kralevich
787d81453c am 4a794846: Merge "Fix descriptor leak after accepting connections"
* commit '4a79484648262d5d0dc9e72c3d9cf36c77cca599':
  Fix descriptor leak after accepting connections
2014-02-28 13:04:42 -08:00
Nick Kralevich
4a79484648 Merge "Fix descriptor leak after accepting connections" 2014-02-28 21:02:21 +00:00
Dave Platt
d75932b521 Fix descriptor leak after accepting connections
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.

(cherrypicked from 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d)

Bug: 11805817
Change-Id: I0a1a7c62ec3fbcf647a44a22110ddc778d14e5f4
2014-02-28 12:04:51 -08:00
Narayan Kamath
8fb22ae772 am eee2c72f: Merge "Various format string fixes for 64bit"
* commit 'eee2c72f96cd4e6228c50c8b461b4dd84a9f4538':
  Various format string fixes for 64bit
2014-02-28 05:45:01 -08:00
Narayan Kamath
eee2c72f96 Merge "Various format string fixes for 64bit" 2014-02-28 13:41:58 +00:00
Narayan Kamath
d138029d92 am 14420e29: Merge "AArch64: Use long[] for RS id array"
* commit '14420e29abc0f16f818ddaf606515861ba69ae68':
  AArch64: Use long[] for RS id array
2014-02-28 05:26:30 -08:00
Narayan Kamath
14420e29ab Merge "AArch64: Use long[] for RS id array" 2014-02-28 13:22:26 +00:00
Xavier Ducrohet
5e5602da5f am 0c72b769: Merge "Update layoutlib method for SystemClock"
* commit '0c72b76963f7f43a2f986c38831ce76b43c6275a':
  Update layoutlib method for SystemClock
2014-02-27 15:32:43 -08:00
Xavier Ducrohet
0c72b76963 Merge "Update layoutlib method for SystemClock" 2014-02-27 23:28:14 +00:00
Christopher Tate
41bfe121cf am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"
* commit '16678ac66f7e6d5ce414536b7534d1e823f7ab30':
  Fixed upgrading from forward-lock application to system application
2014-02-27 14:06:32 -08:00
Christopher Tate
16678ac66f Merge "Fixed upgrading from forward-lock application to system application" 2014-02-27 22:01:29 +00:00
Narayan Kamath
2525acf5a9 am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit 'e4dae5f2c26f5992a31f8ce15811fc082647ddb8':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-02-27 05:20:52 -08:00