OSDN Git Service

android-x86/frameworks-base.git
10 years agoDO NOT MERGE: Remove obsolete "headless" support
Mike Lockwood [Fri, 15 Nov 2013 19:01:47 +0000 (11:01 -0800)]
DO NOT MERGE: Remove obsolete "headless" support

Change-Id: I829fe48e6ebcb819e260646bb19ac6ddfcf07f83

10 years agoDO NOT MERGE reset to goog/klp-volantis-dev
Qiwen Zhao [Mon, 9 Dec 2013 22:17:43 +0000 (14:17 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev

10 years agoam 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."
Lorenzo Colitti [Mon, 9 Dec 2013 18:31:25 +0000 (18:31 +0000)]
am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."

* commit '30253d7a649bd4fc6a436ae880a70e1142c1e58f':
  Add address flags and scope to LinkAddress.

10 years agoam 2daa0c93: Merge "Add address flags and scope to LinkAddress."
Lorenzo Colitti [Mon, 9 Dec 2013 18:28:19 +0000 (10:28 -0800)]
am 2daa0c93: Merge "Add address flags and scope to LinkAddress."

* commit '2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2':
  Add address flags and scope to LinkAddress.

10 years agoam 19158fc3: (-s ours) am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translati...
Baligh Uddin [Mon, 9 Dec 2013 18:10:32 +0000 (18:10 +0000)]
am 19158fc3: (-s ours) am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE

* commit '19158fc39a40f51c87195f5e3066bd891d359a2e':
  Import translations. DO NOT MERGE

10 years agoam 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 18:08:25 +0000 (10:08 -0800)]
am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE

* commit '325a13527d8c18c93bee266475cade9037f71698':
  Import translations. DO NOT MERGE

10 years agoam 0bfbb676: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 18:05:02 +0000 (10:05 -0800)]
am 0bfbb676: (-s ours) Import translations. DO NOT MERGE

