102687 Commits

Author SHA1 Message Date
Chiao Cheng
efb7a924f9 am 972a9255: Merge "Allow leading slash in path argument for addURI() method." into jb-mr2-dev
* commit '972a9255a7e2c75cf13dab74121cb367c03e2809':
  Allow leading slash in path argument for addURI() method.
2013-03-27 10:21:06 -07:00
Chiao Cheng
972a9255a7 Merge "Allow leading slash in path argument for addURI() method." into jb-mr2-dev 2013-03-27 17:18:30 +00:00
Jean-Michel Trivi
80569f7ff7 AudioEffect types in SDK
Not all effect types are defined by OpenSL ES. Add the full UUID
 effect identifier in the superclass of all audio effects.

bug 8113082

Change-Id: I8dfc6cdcfd2a145e792fb3669e6132e6f19d1c16
2013-03-27 09:59:24 -07:00
Yorke Lee
6b141509ea am 038fbc5d: Merge "Add new apis to CP2" into jb-mr2-dev
* commit '038fbc5d099c6fb8903ccc00c0988d482bfb8046':
  Add new apis to CP2
2013-03-27 09:48:26 -07:00
Yorke Lee
038fbc5d09 Merge "Add new apis to CP2" into jb-mr2-dev 2013-03-27 16:43:41 +00:00
Baligh Uddin
c5ff3ef46c am 993f10af: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '993f10af84768bc37dac211efe3133257680f2d1':
  Import translations. DO NOT MERGE
2013-03-27 09:41:40 -07:00
Baligh Uddin
993f10af84 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-27 16:38:07 +00:00
Nick Kralevich
7306da9075 am 4b254881: Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev
* commit '4b2548815df45b3aa6a8144abeeaea504ee6f7b1':
  AppSecurityPermissions: Add isGranted to isDisplayablePermission
2013-03-27 09:23:01 -07:00
Nick Kralevich
4b2548815d Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev 2013-03-27 16:20:26 +00:00
Martijn Coenen
511d33bb5b am d9f0180a: Merge "Add direct NDEF push API." into jb-mr2-dev
* commit 'd9f0180ab8bb4c69dcf1535c3dfe0d8c464a7377':
  Add direct NDEF push API.
2013-03-27 09:07:29 -07:00
Martijn Coenen
d9f0180ab8 Merge "Add direct NDEF push API." into jb-mr2-dev 2013-03-27 16:04:47 +00:00
Baligh Uddin
dee11a5496 Import translations. DO NOT MERGE
Change-Id: I3115e513480f3a73084de898943db307a5294a08
Auto-generated-cl: translation import
2013-03-27 08:35:28 -07:00
Chirayu Desai
3e4a3ea2ff Correct executable bit for source files [Take 2]
Change Ieb51bafb46c895a21d2e83696f5a901ba752b2c5 left out some
files, this fixes them.

Change-Id: Ia949a8581668836ea0251602e048f09c852f5169
2013-03-27 16:52:35 +05:30
Lorenzo Colitti
fdadc4e242 Make isHostRoute match only host routes
Currently, isHostRoute returns true iff the gateway address is
the unspecified address (0.0.0.0 or ::). Thus, it will return
true for any route that has no gateway (e.g., a route pointing at
a point-to-point interface), even if the route is not a host
route.

Fix this by checking the prefix length instead. This should be
safe because:

1. mDestination cannot be null, since it's created using new.
2. Host routes created using makeHostRoute (which is what
   ConnectivityService calls) always have the correct prefix
   lengths (/32 or /128) set.

Bug: 8276725
Change-Id: I14285398823fa6c312349128c7cc216cad4a84c9
2013-03-27 19:41:06 +09:00
Jeff Sharkey
762bad8e9b am 7cd9ed19: Merge "Benchmarks for IndentingPrintWriter." into jb-mr2-dev
* commit '7cd9ed195ba5242b125eb58a36ea2b01a588dbdd':
  Benchmarks for IndentingPrintWriter.
2013-03-26 20:20:05 -07:00
Jeff Sharkey
7cd9ed195b Merge "Benchmarks for IndentingPrintWriter." into jb-mr2-dev 2013-03-27 03:18:06 +00:00
Jeff Sharkey
8fa9bb5210 Benchmarks for IndentingPrintWriter.
Current timings on a mako listed below, which show minimal overhead
compared to writing directly. The increased code readability and
automatic indenting is worth the overhead.

Also worth noting is that writing concatenated strings is
substantially faster than printing components separately.

           benchmark      us linear runtime
       ComplexDirect 10712.7 =========================
    ComplexIndenting 12623.7 ==============================
       PairIndenting    45.8 =
             PairRaw    82.1 =
        SimpleDirect   282.2 =
     SimpleIndenting   294.4 =

