Commit Graph

32576 Commits

Author SHA1 Message Date
Mark Doliner
879ea451ce Fix documentation for Parcel.readException().
The old documentation was kind of useless and not clear, so this is an
improvement.

In addition to this change, I think this method should probably be private
instead of public, especially since the values for code are private. But it's
too late to change that now. Also the method name is pretty poor, since it's
not actually reading anything. Something like "throwException" would be more
appropriate.

I'm open to suggestions on how to improve this situation. Maybe mark the
method as deprecated with a comment that it will be made private in the
future?

Change-Id: I830f2bcf606714bd130d8c953aa33974b33c9a83
2014-01-02 12:38:07 -08:00
Narayan Kamath
44291d9c27 Merge "Use StrictJarFile instead of JarFile for cert collection." 2013-12-16 11:29:46 +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 eb565dc527)

Change-Id: Iaaa26b02678278394619d0a41613d9ceeae3203c
2013-12-13 16:21:58 +00:00
Marco Nelissen
ce3bd309b1 Merge "Parse UUID string with Long.parseLong" 2013-12-11 18:07:50 +00:00
Mathieu Chartier
3254260b8b Merge "Update Dalvik process state through VMRuntime." 2013-12-10 02:18:06 +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
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
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 416740ad4d]

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
Jeff Brown
2ea480cac8 am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
* commit '5d0b18cddfcb933d7960c5a6a820045d77a0285c':
  Disallow applications from initiating cast screen.
2013-11-15 00:39:57 -08:00
Jeff Brown
5d0b18cddf am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
  Disallow applications from initiating cast screen.
2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2 Merge "Disallow applications from initiating cast screen." into klp-dev 2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2 Disallow applications from initiating cast screen.
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.

As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.

Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
2013-11-15 00:29:43 -08:00
Jianzheng Zhou
a363a10ca2 fix ethernet and wifi can't be tuned seperately issue
ethernet especially Gigabit enet use the same tune data with wifi
won't reach best performance.

Change-Id: Iac50ba47904c76ff7b5b8ad226e83451359ec534
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-11-15 13:32:23 +08:00
Mindy Pereira
bb8e75e6c4 am cce2e194: am 5823352c: Cancel double tap mode on action_up
* commit 'cce2e1944c4ac9411fa25534eb9b51d6f044dfb4':
  Cancel double tap mode on action_up
2013-11-14 19:48:42 -08:00
Mindy Pereira
cce2e1944c am 5823352c: Cancel double tap mode on action_up
* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0':
  Cancel double tap mode on action_up
2013-11-14 19:44:52 -08:00
Mindy Pereira
5823352c6c Cancel double tap mode on action_up
fixes b/11592408 Dragging immediately after double touch turns gesture into double touch drag

Change-Id: I3e7926a4f6f9ab4951f380bd004499c78b3bda69
2013-11-15 02:48:06 +00:00
Dianne Hackborn
6f5d85377b am 47b260d0: am 572b759a: Merge "Use index in SparseArray access properly"
* commit '47b260d071859a8c20bb0af2bcc095e253f7046c':
  Use index in SparseArray access properly
2013-11-14 16:37:55 -08:00
Dianne Hackborn
47b260d071 am 572b759a: Merge "Use index in SparseArray access properly"
* commit '572b759a41fd490fd21b5831dd8b8434b7fd5df8':
  Use index in SparseArray access properly
2013-11-14 16:35:42 -08:00
Dianne Hackborn
572b759a41 Merge "Use index in SparseArray access properly" 2013-11-15 00:33:20 +00:00
Christopher Tate
a5acd62bde am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
* commit '6e5cf573f2f2e17825af2973daeba893c6aa5855':
  Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:44:40 -08:00
Christopher Tate
6e5cf573f2 am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
* commit '99437f252b728f4946940f232c4b73b9dda76cfb':
  Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:04:31 -08:00
Christopher Tate
99437f252b Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev 2013-11-14 22:59:20 +00:00
Christopher Tate
ba629da331 Ensure recipient can be launched before attempting broadcast delivery
User removal or eviction inherently races with broadcast delivery.  This
patch introduces a latest-possible recheck of the availbility of the
target application before attempting to send it a broadcast.

Once the process has actually been spun up the system is essentially
committed to presenting it as a running application, and there is no
later check of the availability of the app: the failure mode for
continuing to attempt delivery is a crash *in the app process*,
and is user-visible.

We now check the app+userid existence of the intended recipient
just prior to committing to launch its process for receipt, and
if it is no longer available we simply skip that receiver and
continue normally.

Bug 11652784
Bug 11272019
Bug 8263020