* commit '0bfbb676277c907444b09ba9e653491b32dddf9c':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 17:53:12 +0000 (09:53 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c
Auto-generated-cl: translation import

10 years agoMerge "Add address flags and scope to LinkAddress."
Lorenzo Colitti [Sat, 7 Dec 2013 02:43:02 +0000 (02:43 +0000)]
Merge "Add address flags and scope to LinkAddress."

10 years agoam 6fc956c7: am 4681d452: am 9cefb571: Merge "Revert "add Drive API feature page...
Scott Main [Sat, 7 Dec 2013 01:50:13 +0000 (01:50 +0000)]
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"

10 years agoam 4681d452: am 9cefb571: Merge "Revert "add Drive API feature page. fix link text...
Scott Main [Sat, 7 Dec 2013 01:48:00 +0000 (17:48 -0800)]
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"

10 years agoam 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several...
Scott Main [Sat, 7 Dec 2013 01:45:31 +0000 (01:45 +0000)]
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"

10 years agoMerge "Revert "add Drive API feature page. fix link text on several pages"" into...
Scott Main [Sat, 7 Dec 2013 01:42:30 +0000 (01:42 +0000)]
Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs

10 years agoRevert "add Drive API feature page. fix link text on several pages"
Scott Main [Sat, 7 Dec 2013 01:42:10 +0000 (01:42 +0000)]
Revert "add Drive API feature page. fix link text on several pages"

This reverts commit 680a1f67cd39b127663d2e8bc4b5f3ca1d868274.

Change-Id: Icc474d08e5fba678b683ae01280e015ae38dcf72

10 years agoam 71638ac4: am 2c93b68a: am b821a87d: update robots.txt to disallow the community...
Scott Main [Sat, 7 Dec 2013 00:17:32 +0000 (00:17 +0000)]
am 71638ac4: am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages

* commit '71638ac4afb54bd0f4849c1179c370ee75462565':
  update robots.txt to disallow the community/ pages

10 years agoam 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages
Scott Main [Sat, 7 Dec 2013 00:15:15 +0000 (16:15 -0800)]
am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages

* commit '2c93b68a0309e74e5c011cba1ef98951236f9f29':
  update robots.txt to disallow the community/ pages

10 years agoam b821a87d: update robots.txt to disallow the community/ pages
Scott Main [Sat, 7 Dec 2013 00:12:41 +0000 (00:12 +0000)]
am b821a87d: update robots.txt to disallow the community/ pages

* commit 'b821a87d1b9310d7f07880c80d0b5ccafd59986a':
  update robots.txt to disallow the community/ pages

10 years agoam 2bbea2bb: am 38854cab: am c45eebe1: add Android Community page
Scott Main [Sat, 7 Dec 2013 00:11:35 +0000 (00:11 +0000)]
am 2bbea2bb: am 38854cab: am c45eebe1: add Android Community page

* commit '2bbea2bbc1b0efe60efcb255404661ca5160ab04':
  add Android Community page

10 years agoam 38854cab: am c45eebe1: add Android Community page
Scott Main [Sat, 7 Dec 2013 00:09:24 +0000 (16:09 -0800)]
am 38854cab: am c45eebe1: add Android Community page

* commit '38854cabba3524316f8e1a9ffe9f4ac15e14d72f':
  add Android Community page

10 years agoupdate robots.txt to disallow the community/ pages
Scott Main [Sat, 7 Dec 2013 00:08:01 +0000 (16:08 -0800)]
update robots.txt to disallow the community/ pages

Change-Id: I318308f7219b296d92039cba2b6f5ace321f697f

10 years agoam c45eebe1: add Android Community page
Scott Main [Sat, 7 Dec 2013 00:06:29 +0000 (00:06 +0000)]
am c45eebe1: add Android Community page

* commit 'c45eebe1868deb93c54c29885163a13a497eb86a':
  add Android Community page

10 years agoadd Android Community page
Scott Main [Thu, 5 Dec 2013 02:34:19 +0000 (18:34 -0800)]
add Android Community page

Change-Id: I8a9c98931b274dbb27d7952e2278eaf7798da343

10 years agoam 2d285312: am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text...
Scott Main [Fri, 6 Dec 2013 23:44:59 +0000 (23:44 +0000)]
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

10 years agoam 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages
Scott Main [Fri, 6 Dec 2013 23:41:23 +0000 (15:41 -0800)]
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

10 years agoam 680a1f67: add Drive API feature page. fix link text on several pages
Scott Main [Fri, 6 Dec 2013 23:38:43 +0000 (23:38 +0000)]
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

10 years agoadd Drive API feature page.
Scott Main [Fri, 6 Dec 2013 20:57:13 +0000 (12:57 -0800)]
add Drive API feature page.
fix link text on several pages

Change-Id: I717eba278bc2cc09d3ee148a08700e8e353312d2

10 years agoam 5fa89d55: am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."
Nick Kralevich [Fri, 6 Dec 2013 16:22:58 +0000 (16:22 +0000)]
am 5fa89d55: am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."

* commit '5fa89d55712110c2932f76357216e7a77b3b317e':
  Augment SELinuxMMAC functionality.

10 years agoam 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."
Nick Kralevich [Fri, 6 Dec 2013 16:20:18 +0000 (08:20 -0800)]
am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."

* commit '6b8a3a52acf1c2722551f1ea1ce47831f87939cd':
  Augment SELinuxMMAC functionality.

10 years agoam f7422885: Merge "Augment SELinuxMMAC functionality."
Nick Kralevich [Fri, 6 Dec 2013 16:17:23 +0000 (08:17 -0800)]
am f7422885: Merge "Augment SELinuxMMAC functionality."

* commit 'f7422885a99c5d240f70c2f8227ae44abeea3e5c':
  Augment SELinuxMMAC functionality.

10 years agoMerge "Augment SELinuxMMAC functionality."
Nick Kralevich [Fri, 6 Dec 2013 16:13:58 +0000 (16:13 +0000)]
Merge "Augment SELinuxMMAC functionality."

10 years agoAugment 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

10 years agoAdd address flags and scope to LinkAddress.
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

10 years agoam d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689...
The Android Open Source Project [Fri, 6 Dec 2013 01:43:38 +0000 (01:43 +0000)]
am d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD

* commit 'd7a5aaee145879804006d2c00daa4c14d544e03a':

10 years agoam ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD
The Android Open Source Project [Fri, 6 Dec 2013 01:27:10 +0000 (17:27 -0800)]
am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD

* commit 'ebcb32f58a6220802ca129ea33f47b4b69931a10':

10 years agoam 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 5 Dec 2013 21:30:08 +0000 (21:30 +0000)]
am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '61c9706bac583a1cf95be12d7f5e96f652669d72':

