45565 Commits

Author SHA1 Message Date
Greg Hackmann
69ad42a3cf am 1877f7dc: am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit '1877f7dc58d28146bd1907352cb46dbc95302cbb':
  Add /dev/rtc backend to SystemClock
2013-12-17 20:08:26 +00:00
Greg Hackmann
0b64fa7e4b am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit 'c978799c4a7cc8339d560bb47a029861230fa2a6':
  Add /dev/rtc backend to SystemClock
2013-12-17 10:15: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
1dfe799027 am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '8f90e47694b441941fdf5f17fcb9927ec23fb50b':
  Use StrictJarFile instead of JarFile for cert collection.
2013-12-16 15:26:41 +00:00
Narayan Kamath
28635ca3e3 am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '44291d9c2722e0d22dc6f909585f4302abdce205':
  Use StrictJarFile instead of JarFile for cert collection.
2013-12-16 07:20:26 -08:00
Narayan Kamath
44291d9c27 Merge "Use StrictJarFile instead of JarFile for cert collection." 2013-12-16 11:29:46 +00:00
Kenny Root
e0b14ea70b am 31b9ec01: am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API"
* commit '31b9ec01ff6087773cb35af6824a6422a0181afb':
  Use java.util.Objects instead on internal API
2013-12-13 22:23:33 +00:00
Kenny Root
62d509d24f am 37c69fdd: Merge "Use java.util.Objects instead on internal API"
* commit '37c69fdd826f3973966430adc1abfbefc19bc16e':
  Use java.util.Objects instead on internal API
2013-12-13 14:17:29 -08: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
800d4d722f am b90d8591: am 13b648eb: am 584ace0d: Merge "Fix one and hide the other warnings from core/jni"
* commit 'b90d8591343e1af176ff181e6bb343f739c037a6':
  Fix one and hide the other warnings from core/jni
2013-12-13 07:31:40 +00:00
Kristian Monsen
13b648ebff am 584ace0d: Merge "Fix one and hide the other warnings from core/jni"
* commit '584ace0d3f79ff43db9298798065dd5beaa66a45':
  Fix one and hide the other warnings from core/jni
2013-12-12 22:38:21 -08:00
Katie McCormick
9c514b8fe9 am 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
* commit '4561f1990def36aef17dbb35511a1522195e7f95':
  Doc update: Update package summary for BT.
2013-12-13 01:04:09 +00:00
Katie McCormick
08e0142fb7 am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
* commit 'f85470e6861e012c145dc04d70656757be611280':
  Doc update: Update package summary for BT.
2013-12-12 16:58:35 -08:00
Katie McCormick
f85470e686 am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
* commit 'fbbc1b791e0a26a56bc8d45622d06f06e020191a':
  Doc update: Update package summary for BT.
2013-12-13 00:55:59 +00:00
Katie McCormick
f2041ac56e Doc update: Update package summary for BT.
Fixes:

b/8584860

Change-Id: Ic85436f90b46508e6a182e3fc51365f5bfb8da14
2013-12-12 15:42:00 -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
Marco Nelissen
4f6a139493 am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"
* commit 'c680bab3315de2f6af14c1e9fcd3aaf63fa15848':
  Parse UUID string with Long.parseLong
2013-12-11 22:02:36 +00:00
Narayan Kamath
0bc3607c28 am 9f09408e: am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."
* commit '9f09408e3939c5afdb3f9dafc41afd249303ed7f':
  Reimplement ZipFileRO in terms of libziparchive.
2013-12-11 22:02:25 +00:00
Elliott Hughes
e2fbb2ac68 am d3dd83c6: am 5b9437df: am 4a72b306: Merge "fix possible buffer overrun and memory leak"
* commit 'd3dd83c67a216f91654aa7d007c92eb82f567528':
  fix possible buffer overrun and memory leak
2013-12-11 22:02:20 +00:00
Scott Main
5f41b262a5 am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
* commit 'aec930b2c6c7e9ad2a7808a1636f7c0fae0164af':
  rewrite intent guide and add doc with intents supported by platform apps
2013-12-11 22:02:15 +00:00
Marco Nelissen
69b4670730 am ce3bd309: Merge "Parse UUID string with Long.parseLong"
* commit 'ce3bd309b12e9552c05d5a59a06d7883618c5ca0':
  Parse UUID string with Long.parseLong
2013-12-11 10:14:56 -08:00
Marco Nelissen
ce3bd309b1 Merge "Parse UUID string with Long.parseLong" 2013-12-11 18:07:50 +00:00
Narayan Kamath
336bf2fb49 am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."
* commit 'd21752dff45c7d8856e63026cfddc303a302df14':
  Reimplement ZipFileRO in terms of libziparchive.