Change-Id: I7c38690c14b017fa46248ebb0be69f6beff03371
2013-03-26 20:16:44 -07:00
Jeff Brown
901b77c63b am ca3d655d: Merge "Use input transport for communications between app and IME." into jb-mr2-dev
* commit 'ca3d655d20c13c71972a4475cec3b98efa7dbdd0':
  Use input transport for communications between app and IME.
2013-03-26 19:46:20 -07:00
Jeff Brown
ca3d655d20 Merge "Use input transport for communications between app and IME." into jb-mr2-dev 2013-03-27 02:43:54 +00:00
Dianne Hackborn
483ac9a779 am b404ecc9: Merge "Fix build." into jb-mr2-dev
* commit 'b404ecc91a5dd3dd027554490b2ca18c1048bdba':
  Fix build.
2013-03-26 18:04:00 -07:00
Dianne Hackborn
b404ecc91a Merge "Fix build." into jb-mr2-dev 2013-03-27 01:01:36 +00:00
Dianne Hackborn
f3d46ce88f Fix build.
Change-Id: I51b87ee5f0b7f396aad7e239893d9f0764f04bb6
2013-03-26 18:00:42 -07:00
Fabrice Di Meglio
fc7a102071 am a803b094: Merge "Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode" into jb-mr2-dev
* commit 'a803b094c6c60539426396ad57f0733cbe212664':
  Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode
2013-03-26 17:48:21 -07:00
Dianne Hackborn
bfd15fa005 am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."
* commit '6b96e2f0006b5c33973b3500d3bb72a8c7a3bd38':
  Two REMOVE_PROVIDER messages caused by race condition.
2013-03-26 17:46:21 -07:00
Fabrice Di Meglio
a803b094c6 Merge "Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode" into jb-mr2-dev 2013-03-27 00:44:48 +00:00
Romain Guy
79bb82de96 am 3cb5ed8b: Merge "Path precaching creates duplicate cache entries Bug #8478275" into jb-mr2-dev
* commit '3cb5ed8bb369df6f5f519169ccd1ec0854e3d4b5':
  Path precaching creates duplicate cache entries Bug #8478275
2013-03-26 17:44:43 -07:00
Romain Guy
3cb5ed8bb3 Merge "Path precaching creates duplicate cache entries Bug #8478275" into jb-mr2-dev 2013-03-27 00:41:46 +00:00
Romain Guy
4500a8d5d7 Path precaching creates duplicate cache entries
Bug #8478275

Change-Id: Ib541ea051e42e01cc0d277790e9c09de38ef72ee
2013-03-26 17:29:51 -07:00
Fabrice Di Meglio
0072f64939 Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode
- fix resolution of MarginLayoutParams
- update related RelativeLayout code

Change-Id: I261f127a8897f60d316fed2a73e6e76020e542cc
2013-03-26 17:27:33 -07:00
Dianne Hackborn
177543db55 am 3bcc2fba: Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev
* commit '3bcc2fbaad4064360cee26708d702b7ee575f448':
  Fix issue #8470131: Process thrash kills battery
2013-03-26 17:26:52 -07:00
Dianne Hackborn
a482078913 am 5871b258: Merge "Change wm commands to return size and density info." into jb-mr2-dev
* commit '5871b258afd0bf3a2d58dea437b340a4f5b382cf':
  Change wm commands to return size and density info.
2013-03-26 17:26:50 -07:00
Dianne Hackborn
3bcc2fbaad Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev 2013-03-27 00:24:04 +00:00
Romain Guy
5e83199dc9 am 2509437e: Merge "Avoid multiple font cache texture uploads Bug #8378964" into jb-mr2-dev
* commit '2509437e309827dbfe8bf3797d59c0d01af13972':
  Avoid multiple font cache texture uploads Bug #8378964
2013-03-26 17:23:13 -07:00
Dianne Hackborn
5871b258af Merge "Change wm commands to return size and density info." into jb-mr2-dev 2013-03-27 00:22:28 +00:00
Romain Guy
2509437e30 Merge "Avoid multiple font cache texture uploads Bug #8378964" into jb-mr2-dev 2013-03-27 00:21:05 +00:00
Nick Kralevich
7a8c135177 AppSecurityPermissions: Add isGranted to isDisplayablePermission
Modify isDisplayablePermission to display a permission if the
app update will grant a new optional permission to the app.