10 years agoam dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 5 Dec 2013 21:30:03 +0000 (21:30 +0000)]
am dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'dc5f592c0344e9fc308c68d7d2e80b8b7f82acab':

10 years agoam 51843f8a: am 371c46fe: Merge "Remove exceptions from the printer discovery session...
Svetoslav Ganov [Thu, 5 Dec 2013 21:29:54 +0000 (21:29 +0000)]
am 51843f8a: am 371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev

* commit '51843f8aa9a76207627288252a99f12141195a07':

10 years agoam 0d27bc29: am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into...
Jose Lima [Thu, 5 Dec 2013 21:29:40 +0000 (21:29 +0000)]
am 0d27bc29: am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev

* commit '0d27bc294610d7415093804a20d380f2e78bd30b':

10 years agoam 8810a0c3: am 69b9eff1: Merge "Update Quick Settings to use new consolidated master...
David Christie [Thu, 5 Dec 2013 21:29:25 +0000 (21:29 +0000)]
am 8810a0c3: am 69b9eff1: Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means.  Quick settings will no longeer explicitly enable/disable gps and network prov

* commit '8810a0c3c242ab0ac252261d7f73258769cc9f2d':

10 years agoam c319ddd9: am 4c737496: Merge "Change the exception msg" into klp-dev
Kristian Monsen [Thu, 5 Dec 2013 21:29:16 +0000 (21:29 +0000)]
am c319ddd9: am 4c737496: Merge "Change the exception msg" into klp-dev

* commit 'c319ddd9ec9c630840a11765a4630b1375fe9664':

10 years agoam f76c1685: am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Suppli...
Vinit Deshapnde [Thu, 5 Dec 2013 21:29:03 +0000 (21:29 +0000)]
am f76c1685: am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev

* commit 'f76c1685a55302e95086818b5178d9af257b3e4f':

10 years agoam 72d29c2d: am ddbfdfa5: Merge "fix race condition when a new display is added"...
keunyoung [Thu, 5 Dec 2013 21:28:57 +0000 (21:28 +0000)]
am 72d29c2d: am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev

* commit '72d29c2d0d062122710e4d3d4eed68f04be3b275':

10 years agoam aad62128: am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices"...
Michael Wright [Thu, 5 Dec 2013 21:28:41 +0000 (21:28 +0000)]
am aad62128: am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev

* commit 'aad62128100f0c1562f9c61a721b703480ed3772':

10 years agoam 4b982e49: am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev
Victoria Lease [Thu, 5 Dec 2013 21:28:16 +0000 (21:28 +0000)]
am 4b982e49: am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev

* commit '4b982e49751c87bc4d55c3ab59958904ad9f701b':

10 years agoam 76bf4d6d: am d1f6b624: Merge "Take text alignment into account to compue text...
Romain Guy [Thu, 5 Dec 2013 21:27:56 +0000 (21:27 +0000)]
am 76bf4d6d: am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev

* commit '76bf4d6dbee90268ecdf5eab63a9048fcaa8ff02':

10 years agoam 1e68ffc7: am 890db42b: Merge "Not create context menu when mouse right click outsi...
Alan Viverette [Thu, 5 Dec 2013 21:27:48 +0000 (21:27 +0000)]
am 1e68ffc7: am 890db42b: Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev

* commit '1e68ffc72fda060b316f0cf6d2a310a601965577':

10 years agoam beb7b449: am b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev
Svetoslav [Thu, 5 Dec 2013 21:27:39 +0000 (21:27 +0000)]
am beb7b449: am b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev

* commit 'beb7b44962b7dfd2a9d4cc56ec6417037ffff862':