2013-12-11 03:45:58 -08:00
Narayan Kamath
d21752dff4 Merge "Reimplement ZipFileRO in terms of libziparchive." 2013-12-11 11:41:10 +00:00
Elliott Hughes
5b9437df99 am 4a72b306: Merge "fix possible buffer overrun and memory leak"
* commit '4a72b3064cecc85c56b8d75bb4a2d9fedbf76ec8':
  fix possible buffer overrun and memory leak
2013-12-10 17:35:25 -08:00
Elliott Hughes
4a72b3064c Merge "fix possible buffer overrun and memory leak" 2013-12-11 01:29:28 +00:00
Scott Main
f70d7b9ace am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
* commit 'cf5ed42f0b5f2b3787da39d19e9716d6b244b9b5':
  rewrite intent guide and add doc with intents supported by platform apps
2013-12-10 17:04:57 -08:00
Scott Main
cf5ed42f0b am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
* commit 'df75bdcc5546112958a6a5834c1a7e060f88bc68':
  rewrite intent guide and add doc with intents supported by platform apps
2013-12-11 01:00:46 +00:00
Scott Main
df75bdcc55 rewrite intent guide and add doc with intents supported by platform apps
Change-Id: Ida7ccbc693e7635198fd368b9560b7843266c7cc
2013-12-10 15:53:37 -08:00
Narayan Kamath
98f50502ea am 57b94b34: am ca9ba160: am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream."
* commit '57b94b34240aee641c0c2a415d79dbc27cf819af':
  Fix inconsistency in LoggingPrintStream.
2013-12-10 09:58:14 +00:00
Narayan Kamath
ca9ba160ae am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream."
* commit 'bea98dc245bad71eb3b5fd831218b3db1f75ee21':
  Fix inconsistency in LoggingPrintStream.
2013-12-10 01:50:59 -08:00
Narayan Kamath
bea98dc245 Merge "Fix inconsistency in LoggingPrintStream." 2013-12-10 09:30:57 +00:00
Mathieu Chartier
f2156ad2db am 6a58a2e7: am cb3ee4ed: am 3254260b: Merge "Update Dalvik process state through VMRuntime."
* commit '6a58a2e7e6d39180a130f3bff09aeb7afa6b1e3c':
  Update Dalvik process state through VMRuntime.
2013-12-10 02:30:45 +00:00
Mathieu Chartier
cb3ee4ed3e am 3254260b: Merge "Update Dalvik process state through VMRuntime."
* commit '3254260b8b55496468e2b897c76cadd9ecde508d':
  Update Dalvik process state through VMRuntime.
2013-12-09 18:24:29 -08:00
Mathieu Chartier
3254260b8b Merge "Update Dalvik process state through VMRuntime." 2013-12-10 02:18:06 +00:00
Craig Mautner
bdc748af8c DO NOT MERGE: Eliminate StackBox.
StackBox is too constraining. Adding size and position to TaskStacks
directly makes stack positioning and management more flexible and
prepares for ActivityView.

Change-Id: I33c6b4e1c23a5a8069fd507c160bcb34e4d287b2
2013-12-09 15:15:34 -08:00
Amith Yamasani
09e9cdcece DO NOT MERGE : Move some system services to their own sub package.
(Cherry pick from master)

As a next step they can be moved into separate directories to be
built as separate modules that may or may not be included in a
particular configuration.

Moves AppWidgetService, BackupManagerService, ClipboardService, DevicePolicyMS,
and WallpaperMS.

Change-Id: Idd92871c1828bdde81d85fe99a9c87a22d53169d
2013-12-09 15:14:41 -08:00
Mike Lockwood
e63f6f7c8d DO NOT MERGE: Remove obsolete "headless" support
Change-Id: I829fe48e6ebcb819e260646bb19ac6ddfcf07f83
2013-12-09 15:14:37 -08:00
Lorenzo Colitti
30253d7a64 am 2daa0c93: Merge "Add address flags and scope to LinkAddress."
* commit '2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2':
  Add address flags and scope to LinkAddress.
2013-12-09 10:28:19 -08: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
Ying Wang
babea8d8f2 am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit '6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41':
  wifi: Remove obsolete libwpa_client library
2013-12-05 12:29:12 -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
Brian Carlstrom
59595f7a3e am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
* commit '8026b2ce23396262ad1f1e7a75093cd0e2467d4b':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
2013-12-05 07:25:20 -08:00