Change-Id: Ib19ba2af493250890db7371c1a9f853772db1af0
2013-11-14 12:37:31 -08:00
Matthew Williams
72402f9de7 am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
* commit '09d8e3cf4e411b016ee65d8328dd7a443c9de0ff':
  SyncManager now returns copy on getCurrentSyncs()
2013-11-14 09:27:26 -08:00
Matthew Williams
09d8e3cf4e am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
* commit 'c68bb18244aa12d19bea9f9d59f2fe0d81478904':
  SyncManager now returns copy on getCurrentSyncs()
2013-11-14 09:23:32 -08:00
Matthew Williams
c68bb18244 Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev 2013-11-14 17:18:58 +00:00
Satoshi Kataoka
b97e102c4b am 1b570b57: am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype
* commit '1b570b571a63311f7f7d5b7cc5e17b3103fa8af9':
  Fix compatibility issue on InputMethodSubtype
2013-11-13 22:28:47 -08:00
Satoshi Kataoka
1b570b571a am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype
* commit '5fd5aa3d066fc12c92b5b6541d85ac243556223f':
  Fix compatibility issue on InputMethodSubtype
2013-11-13 22:25:01 -08:00
Satoshi Kataoka
5fd5aa3d06 Fix compatibility issue on InputMethodSubtype
Bug: 11032428
Change-Id: If722bbbfb69d00e1830007582d46a33319203eea
2013-11-14 15:08:39 +09:00
Adam Powell
73a4aeb9ff am 75ae8983: am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background
* commit '75ae89837615fa9cebd6cbb051213c025c48bcf6':
  Reset padding flags when set programmatically or implicitly from background
2013-11-13 19:45:21 -08:00
Adam Powell
75ae898376 am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background
* commit '48d2bcf2ce2305356c5a4f0dfbb928dc5a4c8331':
  Reset padding flags when set programmatically or implicitly from background
2013-11-13 19:41:07 -08:00
Adam Powell
48d2bcf2ce Reset padding flags when set programmatically or implicitly from background
Bug 11673480

Change-Id: I4f33c7ae46e937302e625bf1f3260adb25843645
2013-11-13 19:21:50 -08:00
Matthew Williams
a7456e46f4 SyncManager now returns copy on getCurrentSyncs()
Bug:11559103
Added a new getCurrentSyncsCopy() that is public. The other version
is needed for internal SSE calls.

Change-Id: I0287f039a6f75abf04b65b85cb30f78353aeef4f
2013-11-13 18:17:54 -08:00
Svetoslav
5880b363a6 am fe666e84: am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev
* commit 'fe666e848a1672a414bad93c105fa876f6c9f4de':
  Avoid NPE and add a warning log if a printing app misbehaves.
2013-11-13 17:54:08 -08:00
Svetoslav
fe666e848a am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev
* commit '4e04115052a66d5a7836c5e7a9bfc1a5d6f3784b':
  Avoid NPE and add a warning log if a printing app misbehaves.
2013-11-13 17:50:22 -08:00
Svetoslav
4e04115052 Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 2013-11-14 01:46:47 +00:00
Svetoslav
afd1967503 Avoid NPE and add a warning log if a printing app misbehaves.
An app can print only from an activity. If the activity is finished
before printing completes we destroy the PrintDocumentAdapter. The
app may however invoke some of the print callbacks after destruction
resulting in a NPE. This change checks if the adapter is destroyed
and if so does not crash while printing a meaningful log error with
the mistake of the app developer.

bug:11675274

Change-Id: I66539cfbd7583f52cb863a84ef8e40856f92ceed
2013-11-13 17:31:15 -08:00
Lajos Molnar
752926c752 am 1197bc37: am 7e11b16b: VideoView: expand documentation on state save/restore limitations
* commit '1197bc37e58fe7cd5ab32278367e53f19f01f784':
  VideoView: expand documentation on state save/restore limitations
2013-11-13 16:44:55 -08:00
Lajos Molnar
1197bc37e5 am 7e11b16b: VideoView: expand documentation on state save/restore limitations
* commit '7e11b16b9f8896170d492240a5fd50c8bd04105d':
  VideoView: expand documentation on state save/restore limitations
2013-11-13 16:40:26 -08:00
Robert Greenwalt
7fdfe28c75 am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '4c514f2a688bdae319c919987092ccfee690f390':
  Fix for the invalid Global Proxy Setting
2013-11-13 16:29:12 -08:00
Robert Greenwalt
ec9e8933ef am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting"
* commit '3b9244b4b4d5008daa9763a169a751975c75cc54':
  Fix for the invalid Global Proxy Setting
2013-11-13 16:27:56 -08:00
Lajos Molnar
7e11b16b9f VideoView: expand documentation on state save/restore limitations
Change-Id: I46f231d314fc4ae8d9d11389aa62a3e2698122ed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412889
2013-11-13 16:27:30 -08:00