10 years agoMerge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
The Android Open Source Project [Thu, 5 Dec 2013 21:10:46 +0000 (13:10 -0800)]
Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD

Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7

10 years agoam babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
Ying Wang [Thu, 5 Dec 2013 20:33:43 +0000 (20:33 +0000)]
am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"

* commit 'babea8d8f2d4b3a40ab4e37646c26783c2288e87':
  wifi: Remove obsolete libwpa_client library

10 years agoam 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
Ying Wang [Thu, 5 Dec 2013 20:29:12 +0000 (12:29 -0800)]
am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"

* commit '6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41':
  wifi: Remove obsolete libwpa_client library

10 years agoam 54276ad3: am cd89feb9: Merge "pause/resume for Animators" into klp-dev
Chet Haase [Thu, 5 Dec 2013 19:47:27 +0000 (19:47 +0000)]
am 54276ad3: am cd89feb9: Merge "pause/resume for Animators" into klp-dev

* commit '54276ad3dabc9c1ccafb67b621a8d0f3960820c9':

10 years agoam afa1231e: am b6da9115: Merge "Remove incorrect warning." into klp-dev
Craig Mautner [Thu, 5 Dec 2013 19:47:14 +0000 (19:47 +0000)]
am afa1231e: am b6da9115: Merge "Remove incorrect warning." into klp-dev

* commit 'afa1231e75f8808f17eccdef51bce98100364521':

10 years agoam dfa36da5: am 076d3787: am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse...
Katie McCormick [Thu, 5 Dec 2013 19:47:06 +0000 (19:47 +0000)]
am dfa36da5: am 076d3787: am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb

* commit 'dfa36da5ca9b614a0ad5e69b008920e64c0d8356':

10 years agoam ff1b3f07: am 1232c51e: Merge "Add the API to support webview printing" into klp-dev
Selim Gurun [Thu, 5 Dec 2013 19:46:51 +0000 (19:46 +0000)]
am ff1b3f07: am 1232c51e: Merge "Add the API to support webview printing" into klp-dev

* commit 'ff1b3f0789f014b4ce7e2cd47c4d47e3f70fe484':

10 years agoam 98e50c50: am 964f2b30: Merge "Update Bitmap.createBitmap() documentation" into...
Romain Guy [Thu, 5 Dec 2013 19:46:34 +0000 (19:46 +0000)]
am 98e50c50: am 964f2b30: Merge "Update Bitmap.createBitmap() documentation" into klp-dev

* commit '98e50c50f52b045d944df2eee0987d06eb1af07d':

10 years agoam 07b9b3ad: am b45b39a2: am cdf3455c: am 6dd38cc5: Revert "Revert "resolved conflict...
Scott Main [Thu, 5 Dec 2013 19:46:20 +0000 (19:46 +0000)]
am 07b9b3ad: am b45b39a2: am cdf3455c: am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later."

* commit '07b9b3ad3b4d942b4ed920cfa8f68bce71686972':

10 years agoam 93e5dc65: am fefff422: am 7466b998: am ebcee197: Revert "resolved conflicts for...
Scott Main [Thu, 5 Dec 2013 19:45:59 +0000 (19:45 +0000)]
am 93e5dc65: am fefff422: am 7466b998: am ebcee197: Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later.

* commit '93e5dc65811b146612d383cec502b6ba04a0e3d5':

10 years agoam cee3a2a5: am 8d5f3e31: Manage jclass objects (and most jobjects) in jni code using...
Andreas Huber [Thu, 5 Dec 2013 19:45:41 +0000 (19:45 +0000)]
am cee3a2a5: am 8d5f3e31: Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef

* commit 'cee3a2a59e9be1b875a81b6c3e885b39e16259e0':

10 years agoam f8d747b3: (-s ours) am 9a68f82f: Add super_onDrawVerticalScrollBar to WebView...
Martin Kosiba [Thu, 5 Dec 2013 19:44:50 +0000 (19:44 +0000)]
am f8d747b3: (-s ours) am 9a68f82f: Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE

* commit 'f8d747b3fd19e8dd9a09b517716b17f852d01343':

