118003 Commits

Author SHA1 Message Date
Baligh Uddin
0bfbb67627 Import translations. DO NOT MERGE
Change-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c
Auto-generated-cl: translation import
2013-12-09 09:53:12 -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
Scott Main
427e05b4af am 6fc956c7: am 4681d452: am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
* commit '6fc956c7ac7602e23f9bf164760db137cebdbbb8':
  Revert "add Drive API feature page. fix link text on several pages"
2013-12-07 01:50:13 +00:00
Scott Main
6fc956c7ac am 4681d452: am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
* commit '4681d4521cb955fcf66b6aad809aa99836cbb30a':
  Revert "add Drive API feature page. fix link text on several pages"
2013-12-06 17:48:00 -08:00
Scott Main
4681d4521c am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
* commit '9cefb57116653346729a9fc606e8ff4f899ad380':
  Revert "add Drive API feature page. fix link text on several pages"
2013-12-07 01:45:31 +00:00
Scott Main
9cefb57116 Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs 2013-12-07 01:42:31 +00:00
Scott Main
f2be361b46 Revert "add Drive API feature page. fix link text on several pages"
This reverts commit 680a1f67cd39b127663d2e8bc4b5f3ca1d868274.

Change-Id: Icc474d08e5fba678b683ae01280e015ae38dcf72
2013-12-07 01:42:10 +00:00
Scott Main
cf6c169fe0 am 71638ac4: am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages
* commit '71638ac4afb54bd0f4849c1179c370ee75462565':
  update robots.txt to disallow the community/ pages
2013-12-07 00:17:32 +00:00
Scott Main
71638ac4af am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages
* commit '2c93b68a0309e74e5c011cba1ef98951236f9f29':
  update robots.txt to disallow the community/ pages
2013-12-06 16:15:15 -08:00
Scott Main
2c93b68a03 am b821a87d: update robots.txt to disallow the community/ pages
* commit 'b821a87d1b9310d7f07880c80d0b5ccafd59986a':
  update robots.txt to disallow the community/ pages
2013-12-07 00:12:41 +00:00
Scott Main
03775d95a8 am 2bbea2bb: am 38854cab: am c45eebe1: add Android Community page
* commit '2bbea2bbc1b0efe60efcb255404661ca5160ab04':
  add Android Community page
2013-12-07 00:11:35 +00:00
Scott Main
2bbea2bbc1 am 38854cab: am c45eebe1: add Android Community page
* commit '38854cabba3524316f8e1a9ffe9f4ac15e14d72f':
  add Android Community page
2013-12-06 16:09:24 -08:00
Scott Main
b821a87d1b update robots.txt to disallow the community/ pages
Change-Id: I318308f7219b296d92039cba2b6f5ace321f697f
2013-12-06 16:08:01 -08:00
Scott Main
38854cabba am c45eebe1: add Android Community page
* commit 'c45eebe1868deb93c54c29885163a13a497eb86a':
  add Android Community page
2013-12-07 00:06:29 +00:00
Scott Main
c45eebe186 add Android Community page
Change-Id: I8a9c98931b274dbb27d7952e2278eaf7798da343
2013-12-06 15:48:22 -08:00
Scott Main
41d6be57d3 am 2d285312: am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages
* commit '2d2853120eaf3ccd6867ec7038c38ef794baaecc':
  add Drive API feature page. fix link text on several pages
2013-12-06 23:44:59 +00:00
Scott Main
2d2853120e am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages
* commit '37a8d7c54cbdb36cd6ff9c6688140b99e256c644':
  add Drive API feature page. fix link text on several pages
2013-12-06 15:41:23 -08:00
Scott Main
37a8d7c54c am 680a1f67: add Drive API feature page. fix link text on several pages
* commit '680a1f67cd39b127663d2e8bc4b5f3ca1d868274':
  add Drive API feature page. fix link text on several pages
2013-12-06 23:38:43 +00:00
Scott Main
680a1f67cd add Drive API feature page.
fix link text on several pages

Change-Id: I717eba278bc2cc09d3ee148a08700e8e353312d2
2013-12-06 14:50:18 -08:00
Joe Fernandez
3ffaadc11e docs: Platform image version release notes Android 4.4.2
Change-Id: I0ad9b672d077f9154a563868248e63348f7ffdae
2013-12-06 14:15:54 -08: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
Nick Kralevich
bf88b659b6 am 5fa89d55: am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."
* commit '5fa89d55712110c2932f76357216e7a77b3b317e':
  Augment SELinuxMMAC functionality.
