117651 Commits

Author SHA1 Message Date
Ashok Bhat
ea7861c918 AArch64: Use long for pointers in audio effect classes
For storing pointers, long is used in AudioEffect
and Visualizer classes, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:47:51 +00:00
Narayan Kamath
74675f2913 Merge "AArch64: Use long for pointers in AmrInputStream" 2014-01-07 12:45:06 +00:00
Ashok Bhat
b348c3fd87 AArch64: Use long for pointers in AmrInputStream
For storing pointers, long is used in AmrInputStream
class, as native pointers can be 64-bit.

Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-07 12:44:38 +00:00
Narayan Kamath
cf1aa551ee Merge "XmlUtils#readThisMapXml should handle null keys." 2014-01-07 10:03:21 +00:00
Narayan Kamath
7e29625463 Merge "Fix broken XML parsing idiom." 2014-01-07 10:02:57 +00:00
Conley Owens
4440a8244e Merge "CompoundButton: Let text can be changed by config" 2014-01-06 23:36:03 +00:00
Raph Levien
a980c7aa3e Merge "Re-initialize error after attach" 2014-01-06 17:00:49 +00:00
Narayan Kamath
2ac3cb7aef Fix broken XML parsing idiom.
Code that expected a single top level element in an XML file
was doing something like :

while (type != START_TAG) { next(); }

This would loop forever when the XML being parsed was empty,
where each call to XmlPullParser.next() would return END_DOCUMENT.

bug: https://code.google.com/p/android/issues/detail?id=64173
Change-Id: I7543203e976a8999ae471a6c2d629249a87011bb
2014-01-06 11:31:35 +00:00
Narayan Kamath
f748257eee XmlUtils#readThisMapXml should handle null keys.
Both readThisValueXml & writeThisValueXml have been
implemented to handle values with "null" names.

Change readThisMapXml to allow such names as well, and
map them to the null key in the resulting HashMap.
readThisListXml and readThisSetXml already support
null names.

bug: https://code.google.com/p/android/issues/detail?id=63463

Change-Id: I1c93976656e45e7733113eb67d29b6bad5d25f1f
2014-01-06 11:18:21 +00:00
Craig Mautner
cccf2a3337 Merge "Keydispatching timeout while finish Activity" 2013-12-19 17:48:58 +00:00
Narayan Kamath
f3172c623e Merge "MediaDrm#mNativeContext is a long, not int." 2013-12-19 12:35:24 +00:00
Martin Wallgren
c8733b818d Keydispatching timeout while finish Activity
If there is input to be handled during finish activity we can get a
keydispatching timeout ANR. The reason is that finish activity is some
times not possible, and the activity is instead put on a finish queue.
The activity will then be finished sometime in the future. When we add
the activity to the finish queue, key dispatching is paused, and there
is an ANR timer waiting for it to be resumed again. Since it can take a
long time before the activity is actually finished, we need to resume
the key dispatching to avoid the ANR.

Change-Id: Icea4ab3b5ad05c8bfbadf8f5cece1a59ec621469
2013-12-19 13:24:00 +01:00
Brian Carlstrom
a11371f42b Merge "Track Looper decoupling from ALooper" 2013-12-19 07:13:02 +00:00
Brian Carlstrom
82b007d757 Track Looper decoupling from ALooper
Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
2013-12-18 17:56:35 -08:00
Tim Murray
9dabdaec39 Merge "Handle user-defined cache path for RS." 2013-12-19 01:42:41 +00:00
Tim Murray
804ff38bff Handle user-defined cache path for RS.
Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
2013-12-18 17:04:04 -08:00
Stephen Hines
7f8c70a1a4 Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 2013-12-19 00:30:26 +00:00
Stephen Hines
57cf560719 DO NOT MERGE - Fix improper declaration/use of pointer.
https://code.google.com/p/android/issues/detail?id=61547