10 years agoam 4826434c: am ed735c9a: Add missing cleanspec
Ben Murdoch [Thu, 5 Dec 2013 19:44:42 +0000 (19:44 +0000)]
am 4826434c: am ed735c9a: Add missing cleanspec

* commit '4826434cfdb44e5cca6e4bf9c62ee9b005b71a00':

10 years agoam 35d525c9: am 998cfa2c: Merge "API to discover granted Uri permissions." into klp-dev
Jeff Sharkey [Thu, 5 Dec 2013 19:44:32 +0000 (19:44 +0000)]
am 35d525c9: am 998cfa2c: Merge "API to discover granted Uri permissions." into klp-dev

* commit '35d525c9b7de893fc30d7ac531769a36676ed5cb':

10 years agoam 34412965: am c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev
Jeff Sharkey [Thu, 5 Dec 2013 19:44:24 +0000 (19:44 +0000)]
am 34412965: am c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev

* commit '34412965f1545eaff6bb46e596f2d7ddbac7a1ab':

10 years agoam 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into...
Jeff Sharkey [Thu, 5 Dec 2013 19:44:16 +0000 (19:44 +0000)]
am 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev

* commit '0c305430e8945f8e97ba2ce69fcbb07b903c110a':

10 years agoam 1d685ec0: am 6e14b22c: Merge "APIs for multiple external storage devices." into...
Jeff Sharkey [Thu, 5 Dec 2013 19:44:08 +0000 (19:44 +0000)]
am 1d685ec0: am 6e14b22c: Merge "APIs for multiple external storage devices." into klp-dev

* commit '1d685ec0610c2047d28e59eed19ceac744146e25':

10 years agoam 09848031: am b8160401: Merge "Fix the build" into klp-dev
Svetoslav Ganov [Thu, 5 Dec 2013 19:44:01 +0000 (19:44 +0000)]
am 09848031: am b8160401: Merge "Fix the build" into klp-dev

* commit '098480310f19ff83cb6c97e06deeba67326d15e2':

10 years agoam e1c2dfee: am c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev
Svetoslav Ganov [Thu, 5 Dec 2013 19:43:53 +0000 (19:43 +0000)]
am e1c2dfee: am c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev

* commit 'e1c2dfeebd5f8befd69ab6ec4801436a325071e5':

10 years agoam b8029214: am 0dd303cf: Merge "Put animation background behind visible wallpaper...
Craig Mautner [Thu, 5 Dec 2013 19:43:37 +0000 (19:43 +0000)]
am b8029214: am 0dd303cf: Merge "Put animation background behind visible wallpaper" into klp-dev

* commit 'b802921422b955b83b9fbf1d547cac9300dceddb':

10 years agoam a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null.
Wink Saville [Thu, 5 Dec 2013 19:43:28 +0000 (19:43 +0000)]
am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null.

* commit 'a9f2faa9a7e7539b71b342d1923cfbc14c7e6bbd':

10 years agoam 2954c1b9: am 7a7c35e2: am 94c529b8: am 385bb2eb: resolved conflicts for merge...
Katie McCormick [Thu, 5 Dec 2013 19:43:18 +0000 (19:43 +0000)]
am 2954c1b9: am 7a7c35e2: am 94c529b8: am 385bb2eb: resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev

* commit '2954c1b95bcb01691d639728e7ec87453ed5b1d2':

10 years agoam 71716cc5: am 97aaa8f0: Merge "Bluetooth MAP profile - sms and mms support initial...
Zhihai Xu [Thu, 5 Dec 2013 19:43:09 +0000 (19:43 +0000)]
am 71716cc5: am 97aaa8f0: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev

* commit '71716cc5202550900271b83e8993a111f99dd7fd':

10 years agoam 1b90bdf2: am f910d320: Merge "Address Robin\'s code review comments in initial...
destradaa [Thu, 5 Dec 2013 19:42:52 +0000 (19:42 +0000)]
am 1b90bdf2: am f910d320: Merge "Address Robin\'s code review comments in initial FlpHal submission." into klp-dev

* commit '1b90bdf2fe6de9fa51be47a81d6d220e26291e02':

