OSDN Git Service
Narayan Kamath [Tue, 7 Jan 2014 12:54:35 +0000 (04:54 -0800)]
am
357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit '
357ea90515025d806c6360ef846bf6f84b45a64e':
AArch64: Use long for pointers in audio effect classes
Narayan Kamath [Tue, 7 Jan 2014 12:50:56 +0000 (04:50 -0800)]
am
74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '
74675f29133ff36dccc95387392bf3654dc94e15':
AArch64: Use long for pointers in AmrInputStream
Narayan Kamath [Tue, 7 Jan 2014 12:48:21 +0000 (12:48 +0000)]
Merge "AArch64: Use long for pointers in audio effect classes"
Ashok Bhat [Tue, 17 Dec 2013 12:42:00 +0000 (12:42 +0000)]
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>
Narayan Kamath [Tue, 7 Jan 2014 12:45:06 +0000 (12:45 +0000)]
Merge "AArch64: Use long for pointers in AmrInputStream"
Ashok Bhat [Tue, 17 Dec 2013 14:10:25 +0000 (14:10 +0000)]
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>
Narayan Kamath [Tue, 7 Jan 2014 10:05:39 +0000 (02:05 -0800)]
am
cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '
cf1aa551eed7be4310a386b9b9e458e46847207a':
XmlUtils#readThisMapXml should handle null keys.
Narayan Kamath [Tue, 7 Jan 2014 10:05:35 +0000 (02:05 -0800)]
am
7e296254: Merge "Fix broken XML parsing idiom."
* commit '
7e29625463e6034147c24992d0ad319ddf426088':
Fix broken XML parsing idiom.
Narayan Kamath [Tue, 7 Jan 2014 10:03:20 +0000 (10:03 +0000)]
Merge "XmlUtils#readThisMapXml should handle null keys."
Narayan Kamath [Tue, 7 Jan 2014 10:02:57 +0000 (10:02 +0000)]
Merge "Fix broken XML parsing idiom."
Conley Owens [Mon, 6 Jan 2014 23:38:05 +0000 (15:38 -0800)]
am
4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '
4440a8244ea4fdd7c63083bcd7d4b179e851c17a':
CompoundButton: Let text can be changed by config
Conley Owens [Mon, 6 Jan 2014 23:36:02 +0000 (23:36 +0000)]
Merge "CompoundButton: Let text can be changed by config"
Raph Levien [Mon, 6 Jan 2014 17:04:03 +0000 (09:04 -0800)]
am
a980c7aa: Merge "Re-initialize error after attach"
* commit '
a980c7aa3ec901b7c4201776a9a4e3a5fc3e50df':
Re-initialize error after attach
Raph Levien [Mon, 6 Jan 2014 17:00:49 +0000 (17:00 +0000)]
Merge "Re-initialize error after attach"
Narayan Kamath [Mon, 6 Jan 2014 11:31:35 +0000 (11:31 +0000)]
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
Narayan Kamath [Wed, 18 Dec 2013 15:19:17 +0000 (15:19 +0000)]
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
Craig Mautner [Thu, 19 Dec 2013 17:52:32 +0000 (09:52 -0800)]
am
cccf2a33: Merge "Keydispatching timeout while finish Activity"
* commit '
cccf2a333793badbcea9b04fe3f29447496a56d9':
Keydispatching timeout while finish Activity
Craig Mautner [Thu, 19 Dec 2013 17:48:58 +0000 (17:48 +0000)]
Merge "Keydispatching timeout while finish Activity"
Narayan Kamath [Thu, 19 Dec 2013 12:37:52 +0000 (04:37 -0800)]
am
f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
* commit '
f3172c623e4bb77a047262c6e7eedc4a2c2ea95a':
MediaDrm#mNativeContext is a long, not int.
Narayan Kamath [Thu, 19 Dec 2013 12:35:22 +0000 (12:35 +0000)]
Merge "MediaDrm#mNativeContext is a long, not int."
Martin Wallgren [Wed, 31 Aug 2011 10:39:31 +0000 (12:39 +0200)]
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
Brian Carlstrom [Thu, 19 Dec 2013 07:16:17 +0000 (23:16 -0800)]
am
a11371f4: Merge "Track Looper decoupling from ALooper"
* commit '
a11371f42b4dd793a48faa3323be34bca0f6d2e6':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:13:02 +0000 (07:13 +0000)]
Merge "Track Looper decoupling from ALooper"
Brian Carlstrom [Fri, 13 Dec 2013 07:12:55 +0000 (23:12 -0800)]
Track Looper decoupling from ALooper
Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
Tim Murray [Thu, 19 Dec 2013 01:45:37 +0000 (17:45 -0800)]
am
9dabdaec: Merge "Handle user-defined cache path for RS."
* commit '
9dabdaec39836fc800bbdd5ea7b85c3d06889307':
Handle user-defined cache path for RS.
Tim Murray [Thu, 19 Dec 2013 01:42:41 +0000 (01:42 +0000)]
Merge "Handle user-defined cache path for RS."
Tim Murray [Fri, 13 Dec 2013 20:57:36 +0000 (12:57 -0800)]
Handle user-defined cache path for RS.
Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
Stephen Hines [Thu, 19 Dec 2013 00:32:59 +0000 (16:32 -0800)]
am
7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit '
7f8c70a1a48df91ee5541b03dc380c08ab6ebf42':
DO NOT MERGE - Fix improper declaration/use of pointer.
Stephen Hines [Thu, 19 Dec 2013 00:30:25 +0000 (00:30 +0000)]
Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
Stephen Hines [Thu, 19 Dec 2013 00:21:30 +0000 (16:21 -0800)]
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
Narayan Kamath [Wed, 18 Dec 2013 18:08:58 +0000 (18:08 +0000)]
Merge "Remove unused field from MediaMuxer"
Narayan Kamath [Wed, 18 Dec 2013 17:51:06 +0000 (17:51 +0000)]
Remove unused field from MediaMuxer
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
Narayan Kamath [Wed, 18 Dec 2013 16:53:54 +0000 (16:53 +0000)]
MediaDrm#mNativeContext is a long, not int.
Therefore, we must use SetLongField and not SetIntField.
Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
Narayan Kamath [Wed, 18 Dec 2013 12:46:40 +0000 (12:46 +0000)]
Merge "Don't pseudolocalize untranslatable strings."
Greg Hackmann [Tue, 17 Dec 2013 18:11:06 +0000 (18:11 +0000)]
Merge "Add /dev/rtc backend to SystemClock"
Greg Hackmann [Tue, 17 Dec 2013 18:10:49 +0000 (18:10 +0000)]
Merge "Add timerfd backend to AlarmManagerService"
Greg Hackmann [Tue, 17 Dec 2013 18:10:32 +0000 (18:10 +0000)]
Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
Craig Mautner [Tue, 17 Dec 2013 16:36:44 +0000 (16:36 +0000)]
Merge "Fix to NullPointerException on move back in ActivityStack."
Daniel 2 Olofsson [Mon, 16 Dec 2013 12:24:25 +0000 (13:24 +0100)]
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
Greg Hackmann [Thu, 12 Dec 2013 02:00:34 +0000 (18:00 -0800)]
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>
Greg Hackmann [Tue, 10 Dec 2013 00:56:53 +0000 (16:56 -0800)]
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>
Elliott Hughes [Mon, 16 Dec 2013 20:58:01 +0000 (20:58 +0000)]
Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
Christopher Tate [Mon, 16 Dec 2013 20:44:33 +0000 (20:44 +0000)]
Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
Nick Kralevich [Mon, 16 Dec 2013 18:28:42 +0000 (18:28 +0000)]
Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
Robert Craig [Mon, 16 Dec 2013 14:42:51 +0000 (09:42 -0500)]
[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>
Mårten Kongstad [Tue, 26 Nov 2013 13:48:22 +0000 (14:48 +0100)]
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
Narayan Kamath [Mon, 16 Dec 2013 11:29:45 +0000 (11:29 +0000)]
Merge "Use StrictJarFile instead of JarFile for cert collection."
Daniel 2 Olofsson [Tue, 13 Aug 2013 08:30:26 +0000 (10:30 +0200)]
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
Jesse Hall [Sun, 15 Dec 2013 00:11:21 +0000 (00:11 +0000)]
Merge "Fix incorrect name in eglSwapBuffers log wrapper"
Kenny Root [Fri, 13 Dec 2013 22:12:52 +0000 (22:12 +0000)]
Merge "Use java.util.Objects instead on internal API"
Kenny Root [Fri, 13 Dec 2013 20:00:26 +0000 (12:00 -0800)]
Use java.util.Objects instead on internal API
Not needed since java.util.Objects implements all the needed
functionality.
Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
Narayan Kamath [Thu, 12 Dec 2013 16:54:33 +0000 (16:54 +0000)]
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
Kristian Monsen [Fri, 13 Dec 2013 06:32:03 +0000 (06:32 +0000)]
Merge "Fix one and hide the other warnings from core/jni"
Kenny Root [Fri, 13 Dec 2013 01:08:26 +0000 (01:08 +0000)]
Merge "Add GCMParameterSpec to preloaded-classes"
Kenny Root [Fri, 13 Dec 2013 00:37:45 +0000 (16:37 -0800)]
Add GCMParameterSpec to preloaded-classes
Needed for Bouncycastle 1.50 upgrade with art.
Change-Id: I901122c1ce21abba437a7537e70331724c3cbc9c
Greg Hackmann [Fri, 6 Dec 2013 18:52:09 +0000 (10:52 -0800)]
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Change-Id: I64da1437dd0ed30957b43450c72b9d3797112a2e
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Kristian Monsen [Thu, 12 Dec 2013 03:46:41 +0000 (19:46 -0800)]
Fix one and hide the other warnings from core/jni
Most of the warnings are unused parameter from skia functions.
Change-Id: I9df57718d117c26b96163f751ccb056ca86ac072
Nick Kralevich [Wed, 11 Dec 2013 21:46:08 +0000 (21:46 +0000)]
Merge "Don't try to set service.bootanim.exit"
Nick Kralevich [Wed, 11 Dec 2013 21:10:55 +0000 (13:10 -0800)]
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
Marco Nelissen [Wed, 11 Dec 2013 18:07:50 +0000 (18:07 +0000)]
Merge "Parse UUID string with Long.parseLong"
Narayan Kamath [Wed, 11 Dec 2013 17:36:20 +0000 (17:36 +0000)]
Merge "Add libutils dependency for libandroidfw host build."
Narayan Kamath [Wed, 11 Dec 2013 16:48:07 +0000 (16:48 +0000)]
Add libutils dependency for libandroidfw host build.
Change-Id: I7fe0bb466f0b1cdbfef8934da2231ad20f05b648
Narayan Kamath [Wed, 11 Dec 2013 11:41:10 +0000 (11:41 +0000)]
Merge "Reimplement ZipFileRO in terms of libziparchive."
Elliott Hughes [Wed, 11 Dec 2013 01:29:27 +0000 (01:29 +0000)]
Merge "fix possible buffer overrun and memory leak"
Brian Harris [Tue, 10 Dec 2013 23:23:51 +0000 (15:23 -0800)]
Fix incorrect name in eglSwapBuffers log wrapper
Correctly identify eglSwapBuffers in EGLLogWrapper, which had been
labeled as "eglInitialize".
Change-Id: I67c61e100e2f84400ceebc28712f036e5a055017
Ashok Bhat [Thu, 28 Nov 2013 10:56:06 +0000 (10:56 +0000)]
AArch64: Use long for pointers in MediaDrm and MediaMuxer
For storing pointers, long is used in MediaDrm and
MediaMuxer classes, as native pointers can be 64-bit.
Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Narayan Kamath [Tue, 10 Dec 2013 09:49:59 +0000 (09:49 +0000)]
Don't pseudolocalize untranslatable strings.
bug: https://code.google.com/p/android/issues/detail?id=63004
Change-Id: I8e47a53d887144dc867111e42313d0e113b83ea1
Narayan Kamath [Tue, 10 Dec 2013 09:30:56 +0000 (09:30 +0000)]
Merge "Fix inconsistency in LoggingPrintStream."
Mathieu Chartier [Tue, 10 Dec 2013 02:13:51 +0000 (02:13 +0000)]
Merge "Update Dalvik process state through VMRuntime."
Kenny Root [Mon, 9 Dec 2013 22:28:59 +0000 (22:28 +0000)]
Merge changes Ib4450c39,Ie7ed5655
* changes:
preloaded-classes: remove some OpenSSLCipher modes
Add CertStoreParameters to preloaded-classes
Kenny Root [Mon, 9 Dec 2013 22:01:54 +0000 (14:01 -0800)]
preloaded-classes: remove some OpenSSLCipher modes
Some cipher modes were removed from OpenSSLCipher. This change removes
those classes from the preloaded classes list.
Change-Id: Ib4450c392513973836684b4d5df7fffb200b6260
Kenny Root [Mon, 9 Dec 2013 21:49:27 +0000 (13:49 -0800)]
Add CertStoreParameters to preloaded-classes
For image creating, art needs this in the preloaded-classes list.
Otherwise it complains loudly about not being able to load it from a
class initializer in Provider.java.
Change-Id: Ie7ed5655cba038b504767c3de9f70b47a8965cce
Narayan Kamath [Tue, 3 Dec 2013 13:16:03 +0000 (13:16 +0000)]
Reimplement ZipFileRO in terms of libziparchive.
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).
This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.
One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).
bug:
10193060
Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
Narayan Kamath [Mon, 9 Dec 2013 11:09:21 +0000 (11:09 +0000)]
Fix inconsistency in LoggingPrintStream.
LoggingPrintStream prints "null" for null strings from
print(String) but throws an NPE from println(String).
Fix this by delegating to the underlying builder (and avoiding
the "fast" path when the input String == null)
bug: https://code.google.com/p/android/issues/detail?id=63380
Change-Id: I89c5c12db6ed5af8037d46f67369b38c5b4cbc9f
Lorenzo Colitti [Sat, 7 Dec 2013 02:43:02 +0000 (02:43 +0000)]
Merge "Add address flags and scope to LinkAddress."
Tom Marshall [Fri, 6 Dec 2013 20:04:25 +0000 (21:04 +0100)]
Parse UUID string with Long.parseLong
Integer.parseInt throws an NPE for values greater than 0x7fffffff.
Nick Kralevich [Fri, 6 Dec 2013 16:17:23 +0000 (08:17 -0800)]
am
f7422885: Merge "Augment SELinuxMMAC functionality."
* commit '
f7422885a99c5d240f70c2f8227ae44abeea3e5c':
Augment SELinuxMMAC functionality.
Nick Kralevich [Fri, 6 Dec 2013 16:13:58 +0000 (16:13 +0000)]
Merge "Augment SELinuxMMAC functionality."
Robert Craig [Mon, 2 Dec 2013 15:24:23 +0000 (10:24 -0500)]
Augment SELinuxMMAC functionality.
* No longer support a package name stanza outside of
a signature tag. Package names, by themselves, have
no security associated with them in Android and thus we
should not be allowing or encouraging this
type of policy.
* Allow for nested package name stanzas inside
signature stanzas. There are cases where a finer
distinction needs to be made among apps signed with
the same cert. New code allows a different seinfo
tag to be assigned to the listed package names
signed by the parent cert. When a determination needs
to be made concerning seinfo assignments, the inner
seinfo tag takes precedence over the outer seinfo
labels which are assigned to just the signature.
* Temp structures are now used to parse new policy files
until the entire xml file is parsed and deemed correct,
at which time the temp structures are copied over to the
permanent class structures. This ensures that any structural
errors with the policy will not result in partial loads.
* Valid stanzas look like the following with the inner
package piece being optional.
<signer signature="">
<seinfo value=""/>
<package name="">
<seinfo value=""/>
</package>
<signer>
<default>
<seinfo value=""/>
</default>
Change-Id: Ia204d71211776dcf9b2dcc86ad6d77c4ad39dc25
Lorenzo Colitti [Fri, 15 Nov 2013 09:43:52 +0000 (18:43 +0900)]
Add address flags and scope to LinkAddress.
This is necessary so that the framework can know whether an IPv6
address is likely to be usable (i.e., if it's global scope and
preferred). Also, it will simplify the address notification
methods in INetworkManagementEventObserver, which currently take
the address, the flags, and the scope as separate arguments.
1. Add flags and scope to the class and update the unit test.
Use the IFA_F_* and RT_SCOPE_* constants defined by libcore.
Since most callers don't know about flags and scope, provide
constructors that default the flags to zero and determine the
scope from the address. Addresses notified by the kernel will
have these properly set. Make multicast addresses invalid.
Update the class documentation.
2. Provide an isSameAddressAs() method that compares only the
address and prefix information between two LinkAddress
objects. This is necessary because an interface can't have
two addresses with the same address/prefix but different
flags.
3. Update LinkProperties's addLinkAddress and removeLinkAddress
to identify existing addresses to add/remove using
isSameAddressAs instead of implicit equals(). Specifically:
- If addLinkAddress is called with an address that is already
present, the existing address's flags and scope are updated.
This allows, for example, an address on an interface to go
from preferred to deprecated when it expires, without it
having to be removed and re-added.
- If removeLinkAddress is called with an address that is
present but with different flags, it deletes that address
instead of failing to find a match.
4. Update the INetworkManagementEventObserver address
notification methods to take just a LinkAddress instead of
LinkAddress, flags, and scope. While I'm at it, change the
order of the arguments for consistency with the other
functions in the interface.
Change-Id: Id8fe0f09a7e8f6bee1ea3b52102178b689a9336e
The Android Open Source Project [Thu, 5 Dec 2013 21:10:46 +0000 (13:10 -0800)]
Merge commit '
bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
Ying Wang [Thu, 5 Dec 2013 19:13:20 +0000 (19:13 +0000)]
Merge "wifi: Remove obsolete libwpa_client library"
Dmitry Shmidt [Fri, 22 Nov 2013 23:50:23 +0000 (15:50 -0800)]
wifi: Remove obsolete libwpa_client library
Change-Id: I222c60ec65375768dc62f9219d115b5b09a374f6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ying Wang [Thu, 5 Dec 2013 17:39:59 +0000 (17:39 +0000)]
Merge "libcore_to_document and junit_to_document are no longer functions."
Brian Carlstrom [Thu, 5 Dec 2013 06:20:48 +0000 (06:20 +0000)]
Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
Mathieu Chartier [Thu, 5 Dec 2013 01:32:43 +0000 (17:32 -0800)]
Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
Since VMRuntime.newNonMovableArray and VMRuntime.addressOf are java
methods implemented in Native, they don't necessarily return NULL
when an exception is thrown. Checking the exception instead of the
return value fixes errors which may occur if the runtime returns
garbage when an exception is pending.
Bug:
11971220
Change-Id: I70478834c9f14cc5d9e666e1e174d3fd09269719
John Huang [Thu, 5 Dec 2013 00:59:35 +0000 (00:59 +0000)]
Merge "RIL changes for supporting generic SIM communication."
Ying Wang [Thu, 5 Dec 2013 00:01:06 +0000 (16:01 -0800)]
libcore_to_document and junit_to_document are no longer functions.
They are evaluated only once in the corresponding export .mk file.
This fixes build log spam reported in:
https://code.google.com/p/android/issues/detail?id=63184
Change-Id: I549eb052272bbdebef8fca697822f5eaa0fe5764
Lorenzo Colitti [Wed, 4 Dec 2013 01:21:07 +0000 (01:21 +0000)]
Merge "Minor changes to LinkAddress."
Lorenzo Colitti [Wed, 27 Nov 2013 06:03:10 +0000 (15:03 +0900)]
Minor changes to LinkAddress.
1. Simplify the parceling code. Since the InetAddress inside a
LinkAddress can never be null, we don't need to special-case
the case where it is.
2. Add / update method documentation.
3. Write a unit test.
Change-Id: Iba0a8cecc683d55d736419965e72ee33dd66dc22
Mathieu Chartier [Mon, 2 Dec 2013 23:53:10 +0000 (23:53 +0000)]
Merge "Add dalvik.vm.gctype to enable switching between different GCs."
Mathieu Chartier [Mon, 2 Dec 2013 23:46:51 +0000 (15:46 -0800)]
Add dalvik.vm.gctype to enable switching between different GCs.
The option passes the specified GC type into the Xgc runtime
option.
Currently the three different supported GC types are MS, CMS, SS
which represent mark-sweep, concurrent mark-sweep, mark-sweep +
semi-space hybrid.
Change-Id: I6ad95c8d12c0d1158f7c861ff0c3180761619172
Nick Kralevich [Mon, 2 Dec 2013 20:00:28 +0000 (20:00 +0000)]
Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver."
Stephen Smalley [Mon, 2 Dec 2013 19:38:31 +0000 (14:38 -0500)]
Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
It never worked anyhow, at least in AOSP, as nothing checks that property,
and is pointless now that enforcing mode is set by init.
Change-Id: If05dd49963c5d7081e00039b5e378032bea0939b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Shishir Agrawal [Thu, 28 Nov 2013 00:26:20 +0000 (16:26 -0800)]
RIL changes for supporting generic SIM communication.
Adds the 4 new commands to RIL interface:
- RIL_REQUEST_SIM_TRANSMIT_BASIC (AT+CSIM - TS 27.007)
- RIL_REQUEST_SIM_OPEN_CHANNEL (AT+CCHO - TS 27.007)
- RIL_REQUEST_SIM_CLOSE_CHANNEL (AT+CCHC - TS 27.007)
- RIL_REQUEST_SIM_TRANSMIT_CHANNEL (AT+CGLA - TS 27.007)
Change-Id: Iee4d950d37a6097493cd945e611c914c40827215
Lorenzo Colitti [Wed, 27 Nov 2013 00:52:41 +0000 (00:52 +0000)]
Merge "Use LinkAddress in address notifications."
Jason Sams [Tue, 26 Nov 2013 20:23:44 +0000 (20:23 +0000)]
Merge "Adding operations to reflected Renderscript class"
Dan Sandler [Tue, 26 Nov 2013 15:27:33 +0000 (15:27 +0000)]
Merge "Keep PhoneStatusBar default constructor around."
John Spurlock [Mon, 23 Sep 2013 15:15:11 +0000 (11:15 -0400)]
Keep PhoneStatusBar default constructor around.
By keeping the entire class safe.
Cherry picked because the device will otherwise be unusable
if compiled with proguard 4.10.
(cherry picked from commit
af568530203dc2ee59f5fda4895d28b29dd92226)
Change-Id: I0b880f382101f737511bc6db96c604f43ed8d266
Lorenzo Colitti [Sun, 17 Nov 2013 06:05:02 +0000 (15:05 +0900)]
Use LinkAddress in address notifications.
Currently address{Updated,Removed} pass in the address as a
string such as "fe80::1/64". Use LinkAddresses instead, since
that's what it is.
This makes the code more robust in the unlikely case that netd
passes in an invalid string. In the future we can move flags and
scope into the LinkAddress itself and simplify the code further.
Bug:
9180552
Change-Id: I66599f9529cf421caa7676fdd0141bb110b8589e