Change-Id: Ic647826b0c48f9f7ec8e4f69b90197211f83278d
2013-03-26 17:18:32 -07:00
Dianne Hackborn
6b96e2f000 Merge "Two REMOVE_PROVIDER messages caused by race condition." 2013-03-27 00:17:41 +00:00
Guobin Zhang
9e3e526650 Two REMOVE_PROVIDER messages caused by race condition.
Fix a bug in unstable ContentProvider.
IllegalStateException: ref counts can't go to zero here: stable=0 unstable=0
IllegalStateException: unstable count < 0: -1

There is a race between main thread and background database thread. Main thread
is responsible for handling the REMOVE_PROVIDER message. Database thread starts
insert or query request again and again. acquireProvider in db thread will often
snatch provider from the jaws of death, sometime it fails to remove REMOVE_PROVIDER
which is already fired out from MessageQueue. But completeRemoveProvider in main
thread gets suspended when trying to execute the critical section. If db thread
released the provider before main thread resumes the execution, then two
REMOVE_PROVIDER messages will be executed.

Change-Id: I8588aa1d1a8bc444dcd2adf6f8bc3f055cebbdc4
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
2013-03-27 00:17:27 +00:00
Martijn Coenen
1fa2aff21b Add direct NDEF push API.
Hidden for now. Also, modified callback that is called
from NfcService to pass all data in a single object
(BeamShareData). This avoids having to do multiple IPCs
at touch time.

Bug: 5134061
Change-Id: I235f608cef9935041b33b4b7a6980f109c15576c
2013-03-26 17:07:37 -07:00
Elliott Hughes
08dbf6a88a am 82718153: am 6f14ef70: am 083bfa5a: Merge "Remove dead DateUtils code that was never in an API level."
* commit '827181538c5c1387d18b9ad5a257295c7dfff686':
  Remove dead DateUtils code that was never in an API level.
2013-03-26 16:55:35 -07:00
Elliott Hughes
827181538c am 6f14ef70: am 083bfa5a: Merge "Remove dead DateUtils code that was never in an API level."
* commit '6f14ef70664d13295ffca524fb0b08365351b1f7':
  Remove dead DateUtils code that was never in an API level.
2013-03-26 16:51:10 -07:00
Amith Yamasani
8813998628 am e450c3cd: Merge "Fix docs build." into jb-mr2-dev
* commit 'e450c3cd8d135972eaa8237f1d4587ed7d887c2f':
  Fix docs build.
2013-03-26 16:26:47 -07:00
Amith Yamasani
e450c3cd8d Merge "Fix docs build." into jb-mr2-dev 2013-03-26 23:23:32 +00:00
Amith Yamasani
ca050adc13 Fix docs build.
Change-Id: I959db164f0ed7badfcdf921ffa1bfff60b4fb952
2013-03-26 16:19:46 -07:00
Michael Wright
09f4d8198a am cf797a5e: Merge "Deliver key repeats for artificial dpad events" into jb-mr2-dev
* commit 'cf797a5e43873ef819974f67dea29e424b244079':
  Deliver key repeats for artificial dpad events
2013-03-26 16:13:12 -07:00
Michael Wright
cf797a5e43 Merge "Deliver key repeats for artificial dpad events" into jb-mr2-dev 2013-03-26 23:11:15 +00:00
Adam Powell
36375eca1a am 7f51ae71: Merge "Fix some visibility state transition issues with ActionBarView" into jb-mr2-dev
* commit '7f51ae71f170f61439516321a107507c4d1c0ac0':
  Fix some visibility state transition issues with ActionBarView
2013-03-26 15:56:45 -07:00
Adam Powell
7f51ae71f1 Merge "Fix some visibility state transition issues with ActionBarView" into jb-mr2-dev 2013-03-26 22:51:52 +00:00
Jeff Brown
c28867a1d6 Use input transport for communications between app and IME.
The input method manager service now supplies an input channel for
communication while creating an IME session on behalf of the
application.

This change significanly reduces the overhead of IME event dispatch
by using a standard input channel to send input events rather than
using binder.  This results in fewer thread context switches
and fewer object allocations.

What's more, the IME may perform additional batching of the motion
events that it receives which may help it catch up if it is
getting behind while processing them.

Bug: 7984576
Bug: 8473020
Change-Id: Ibe26311edd0060cdcae80194f1753482e635786f
2013-03-26 15:42:39 -07:00
Adam Powell
6684e92ae8 Fix some visibility state transition issues with ActionBarView
Restore state as expected for titles and expanded action views.

Bug 8246128

Bug 8479205

Change-Id: Icad59685c5eab241f19ecd94479dc5e7a9f678b6
2013-03-26 15:38:26 -07:00