10 years agoam 8e4e7a20: am 35786c34: Merge "Allow bound processes to go PROCESS_STATE_TOP."...
Dianne Hackborn [Thu, 5 Dec 2013 19:42:43 +0000 (19:42 +0000)]
am 8e4e7a20: am 35786c34: Merge "Allow bound processes to go PROCESS_STATE_TOP." into klp-dev

* commit '8e4e7a20f35fb0d44eee3217603dcd50f5579ca1':

10 years agoam c70629f1: am 583ed765: Merge "Take shadow bounds into account for quick rejects...
Romain Guy [Thu, 5 Dec 2013 19:41:37 +0000 (19:41 +0000)]
am c70629f1: am 583ed765: Merge "Take shadow bounds into account for quick rejects Bug #8634346" into klp-dev

* commit 'c70629f137e9a7be757f32b2344616e8f88b57c3':

10 years agoam 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 5 Dec 2013 19:41:24 +0000 (19:41 +0000)]
am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2d1716a8cdc95977c243fe8a642b41f42be565d0':

10 years agoam 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads...
Romain Guy [Thu, 5 Dec 2013 19:41:14 +0000 (19:41 +0000)]
am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev

* commit '06c2bad60079099b2496f2939655b72ffc649b29':

10 years agoam 4b643f0e: (-s ours) am 40885045: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 5 Dec 2013 19:40:56 +0000 (19:40 +0000)]
am 4b643f0e: (-s ours) am 40885045: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '4b643f0ebb78a554d4460626e5dedd4398b11f0a':

10 years agoam d021b6b1: am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev
Dianne Hackborn [Thu, 5 Dec 2013 19:40:33 +0000 (19:40 +0000)]
am d021b6b1: am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev

* commit 'd021b6b14a801cce1b575d536323af65587f2fbe':

10 years agoam 17198172: am 2b2d313e: Merge "Reduce amount of invalidation when old-style animati...
Chet Haase [Thu, 5 Dec 2013 19:40:25 +0000 (19:40 +0000)]
am 17198172: am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev

* commit '1719817211743cabf53e06761ad5540518544273':

10 years agoam c9bf4052: am f6c7a5fd: Merge "add local focus mode and input event injection API...
keunyoung [Thu, 5 Dec 2013 19:39:46 +0000 (19:39 +0000)]
am c9bf4052: am f6c7a5fd: Merge "add local focus mode and input event injection API to Window" into klp-dev

* commit 'c9bf4052c71d7f473c781363bc7ff757a427c0e3':

10 years agoam f2424907: am 52f8ef21: Merge "Add extra layout pass after draw finished." into...
Craig Mautner [Thu, 5 Dec 2013 19:39:25 +0000 (19:39 +0000)]
am f2424907: am 52f8ef21: Merge "Add extra layout pass after draw finished." into klp-dev

* commit 'f2424907b7763c996ef40eb1ef7a02d9a4c5bff9':

10 years agoam 00b581de: am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo...
Colin Cross [Thu, 5 Dec 2013 19:39:17 +0000 (19:39 +0000)]
am 00b581de: am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev

* commit '00b581de0e3ef49ea10c5ff039d272df086750e6':

10 years agoam b59dbedc: am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev
Martijn Coenen [Thu, 5 Dec 2013 19:39:09 +0000 (19:39 +0000)]
am b59dbedc: am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev

* commit 'b59dbedceddc18e94fa75fe87523cf026e4e79b6':

10 years agoam bd430b25: am be11c364: Merge "Fix padding adjustment for scrollbars in View, FastS...
Alan Viverette [Thu, 5 Dec 2013 19:39:00 +0000 (19:39 +0000)]
am bd430b25: am be11c364: Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev

* commit 'bd430b250880f8376bb4c59f62c627d90ae14324':

10 years agoam d1715fda: am 9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev
Geoffrey Borggaard [Thu, 5 Dec 2013 19:38:52 +0000 (19:38 +0000)]
am d1715fda: am 9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev

* commit 'd1715fdaaf2a11484e6dc60710f13e2495cf6bbb':

10 years agoam e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTe...
Fabrice Di Meglio [Thu, 5 Dec 2013 19:38:45 +0000 (19:38 +0000)]
am e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev

