45507 Commits

Author SHA1 Message Date
Narayan Kamath
842d44ec17 Hide AssetInputStream.getAssetInt.
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.

(cherry picked from commit f8f09a15a409f373f22aa475bb0defd264088e4f)

Change-Id: I9c9b5bae6db8638e65dda60f924aa3dddd06813a
2014-01-14 09:34:00 +00:00
Christopher Tate
35b7de4c45 Merge "Cursor leakage due to cancellation signal" 2014-01-09 20:41:26 +00:00
Wink Saville
76d5cdd820 Merge "telephony: Add same named operator configuration for some operators" 2014-01-08 19:25:11 +00:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Ashok Bhat
58b8b24256 AArch64: Use long for pointers in App/Backup
For storing pointers, long is used, 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: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
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-08 11:54:01 +00:00
Ashok Bhat
738702d28a AArch64: Use long for pointers
For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.

Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
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-08 11:53:21 +00:00
Ashok Bhat
4838e33812 AArch64: Use long for pointers in hardware classes
For storing pointers, long is used in hardware 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: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
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-08 10:17:21 +00:00
Robert Greenwalt
517e9b11d5 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 2014-01-08 00:38:29 +00:00
Ian Rogers
f11dee7971 Merge "Add a call to registerAppInfo for the VMRuntime" 2014-01-07 21:31:18 +00:00
Ashok Bhat
27285821b7 AArch64: Use long for pointers in DisplayEventReceiver
For storing pointers, long is used 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: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-07 12:48:43 +00:00
Narayan Kamath
cf1aa551ee Merge "XmlUtils#readThisMapXml should handle null keys." 2014-01-07 10:03:21 +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
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
Peter Eliasson
55eda43af9 Cursor leakage due to cancellation signal
If a query call was cancelled, the cursor adaptor might leak. The
adaptor is now closed if any exception is thrown during query.

Change-Id: Ic4c2edeaf2fcef56b4ef59484a36d3233aa12dbc
2013-12-19 09:08:05 +01:00
Brian Carlstrom
82b007d757 Track Looper decoupling from ALooper
Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
2013-12-18 17:56:35 -08:00
Dave Allison
24bafbc933 Add a call to registerAppInfo for the VMRuntime
This calls into the VMRuntime tells it where the
application directory is located.

Bug: 11539952
Change-Id: I20e0b8c63e459699a1bc9af435e65ae96f1e1e73
2013-12-18 17:01:37 -08:00
Greg Hackmann
c978799c4a Merge "Add /dev/rtc backend to SystemClock" 2013-12-17 18:11:06 +00: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
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
Sungmin Choi
74435010c4 Revert "Do not show roaming icon for Videotron operator when access Canada network"
This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
2013-12-16 07:46:07 +00:00
Sungmin Choi
054379313d telephony: Add same named operator configuration for some operators
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
2013-12-16 09:18:13 +09: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
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
Marco Nelissen
ce3bd309b1 Merge "Parse UUID string with Long.parseLong" 2013-12-11 18:07:50 +00:00
Narayan Kamath
d21752dff4 Merge "Reimplement ZipFileRO in terms of libziparchive." 2013-12-11 11:41:10 +00:00
Elliott Hughes
4a72b3064c Merge "fix possible buffer overrun and memory leak" 2013-12-11 01:29:28 +00:00
Narayan Kamath
bea98dc245 Merge "Fix inconsistency in LoggingPrintStream." 2013-12-10 09:30:57 +00:00
Mathieu Chartier
3254260b8b Merge "Update Dalvik process state through VMRuntime." 2013-12-10 02:18:06 +00:00
Narayan Kamath
afd31e0829 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
2013-12-09 16:23:16 +00:00
Narayan Kamath
b0c7c914eb 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
2013-12-09 11:21:26 +00:00
Lorenzo Colitti
2daa0c93c4 Merge "Add address flags and scope to LinkAddress." 2013-12-07 02:43:04 +00:00
Tom Marshall
17d5c1b181 Parse UUID string with Long.parseLong
Integer.parseInt throws an NPE for values greater than 0x7fffffff.
2013-12-06 21:04:25 +01:00
Lorenzo Colitti
64483947fd 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
2013-12-06 13:54:35 +09:00
The Android Open Source Project
ebcb32f58a Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
2013-12-05 13:10:46 -08:00
Dmitry Shmidt
2a69b17309 wifi: Remove obsolete libwpa_client library
Change-Id: I222c60ec65375768dc62f9219d115b5b09a374f6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-12-05 10:50:48 -08:00
Mathieu Chartier
a1a19d28d0 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
2013-12-04 17:58:37 -08:00
Lorenzo Colitti
e1ad1849f3 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
2013-12-03 19:46:36 +09:00
Mathieu Chartier
7e4fdec6f0 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
2013-12-02 15:50:18 -08:00
Lorenzo Colitti
5ad421a3d0 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
2013-11-26 21:55:15 +09:00
Mathieu Chartier
1e37090caa Update Dalvik process state through VMRuntime.
We now update Dalvik's process state through VMRuntime when the
process state changes in ActivityThread. This is used to determine
when to do trimming and will be used to determine when to do
compaction in the near future.

Bug: 8981901

Change-Id: I5eea272ba4ec2d1ed789b058d6457cb3c1fcf777
2013-11-25 17:03:40 -08:00
Lorenzo Colitti
5ae4a531cc Pass DNS server info notifications to observers.
These are sent if the device receives IPv6 Router Advertisements
with DNS server configuration options. Currently, nothing listens
to them; in a future change we will use them as IPv6 DNS servers.

[Cherry-pick of 416740ad4d9132005a71dc0883334e852235a18a]

Bug: 9180552
Change-Id: I05000c0cd3867a68ab390102e8470b6912a9d3aa
2013-11-25 17:27:17 +09:00
The Android Open Source Project
dbccd44a63 Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
2013-11-22 11:18:57 -08:00
Robert Greenwalt
ecfae4f899 am a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"
* commit 'a4c8fabfbb0bf5bf9da5267c13230c5169b5943d':
  fix ethernet and wifi can't be tuned seperately issue
2013-11-21 18:02:00 -08:00
Wink Saville
044bc25fb5 am 67979256: am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev
* commit '67979256865f63330a1352e450e26baf24e914ec':
  Add config_restartRadioAfterProvisioning
2013-11-15 11:42:55 -08:00
Wink Saville
6797925686 am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev
* commit '31cab2f803951edb13ea07e7e34916189fec5167':
  Add config_restartRadioAfterProvisioning
2013-11-15 11:39:16 -08:00
Wink Saville
31cab2f803 Merge "Add config_restartRadioAfterProvisioning" into klp-dev 2013-11-15 19:35:05 +00:00
Wink Saville
9124d56acc Add config_restartRadioAfterProvisioning
Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
2013-11-15 08:27:53 -08:00