OSDN Git Service
Amith Yamasani [Thu, 28 Mar 2013 20:31:44 +0000 (20:31 +0000)]
Merge "Restricted account visibility" into jb-mr2-dev
Ben Cheng [Thu, 28 Mar 2013 19:59:54 +0000 (19:59 +0000)]
Merge "Crank up the mOomMinFreeHigh values by 50%." into jb-mr2-dev
Craig Mautner [Thu, 28 Mar 2013 19:41:19 +0000 (19:41 +0000)]
Merge "Add flag to method's javadoc." into jb-mr2-dev
Maggie Benthall [Thu, 28 Mar 2013 19:15:46 +0000 (19:15 +0000)]
Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev
Craig Mautner [Thu, 28 Mar 2013 18:58:25 +0000 (11:58 -0700)]
Add flag to method's javadoc.
MOVE_TASK_NO_USER_ACTION was feeling neglected.
Change-Id: I1b8281878e99755ad9960904ba71b83ba3f05620
Jeff Brown [Thu, 28 Mar 2013 18:53:59 +0000 (18:53 +0000)]
Merge "Allow system server to bind to USB devices." into jb-mr2-dev
Jeff Brown [Thu, 28 Mar 2013 18:53:33 +0000 (18:53 +0000)]
Merge "Support specifying buffer start offset for USB requests." into jb-mr2-dev
Romain Guy [Thu, 28 Mar 2013 18:50:53 +0000 (18:50 +0000)]
Merge "Don't crash when making a layer larger than supported dimensions Bug #
8437401" into jb-mr2-dev
Romain Guy [Thu, 28 Mar 2013 18:32:33 +0000 (11:32 -0700)]
Don't crash when making a layer larger than supported dimensions
Bug #
8437401
A misplaced ref count decrement was causing a crash when attempting to
resize a layer to dimensions larger than the max texture size supported
by the GPU.
This change fixes the crash and clarifies the warnings to make it more
obvious what's happening.
Change-Id: I632dc1b90aaa2605969e10523491a81c4922d3dc
Irfan Sheriff [Thu, 28 Mar 2013 17:29:14 +0000 (17:29 +0000)]
Merge "Add support for setMiracastMode" into jb-mr2-dev
Irfan Sheriff [Thu, 28 Mar 2013 17:15:44 +0000 (10:15 -0700)]
Add support for setMiracastMode
Usage is setMiracastMode(WifiP2pManager.MIRACAST_SOURCE) or
setMiracastMode(WifiP2pManager.MIRACAST_SINK) as an example.
Only available for internal use and can be called as long as
driver is active. P2p connection is not needed for it to be
called
Bug:
8493089
Change-Id: I1f87eaf3311212aae980077de26c05651a8cc811
Robert Greenwalt [Thu, 28 Mar 2013 16:45:33 +0000 (16:45 +0000)]
Merge "Add BT - DataTracker connection" into jb-mr2-dev
Wink Saville [Thu, 28 Mar 2013 16:09:26 +0000 (16:09 +0000)]
Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev
Jeff Brown [Thu, 28 Mar 2013 10:15:40 +0000 (03:15 -0700)]
Allow system server to bind to USB devices.
Change-Id: I31f9ed1ff3fcda53f62f08ae198d18d0df3321b7
Jeff Brown [Thu, 28 Mar 2013 10:13:09 +0000 (03:13 -0700)]
Support specifying buffer start offset for USB requests.
Deprecated existing API which only supported passing buffer
and length in favor of a new one that also supports passing
the start.
Being able to pass a start index is very important because
the kernel imposes size limits on how much data can be transferred
at a time so we often need to transmit large buffers in chunks.
Change-Id: I3484b5e68f1ece61d4645ea04be8ee6a3b79169d
kmccormick [Thu, 28 Mar 2013 02:26:53 +0000 (19:26 -0700)]
am
9773b6e9: am
f508cb7b: am
571c01b4: am
a8115d06: am
f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit '
9773b6e9aeb27dc0164c57e8b38673834a9474bb':
Doc update: typo
kmccormick [Thu, 28 Mar 2013 02:26:50 +0000 (19:26 -0700)]
am
fcc42da4: am
7aec7790: am
061d4a95: am
3af7b848: am
821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit '
fcc42da4d9e3dc6dfd98b374a03eda051a869a74':
Doc update: use parse, not new
kmccormick [Thu, 28 Mar 2013 02:24:43 +0000 (19:24 -0700)]
am
f508cb7b: am
571c01b4: am
a8115d06: am
f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit '
f508cb7bdb6a994e241711f91763ac8951311e2b':
Doc update: typo
kmccormick [Thu, 28 Mar 2013 02:23:51 +0000 (19:23 -0700)]
resolved conflicts for merge of
603f987f to jb-mr2-dev
Change-Id: I4a130dad9d4669799f5d477f67e0f9a6a04381ca
kmccormick [Thu, 28 Mar 2013 02:22:18 +0000 (19:22 -0700)]
am
571c01b4: am
a8115d06: am
f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit '
571c01b494be76af9291b87c09f43a0fb30b3edb':
Doc update: typo
kmccormick [Thu, 28 Mar 2013 02:20:34 +0000 (19:20 -0700)]
am
a8115d06: am
f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit '
a8115d06afa29146edcab5f1edca83d2c7a89f2d':
Doc update: typo
kmccormick [Thu, 28 Mar 2013 02:18:43 +0000 (19:18 -0700)]
am
f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs
* commit '
f65b5d085bc62382eba530179a24a1cf1a7d353d':
Doc update: typo
kmccormick [Thu, 28 Mar 2013 01:48:42 +0000 (01:48 +0000)]
Merge "Doc update: typo" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 02:03:12 +0000 (19:03 -0700)]
am
7aec7790: am
061d4a95: am
3af7b848: am
821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit '
7aec77901b92423b835a87be88fbbf3bc5ff0c91':
Doc update: use parse, not new
kmccormick [Thu, 28 Mar 2013 02:00:48 +0000 (19:00 -0700)]
am
061d4a95: am
3af7b848: am
821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit '
061d4a95cf924fcf113d11b2d4d001f696a65e1f':
Doc update: use parse, not new
kmccormick [Thu, 28 Mar 2013 01:59:42 +0000 (18:59 -0700)]
am
418172bf: am
19840a8d: am
65c66c74: am
6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '
418172bf8823016785526b433801d44a4630f276':
Doc change: Fix typo DONT_DELTE
kmccormick [Thu, 28 Mar 2013 01:59:10 +0000 (18:59 -0700)]
am
3af7b848: am
821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit '
3af7b848143bef17230674bbed79ca77d3527e8e':
Doc update: use parse, not new
kmccormick [Thu, 28 Mar 2013 01:58:05 +0000 (18:58 -0700)]
am
d55e676a: am
7db86662: am
63dc67bd: am
b1c453f2: am
353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '
d55e676a592442f034cfbd3a45e05ba2cbe8ff11':
Doc Update: bug fix.
kmccormick [Thu, 28 Mar 2013 01:57:27 +0000 (18:57 -0700)]
am
19840a8d: am
65c66c74: am
6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '
19840a8d40139a12469ef92c3541f2a433d5ae85':
Doc change: Fix typo DONT_DELTE
kmccormick [Thu, 28 Mar 2013 01:57:24 +0000 (18:57 -0700)]
am
821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs
* commit '
821d4943702e49844629ae9b522383a21210a64f':
Doc update: use parse, not new
Amith Yamasani [Thu, 28 Mar 2013 01:56:08 +0000 (18:56 -0700)]
Restricted account visibility
When accounts are shared to a restricted/limited user, apps can
opt-in to viewing accounts of a certain type. Other shared accounts
are not visible to the app.
App would specify the account type in the manifest <application> tag
with the attribute restrictedAccountType="foo.bar", where "foo.bar"
is the account type as defined by the authenticator.
Change-Id: I7586da04d6d6d32aae15adc6b1366f325bb07384
kmccormick [Thu, 28 Mar 2013 01:56:08 +0000 (18:56 -0700)]
am
7db86662: am
63dc67bd: am
b1c453f2: am
353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '
7db866620491b3fa09dbcf2abe097bf33a73b034':
Doc Update: bug fix.
kmccormick [Thu, 28 Mar 2013 01:55:51 +0000 (18:55 -0700)]
am
65c66c74: am
6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '
65c66c74f4db7d16ccff1a67f416f74c716b3773':
Doc change: Fix typo DONT_DELTE
kmccormick [Thu, 28 Mar 2013 01:54:07 +0000 (18:54 -0700)]
am
63dc67bd: am
b1c453f2: am
353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '
63dc67bd6b026d3590af980b5dfddd4e68fd7831':
Doc Update: bug fix.
kmccormick [Thu, 28 Mar 2013 01:54:02 +0000 (18:54 -0700)]
am
6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '
6e6e861a58da7bc39e1fbad9ed8730c712e45123':
Doc change: Fix typo DONT_DELTE
kmccormick [Thu, 28 Mar 2013 01:53:02 +0000 (01:53 +0000)]
Merge "Doc update: use parse, not new" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 01:52:24 +0000 (18:52 -0700)]
am
b1c453f2: am
353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '
b1c453f2897a9bf7dcfe71a84512877c5c6f0536':
Doc Update: bug fix.
kmccormick [Thu, 28 Mar 2013 01:50:36 +0000 (18:50 -0700)]
am
353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '
353e7a2f2efa3a6d8d9538dca8f0d5d360c2a1e9':
Doc Update: bug fix.
kmccormick [Thu, 28 Mar 2013 01:49:36 +0000 (01:49 +0000)]
Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 01:47:58 +0000 (01:47 +0000)]
Merge "Doc Update: bug fix." into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 01:25:38 +0000 (18:25 -0700)]
Doc update: use parse, not new
"Bug:
8014259"
Change-Id: Ia7408b49303003fe87033056365cafc5b4790813
kmccormick [Thu, 28 Mar 2013 00:39:17 +0000 (17:39 -0700)]
Doc change: Fix typo DONT_DELTE
"Bug:
8273156"
Change-Id: I6ba2e780d1a8c2b7d1771e93125a10b228227020
Kenny Root [Thu, 28 Mar 2013 00:45:21 +0000 (17:45 -0700)]
am
4224a4ca: am
3864aa39: Merge "Add interrupter library to simulate EINTR"
* commit '
4224a4ca85a4e7ba3f4e543ee52c643405464164':
Add interrupter library to simulate EINTR
Kenny Root [Thu, 28 Mar 2013 00:42:36 +0000 (17:42 -0700)]
am
3864aa39: Merge "Add interrupter library to simulate EINTR"
* commit '
3864aa3944254184ddcd61002cb9f1d7cb1d4c67':
Add interrupter library to simulate EINTR
Ben Cheng [Thu, 28 Mar 2013 00:36:13 +0000 (17:36 -0700)]
Crank up the mOomMinFreeHigh values by 50%.
Devices with 1GB of RAM can benefit from more aggressive OOM killer.
BUG:
7972252
Change-Id: Id2b80c14a3cff195c17ef0d14c80b92394649d98
kmccormick [Thu, 28 Mar 2013 00:25:22 +0000 (17:25 -0700)]
Doc update: typo
"Bug:
8324430"
Change-Id: I45027ede97157552722049fdf49a7659f293237a
Dianne Hackborn [Thu, 28 Mar 2013 00:20:27 +0000 (00:20 +0000)]
Merge "Fix build." into jb-mr2-dev
Dianne Hackborn [Thu, 28 Mar 2013 00:19:35 +0000 (17:19 -0700)]
Fix build.
Change-Id: I38a25dc63107fc907a520169e1b58f00e51dbb9d
kmccormick [Thu, 28 Mar 2013 00:18:26 +0000 (17:18 -0700)]
Doc Update: bug fix.
"Bug:
7541616"
Change-Id: I7b84eaa13a8f695585211035647fa88614bb1372
Kenny Root [Thu, 28 Mar 2013 00:16:30 +0000 (00:16 +0000)]
Merge "Add interrupter library to simulate EINTR"
Nick Kralevich [Thu, 28 Mar 2013 00:13:45 +0000 (00:13 +0000)]
Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev
Nick Kralevich [Thu, 28 Mar 2013 00:11:25 +0000 (00:11 +0000)]
Merge "Add buildPermissionRequestIntent to PackageManager" into jb-mr2-dev
Nick Kralevich [Tue, 26 Mar 2013 23:59:37 +0000 (16:59 -0700)]
Reenable optional permissions parsing and expose APIs
Modify the package parsing code to understand optional permissions
(android:required="false"). This is essentially a rollback of
e824120016248bcfe3962883fe9f3b0481dd1c3d with some minor changes.
Expose the requestPermission API to third party apps. This allows
an app to request an Intent which, when passed to
startActivityForResult, will prompt the user to approve permissions
for an app.
In the event we decide to not launch with this feature, this change
can be rolled back.
Change-Id: Ie3626deae9b16e510323f94a2c80377f7c84b26f
Nick Kralevich [Wed, 27 Mar 2013 22:20:08 +0000 (15:20 -0700)]
Add buildPermissionRequestIntent to PackageManager
Add the buildPermissionRequestIntent API to PackageManager. This allows
an app to request an Intent which, when passed to
startActivityForResult, will prompt the user to approve permissions
for an app.
Currently, the API is @hide. It will be unhidden in a future change.
Change-Id: I4ec677002afa799a6eb5c2657c28452c91012436
Dianne Hackborn [Wed, 27 Mar 2013 23:32:35 +0000 (23:32 +0000)]
Merge "Keep track of who has disabled applications." into jb-mr2-dev
Wink Saville [Wed, 27 Mar 2013 23:21:43 +0000 (16:21 -0700)]
Cleanup some debug in LinkCapabilities and Properties.
Change-Id: I5fe0124d0943f5e538e451645f32533a74c75a47
Robert Greenwalt [Wed, 22 Aug 2012 02:27:00 +0000 (19:27 -0700)]
Add BT - DataTracker connection
Allows the external BT stack the means to communicate with
ConnectivityService during reverse tethering.
bug:
8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
Fabrice Di Meglio [Wed, 27 Mar 2013 22:15:59 +0000 (22:15 +0000)]
Merge "Fix bug #
8487785 Notification shade has text overlapping the icon" into jb-mr2-dev
Maggie Benthall [Thu, 14 Mar 2013 22:02:12 +0000 (18:02 -0400)]
Add user restrictions for bluetooth, sideloading, usb file transfer
Created constants for these in UserManager and current.txt. Also created
an accessor for individual user restrictions that takes the restriction key
(removing individual methods for particular restrictions).
Change-Id: Ibb5517cbcdffadd3925f52cbe67d7d525813faa9
Irfan Sheriff [Wed, 27 Mar 2013 22:12:20 +0000 (22:12 +0000)]
Merge "Notify user only when device provisioned" into jb-mr2-dev
Fabrice Di Meglio [Wed, 27 Mar 2013 19:41:22 +0000 (12:41 -0700)]
Fix bug #
8487785 Notification shade has text overlapping the icon
- follow up to the fix for bug #
8480245 ViewGroup layout margins can be wrong in RTL mode
- deal with "RTL compatibility mode": if left/right margins are not defined and if we
haev some start/end ones then use the start/end ones.
Change-Id: I98fe3276de2bd14f60a1c423a47569a68046f7be
Adam Powell [Wed, 27 Mar 2013 22:07:17 +0000 (22:07 +0000)]
Merge "Fix an action bar menu order of operations bug" into jb-mr2-dev
Lorenzo Colitti [Wed, 27 Mar 2013 21:58:06 +0000 (21:58 +0000)]
Merge "Make isHostRoute match only host routes" into jb-mr2-dev
Jeff Brown [Wed, 27 Mar 2013 21:57:33 +0000 (21:57 +0000)]
Merge "Disable some noisy error logs." into jb-mr2-dev
Jeff Sharkey [Wed, 27 Mar 2013 21:48:42 +0000 (21:48 +0000)]
Merge "Sync APIs use seconds instead of ms." into jb-mr2-dev
Jeff Sharkey [Wed, 27 Mar 2013 21:46:55 +0000 (14:46 -0700)]
Sync APIs use seconds instead of ms.
Bug:
7668972
Change-Id: I7b253fe17d9539695adc474a69546645586b5f1a
Irfan Sheriff [Wed, 27 Mar 2013 20:27:39 +0000 (13:27 -0700)]
Notify user only when device provisioned
Make sure the notification about scan mode being availabe is only shown
when device is already provisioned
Bug:
8482739
Change-Id: If8a76ffcc0401b846e39b02a55ea69743303c93d
Tim Murray [Wed, 27 Mar 2013 21:32:31 +0000 (21:32 +0000)]
Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev
Tim Murray [Wed, 27 Mar 2013 21:31:28 +0000 (21:31 +0000)]
Revert "Remove all public mention of RS graphics from docs."
This reverts commit
d72f932b8cbf461ebb79c249ce92b9b811122190
Change-Id: I056b13d0b2beb508e4215bc0d289cf3e76a3a986
Tim Murray [Wed, 27 Mar 2013 21:01:37 +0000 (21:01 +0000)]
Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev
Chris Craik [Wed, 27 Mar 2013 19:47:59 +0000 (19:47 +0000)]
Merge "Set ignore flag during deferred savelayer" into jb-mr2-dev
Jeff Brown [Wed, 27 Mar 2013 19:34:30 +0000 (12:34 -0700)]
Disable some noisy error logs.
Disabled some error logs that occur when an input channel is
closed remotely by its peer. These can happen during normal
course of operations because the act of removing windows or
finishing IME sessions is asynchronous so both peers may react
to the change independently at different times.
The coordination with the input dispatcher is designed to
avoid logging these errors. However it's not possible to achieve
the same coordination with the IME so we might as well silence
the errors since they don't tell us anything useful.
If something truly bad happens then one of two things will occur:
1. The system will realize that the process crashed because
of a DeadObjectException or other error, so it will take
measures to clean up.
2. If the error was spurious and non-fatal (how?) then at worst
an ANR may occur because the consumer stopped reading from
the input channel. However this has never been observed
and I doubt it's even possible.
Change-Id: I11a05d6d75e63e91be003971a544069b3a0d77f4
Adam Powell [Wed, 27 Mar 2013 19:22:27 +0000 (12:22 -0700)]
Fix an action bar menu order of operations bug
As options menu invalidations in PhoneWindow are deferred, it was
possible for a call to open the overflow menu (which involves an extra
chance to prepare the menu) to happen before the pending menu
invalidation was handled. Process any pending menu invalidations
before attempting to show the overflow menu in response to one of
these events.
Bug
7209308
Change-Id: Id50f7f6ad5d3a631745207fa0bad8c356690e16c
Yorke Lee [Wed, 27 Mar 2013 19:14:09 +0000 (19:14 +0000)]
Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev
Yorke Lee [Tue, 12 Mar 2013 19:48:06 +0000 (12:48 -0700)]
Expose data_usage_stat table in ContactsContract
Bug:
8124079
Change-Id: Ie60e489f08be270b9f3a4866c488a5e0598ceb26
Dianne Hackborn [Tue, 26 Mar 2013 23:15:41 +0000 (16:15 -0700)]
Keep track of who has disabled applications.
Change-Id: I2640d3dc2200b589e2beb42a43cc93efd090f06e
Dianne Hackborn [Wed, 27 Mar 2013 18:37:08 +0000 (11:37 -0700)]
am
bfd15fa0: am
6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."
* commit '
bfd15fa00557ea78567a30fe260dea62c37bd5a0':
Two REMOVE_PROVIDER messages caused by race condition.
Chris Craik [Wed, 27 Mar 2013 01:55:15 +0000 (18:55 -0700)]
Set ignore flag during deferred savelayer
bug:
8471552
Additionally, add ignore check for draw functor
In deferred mode, if we don't set ignore, a 0 alpha displayList won't
be quickRejected, and not only would its contents be needlessly
deferred, but upon playback any functors would be drawn, ignoring the
state of the snapshot.
Change-Id: Ib1edb3252080f674254086edee6f965f0efcce78
Jean-Michel Trivi [Wed, 27 Mar 2013 17:35:44 +0000 (17:35 +0000)]
Merge "AudioEffect types in SDK" into jb-mr2-dev
Chiao Cheng [Wed, 27 Mar 2013 17:18:29 +0000 (17:18 +0000)]
Merge "Allow leading slash in path argument for addURI() method." into jb-mr2-dev
Jean-Michel Trivi [Tue, 26 Mar 2013 22:37:28 +0000 (15:37 -0700)]
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
Yorke Lee [Wed, 27 Mar 2013 16:43:40 +0000 (16:43 +0000)]
Merge "Add new apis to CP2" into jb-mr2-dev
Baligh Uddin [Wed, 27 Mar 2013 16:38:07 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Nick Kralevich [Wed, 27 Mar 2013 16:20:26 +0000 (16:20 +0000)]
Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev
Martijn Coenen [Wed, 27 Mar 2013 16:04:47 +0000 (16:04 +0000)]
Merge "Add direct NDEF push API." into jb-mr2-dev
Baligh Uddin [Wed, 27 Mar 2013 15:35:28 +0000 (08:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3115e513480f3a73084de898943db307a5294a08
Auto-generated-cl: translation import
Lorenzo Colitti [Wed, 27 Mar 2013 04:07:18 +0000 (13:07 +0900)]
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
Jeff Sharkey [Wed, 27 Mar 2013 03:18:06 +0000 (03:18 +0000)]
Merge "Benchmarks for IndentingPrintWriter." into jb-mr2-dev
Jeff Sharkey [Wed, 27 Mar 2013 00:37:46 +0000 (17:37 -0700)]
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
Jeff Brown [Wed, 27 Mar 2013 02:43:54 +0000 (02:43 +0000)]
Merge "Use input transport for communications between app and IME." into jb-mr2-dev
Dianne Hackborn [Wed, 27 Mar 2013 01:01:35 +0000 (01:01 +0000)]
Merge "Fix build." into jb-mr2-dev
Dianne Hackborn [Wed, 27 Mar 2013 01:00:42 +0000 (18:00 -0700)]
Fix build.
Change-Id: I51b87ee5f0b7f396aad7e239893d9f0764f04bb6
Dianne Hackborn [Wed, 27 Mar 2013 00:46:21 +0000 (17:46 -0700)]
am
6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."
* commit '
6b96e2f0006b5c33973b3500d3bb72a8c7a3bd38':
Two REMOVE_PROVIDER messages caused by race condition.
Fabrice Di Meglio [Wed, 27 Mar 2013 00:44:48 +0000 (00:44 +0000)]
Merge "Fix bug #
8480245 ViewGroup layout margins can be wrong in RTL mode" into jb-mr2-dev
Romain Guy [Wed, 27 Mar 2013 00:41:45 +0000 (00:41 +0000)]
Merge "Path precaching creates duplicate cache entries Bug #
8478275" into jb-mr2-dev
Romain Guy [Wed, 27 Mar 2013 00:29:51 +0000 (17:29 -0700)]
Path precaching creates duplicate cache entries
Bug #
8478275
Change-Id: Ib541ea051e42e01cc0d277790e9c09de38ef72ee
Fabrice Di Meglio [Tue, 26 Mar 2013 22:50:24 +0000 (15:50 -0700)]
Fix bug #
8480245 ViewGroup layout margins can be wrong in RTL mode
- fix resolution of MarginLayoutParams
- update related RelativeLayout code
Change-Id: I261f127a8897f60d316fed2a73e6e76020e542cc
Dianne Hackborn [Wed, 27 Mar 2013 00:22:43 +0000 (00:22 +0000)]
Merge "Fix issue #
8470131: Process thrash kills battery" into jb-mr2-dev
Dianne Hackborn [Wed, 27 Mar 2013 00:22:27 +0000 (00:22 +0000)]
Merge "Change wm commands to return size and density info." into jb-mr2-dev
Romain Guy [Wed, 27 Mar 2013 00:21:05 +0000 (00:21 +0000)]
Merge "Avoid multiple font cache texture uploads Bug #
8378964" into jb-mr2-dev