* commit 'e4e68219ded0920f0e92ecce6e1cf220603942dc':

10 years agoam 003b944d: am d81a15c6: Merge "Add method for adding two ProcessStats objects toget...
Dianne Hackborn [Thu, 5 Dec 2013 19:38:36 +0000 (19:38 +0000)]
am 003b944d: am d81a15c6: Merge "Add method for adding two ProcessStats objects together." into klp-dev

* commit '003b944d495bd8a54b61fa565a268dd2c9c21ba1':

10 years agoam b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests...
Fabrice Di Meglio [Thu, 5 Dec 2013 19:38:27 +0000 (19:38 +0000)]
am b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev

* commit 'b945d80c9bb91b90e48add2a4f665de02c63e28c':

10 years agoam 795a7dec: am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception...
Elliott Hughes [Thu, 5 Dec 2013 19:38:19 +0000 (19:38 +0000)]
am 795a7dec: am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred."

* commit '795a7decc2e9e547e0cf6291567d427a2a60517a':
  Remove possible leak when exception occurred.

10 years agoam 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev
Mathias Agopian [Thu, 5 Dec 2013 19:38:09 +0000 (19:38 +0000)]
am 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev

* commit '2464fcdf4cb33b5bfc1e4b0d61e3b9e42cffdf46':

10 years agoam ac322988: am 00312300: Remove an unnecessary allocation
Romain Guy [Thu, 5 Dec 2013 19:38:03 +0000 (19:38 +0000)]
am ac322988: am 00312300: Remove an unnecessary allocation

* commit 'ac322988339d98665eff9f5937caff9a4eadd9d2':

10 years agoam 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev
Jeff Sharkey [Thu, 5 Dec 2013 19:37:44 +0000 (19:37 +0000)]
am 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev

* commit '1faca4cd10eaff01a575288e8484a72be66f148f':

10 years agoam 85dbba82: am d3964489: Merge "Some hygiene for the touch explorer." into klp-dev
Svetoslav [Thu, 5 Dec 2013 19:37:27 +0000 (19:37 +0000)]
am 85dbba82: am d3964489: Merge "Some hygiene for the touch explorer." into klp-dev

* commit '85dbba82dffd68867623ab7e881f8adb55ff0428':

10 years agoam 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev
Jeff Sharkey [Thu, 5 Dec 2013 19:37:20 +0000 (19:37 +0000)]
am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev

* commit '87a61b838c5cc411853317663beaa46539fd56ef':

10 years agoam de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture...
Jonathan Dixon [Thu, 5 Dec 2013 19:37:12 +0000 (19:37 +0000)]
am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev

* commit 'de3ff4b4859a92a19d84b33f5a93a0b3454698e6':

10 years agoam 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobil...
Wink Saville [Thu, 5 Dec 2013 19:36:33 +0000 (19:36 +0000)]
am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev

* commit '8418a309a3e228538a2cf921f386326a9afe394b':

10 years agoam 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptiveP...
Wink Saville [Thu, 5 Dec 2013 19:36:10 +0000 (19:36 +0000)]
am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev

* commit '8eec0cbe01064156c52a87592796a4352f31a451':

10 years agoam 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict...
Wink Saville [Thu, 5 Dec 2013 19:35:35 +0000 (19:35 +0000)]
am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev

* commit '94e9e8f16a7a72d1491694b44006b96212d8076e':

10 years agoam 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method...
Jeff Brown [Thu, 5 Dec 2013 19:35:27 +0000 (19:35 +0000)]
am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev

* commit '1c7799e2f35b707c5f5d6544a6d94cd4892891da':

10 years agoam 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that...
Wink Saville [Thu, 5 Dec 2013 19:35:18 +0000 (19:35 +0000)]
am 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev

* commit '1a5c94fc65038c72045a5cf5509f2cf152c6c406':

10 years agoam 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change...
Joe Malin [Thu, 5 Dec 2013 19:35:10 +0000 (19:35 +0000)]
am 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs

* commit '6023b8289d030e8bf88be33c5f04d298748bd6f4':