2013-12-06 16:22:58 +00:00
Nick Kralevich
5fa89d5571 am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."
* commit '6b8a3a52acf1c2722551f1ea1ce47831f87939cd':
  Augment SELinuxMMAC functionality.
2013-12-06 08:20:18 -08:00
Nick Kralevich
6b8a3a52ac am f7422885: Merge "Augment SELinuxMMAC functionality."
* commit 'f7422885a99c5d240f70c2f8227ae44abeea3e5c':
  Augment SELinuxMMAC functionality.
2013-12-06 08:17:23 -08:00
Nick Kralevich
f7422885a9 Merge "Augment SELinuxMMAC functionality." 2013-12-06 16:13:58 +00:00
Robert Craig
99a626c271 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
2013-12-06 08:51:20 -05: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
dcff5ceff6 am d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD
* commit 'd7a5aaee145879804006d2c00daa4c14d544e03a':
2013-12-06 01:43:38 +00:00
The Android Open Source Project
d7a5aaee14 am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD
* commit 'ebcb32f58a6220802ca129ea33f47b4b69931a10':
2013-12-05 17:27:10 -08: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
7a15f93228 am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit 'babea8d8f2d4b3a40ab4e37646c26783c2288e87':
  wifi: Remove obsolete libwpa_client library
2013-12-05 20:33:43 +00: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
Ying Wang
6e2d0c1d91 Merge "wifi: Remove obsolete libwpa_client library" 2013-12-05 19:13:20 +00: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
Ying Wang
ceddb389b4 am b33fe50a: am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions."
* commit 'b33fe50a634e4fde635f7e662526db1c3e2cfa5c':
  libcore_to_document and junit_to_document are no longer functions.
2013-12-05 17:56:45 +00:00
Ying Wang
b33fe50a63 am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions."
* commit 'dcbde1b02ad69c18509afd87974c72c3a22f45dd':
  libcore_to_document and junit_to_document are no longer functions.
2013-12-05 09:47:04 -08:00
Ying Wang
dcbde1b02a Merge "libcore_to_document and junit_to_document are no longer functions." 2013-12-05 17:39:59 +00:00
Brian Carlstrom
4a657244b3 am 59595f7a: am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."
* commit '59595f7a3e8efcefc62bbcf8e085b6da6d8ea339':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
2013-12-05 15:29:41 +00: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
Brian Carlstrom
8026b2ce23 Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf." 2013-12-05 06:20:48 +00: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
John Huang
66a9ebfd2f am c91c7b4b: am 2e12e052: Merge "RIL changes for supporting generic SIM communication."
* commit 'c91c7b4b5d61e2121cd60c5c27a6a8df0ecf155e':
  RIL changes for supporting generic SIM communication.
2013-12-05 01:12:12 +00:00
John Huang
c91c7b4b5d am 2e12e052: Merge "RIL changes for supporting generic SIM communication."
* commit '2e12e0522641649d363a1c6ede9be9af235197fa':
  RIL changes for supporting generic SIM communication.
2013-12-04 17:09:18 -08:00
John Huang
2e12e05226 Merge "RIL changes for supporting generic SIM communication." 2013-12-05 00:59:36 +00:00
Ying Wang
50a0fd50f7 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
2013-12-04 16:58:59 -08:00
Dirk Dougherty
d5967e777e am e8b49c43: am c09e0ee9: am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs
* commit 'e8b49c433156b450289a4cd7ff1a7c8d7f05ebb8':
  Doc change: add cropped kk device image and adjust position on highlights doc.
2013-12-04 22:13:47 +00:00
Dirk Dougherty
e8b49c4331 am c09e0ee9: am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs
* commit 'c09e0ee90e00acbde85a6b3ee4413ca6e245f601':
  Doc change: add cropped kk device image and adjust position on highlights doc.
2013-12-04 14:09:59 -08:00
Dirk Dougherty
c09e0ee90e am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs
* commit 'c9cad879597dd15983a35fbf997898a771672a69':
  Doc change: add cropped kk device image and adjust position on highlights doc.
2013-12-04 22:05:51 +00:00