This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.

Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
2013-12-18 16:24:21 -08:00
Narayan Kamath
be8fbb8fb6 Merge "Remove unused field from MediaMuxer" 2013-12-18 18:08:58 +00:00
Narayan Kamath
535daa191b Remove unused field from MediaMuxer
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
2013-12-18 17:58:11 +00:00
Narayan Kamath
f11dd63e0c MediaDrm#mNativeContext is a long, not int.
Therefore, we must use SetLongField and not SetIntField.

Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
2013-12-18 16:58:36 +00:00
Narayan Kamath
3da645f307 Merge "Don't pseudolocalize untranslatable strings." 2013-12-18 12:46:41 +00:00
Greg Hackmann
c978799c4a Merge "Add /dev/rtc backend to SystemClock" 2013-12-17 18:11:06 +00:00
Greg Hackmann
eb0ca2b7bf Merge "Add timerfd backend to AlarmManagerService" 2013-12-17 18:10:49 +00:00
Greg Hackmann
9f4e67c50b Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 2013-12-17 18:10:33 +00:00
Craig Mautner
f431daa228 Merge "Fix to NullPointerException on move back in ActivityStack." 2013-12-17 16:36:45 +00:00
Daniel 2 Olofsson
9cdf9e52d9 Fix to NullPointerException on move back in ActivityStack.
In ActivityTask.moveTaskToBackLocked NullPointerException may occur
when moving back with only current Activity in stack. This due to a
condition that may trigger despite a TaskRecord being null and then
attempt accessing the TaskRecord.mOnTopOfHome variable.

TaskRecord task may be set to null when no resumed activity remain.

Resolved by assuring that flag mOnTopOfHome is instead set to false
for current TaskRecord in case where there are no remaining activities
above home.

The above bug has already been corrected in the following commit,
ada62fca51d314cefe2c5da4e007df5b9abf320d, but it does not set the
cottect value to mTopOfHome for the current taks, see below.

Variable mOnTopOfHome will not be set to false in situations where
stack is of size 1 or less and task is null, perhaps from already
having finished current activity.

To avoid current TaskRecord maintaining value mOnTopOfHome to true
after launching Home this variable is set to false.

Impact should not be major due to correction earlier that makes sure
that there is always a TaskRecord.mOnTopOfHome set to true above Home
activity but if not correctly set for current task still gives a
possibility of bad behavior.

Change-Id: Ie86ad99c188aaa05b0de9d58eaa16c42b6fc4341
2013-12-17 11:35:23 +01:00
Greg Hackmann
b7bbca2d6a Add /dev/rtc backend to SystemClock
On devices without /dev/alarm, use the settimeofday() syscall and the
standard RTC_SET_TIME ioctl (which are collectively equivalent to the
ANDROID_ALARM_SET_RTC ioctl).

Change-Id: I3c1d741099e253186e43c9369b62603b214b9c9a
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-16 16:23:52 -08:00
Greg Hackmann
a1d6f92f34 Add timerfd backend to AlarmManagerService
On devices without /dev/alarm, use a new backend based on timerfd.
timerfd has near-equivalent syscalls for the /dev/alarm ioctls we care
about, with two key differences:

1) /dev/alarm uses one fd for all clocks, while timerfd needs one fd per
clock type.

AlarmManagerService addresses this by replacing the fd (int) with an
opaque pointer (long) to the backend-specific state.

2) When the RTC changes, the /dev/alarm WAIT ioctl always returns, while
timerfd cancels (and signals events) only on specially-flagged RTC
timerfds.

The timerfd backend masks this by creating an extraneous RTC timerfd,
specifically so there's always something to signal on RTC changes.

Change-Id: I5aef867748298610347f6e1479dd8bf569495832
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-16 16:23:51 -08:00
Elliott Hughes
5d6332e374 Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 2013-12-16 20:58:02 +00:00
Christopher Tate
6040bd47f4 Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 2013-12-16 20:44:33 +00:00
Nick Kralevich
3ddee4dec9 Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 2013-12-16 18:28:42 +00:00
Robert Craig
cee6a096b1 [bootanimation] Drop user loadable bootanimation.zip abiltiy.
A prior change removed the ability of
the shell to push to /data/local. Because
of this, the bootanimation code no longer
supports users loading custom bootanimation.zip
files. This patch drops the access attempt
from the code.

Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-12-16 09:42:51 -05:00
Mårten Kongstad
4482e7cb67 Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
In commit 08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly
changed to assign the same value to both CONFIG_MCC and CONFIG_MNC:
    - CONFIG_MCC = 0x0001,
    - CONFIG_MNC = 0x0002,
    + CONFIG_MCC = ACONFIGURATION_MCC,
    + CONFIG_MNC = ACONFIGURATION_MCC,

This commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as
intended.

Change-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970
2013-12-16 12:42:36 +01:00
Narayan Kamath
44291d9c27 Merge "Use StrictJarFile instead of JarFile for cert collection." 2013-12-16 11:29:46 +00:00
Daniel 2 Olofsson
f4ecc55657 Re-initialize error after attach
If flag for error after attach is not reinitialized, it may cause
NullPointerException on subsequent onAttachedWindow if error text
was reset to null.

Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
2013-12-16 11:05:42 +01:00
Jesse Hall
a0ab49bb52 Merge "Fix incorrect name in eglSwapBuffers log wrapper" 2013-12-15 00:11:21 +00:00
Kenny Root
37c69fdd82 Merge "Use java.util.Objects instead on internal API" 2013-12-13 22:12:52 +00:00
Kenny Root
e6585b32ea Use java.util.Objects instead on internal API
Not needed since java.util.Objects implements all the needed
functionality.

Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
2013-12-13 13:40:30 -08:00
Narayan Kamath
1f0299a9cb Use StrictJarFile instead of JarFile for cert collection.
This ensures that we use the same underlying zip
processing code as the runtimes.

bug: 10193060

(cherry picked from commit eb565dc527eda8c0a43df0d1f30132638ca4ba20)

Change-Id: Iaaa26b02678278394619d0a41613d9ceeae3203c
2013-12-13 16:21:58 +00:00
Kristian Monsen
584ace0d3f Merge "Fix one and hide the other warnings from core/jni" 2013-12-13 06:32:03 +00:00
Kenny Root
fc2f459c52 Merge "Add GCMParameterSpec to preloaded-classes" 2013-12-13 01:08:26 +00:00
Kenny Root
e1263de835 Add GCMParameterSpec to preloaded-classes
Needed for Bouncycastle 1.50 upgrade with art.

Change-Id: I901122c1ce21abba437a7537e70331724c3cbc9c
2013-12-13 00:40:00 +00:00
Greg Hackmann
32b4c0779e Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Change-Id: I64da1437dd0ed30957b43450c72b9d3797112a2e
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-12 12:53:32 -08:00
Kristian Monsen
f5fabdf83d Fix one and hide the other warnings from core/jni
Most of the warnings are unused parameter from skia functions.

Change-Id: I9df57718d117c26b96163f751ccb056ca86ac072
2013-12-11 21:58:53 -08:00
Nick Kralevich
efa5c88f37 Merge "Don't try to set service.bootanim.exit" 2013-12-11 21:46:08 +00:00
Nick Kralevich
e58d09a552 Don't try to set service.bootanim.exit
init has never allowed the bootanimation code to
set service.bootanim.exit, and has always generated the
dmesg error message

  <3>[   17.644615] init: sys_prop: permission denied uid:1003  name:service.bootanim.exit

Since setting this property has no effect and never worked, delete
the code which tries to do it.

Change-Id: Idacc5467d85479a8cf974702af8895011be585ea
2013-12-11 13:10:55 -08:00
Marco Nelissen
ce3bd309b1 Merge "Parse UUID string with Long.parseLong" 2013-12-11 18:07:50 +00:00
Narayan Kamath
bb349cdb09 Merge "Add libutils dependency for libandroidfw host build." 2013-12-11 17:36:20 +00:00
Narayan Kamath
070274ec0c Add libutils dependency for libandroidfw host build.
Change-Id: I7fe0bb466f0b1cdbfef8934da2231ad20f05b648
2013-12-11 16:48:07 +00:00