OSDN Git Service
Jim Miller [Sun, 6 Oct 2013 02:01:00 +0000 (19:01 -0700)]
Fix bug where pebble app triggers accessibility mode in navbar camera
Apparently the Pebble application uses accessibility. This was
triggering the navbar to resort to accessibility mode for launching
the camera. The fix is to also require touch exploration to be
enabled.
Fixes bug
11061505
Change-Id: I2245bd37eef9e68911862ce86147b1343816f1a4
Svetoslav [Sat, 5 Oct 2013 01:00:33 +0000 (01:00 +0000)]
Merge "Print UI tweaks." into klp-dev
Victoria Lease [Sat, 5 Oct 2013 00:55:52 +0000 (00:55 +0000)]
Merge "reset mShapingPaint's SkTypeface before we use it" into klp-dev
Svetoslav [Sat, 5 Oct 2013 00:27:33 +0000 (17:27 -0700)]
Print UI tweaks.
1. The refresh button in a print notification was using
wrong asset.
2. If the page count is unknown, just not show the page
count instead unknown.
bug:
10983508
Change-Id: I15f1fcbff60fe1f30d37868864da41550bb14487
Victoria Lease [Sat, 5 Oct 2013 00:33:35 +0000 (17:33 -0700)]
reset mShapingPaint's SkTypeface before we use it
Harfbuzz works in TTF glyph-space, but most of Skia works in
fallback glyph-space. shapeFontRun() helpfully calculates the
baseGlyphCount needed to convert between the two, but leaves
mShapingPaint's SkTypeface set to the specific TTF being shaped
rather than the original SkTypeface that was requested. Needless
to say, this causes all manner of horrific malady when glyph
indices are calculated in one glyph-index-space and then applied
to another.
To fix this issue, I reset mShapingPaint's SkTypeface when done
with the Harfbuzz shaping operation so that the baseGlyphCount only
gets applied once.
Change-Id: Ia886f89d667634e15e5fc8d7af443c9d1ba89622
Svetoslav [Fri, 4 Oct 2013 23:48:37 +0000 (23:48 +0000)]
Merge "Small print API tweaks" into klp-dev
Jim Miller [Fri, 4 Oct 2013 23:48:23 +0000 (23:48 +0000)]
Merge "Replace searchlight asset with new new asset" into klp-dev
Jim Miller [Fri, 4 Oct 2013 23:41:34 +0000 (16:41 -0700)]
Replace searchlight asset with new new asset
Fixes bug
11030712
Change-Id: I8361c74e344ec3f9c7176635face84af2d754973
Chet Haase [Fri, 4 Oct 2013 23:26:37 +0000 (23:26 +0000)]
Merge "Enable transitions in lockscreen media controller" into klp-dev
Eino-Ville Talvala [Fri, 4 Oct 2013 23:21:55 +0000 (23:21 +0000)]
Merge "Fix build." into klp-dev
Svetoslav [Fri, 4 Oct 2013 23:20:00 +0000 (16:20 -0700)]
Small print API tweaks
1. Removed an unused public constant
2. Hide PrintFileDocumentAdapter which makes doing the wring
thing easy.
3. We allow a print service to set a tag of a print job which is
an arbitrary string it only knows how to interpret. Typically,
this is the id of a remote print job. This tag was visible to
applications which is wrong - this is data that should be
private to the print service. Now the print service is the
only one to see that.
bug:
11084635
Change-Id: I763ea9ff0fdf647805bc36e1737d72263090714d
Scott Main [Fri, 4 Oct 2013 20:43:26 +0000 (13:43 -0700)]
update version number for doc stamp
Change-Id: I881510209a56204a464df082840d2dde56312303
Eino-Ville Talvala [Fri, 4 Oct 2013 23:14:38 +0000 (16:14 -0700)]
Fix build.
Change-Id: I1c3537d936fd467014b966179f5ed2a8c6a696da
Baligh Uddin [Fri, 4 Oct 2013 22:55:38 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Oct 2013 22:53:06 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Eino-Ville Talvala [Fri, 4 Oct 2013 22:27:59 +0000 (22:27 +0000)]
Merge "Camera2: Verbosity is verboten." into klp-dev
Chet Haase [Fri, 4 Oct 2013 22:12:08 +0000 (22:12 +0000)]
Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev
Svetoslav Ganov [Fri, 4 Oct 2013 22:08:24 +0000 (22:08 +0000)]
Merge "Print attributes hint not honored." into klp-dev
Alan Viverette [Fri, 4 Oct 2013 22:03:59 +0000 (22:03 +0000)]
Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev
Jeff Sharkey [Fri, 4 Oct 2013 22:03:43 +0000 (22:03 +0000)]
Merge "Custom pressed states, fixed column sizes." into klp-dev
Raph Levien [Fri, 4 Oct 2013 22:02:55 +0000 (22:02 +0000)]
Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev
Jeff Sharkey [Fri, 4 Oct 2013 21:49:06 +0000 (21:49 +0000)]
Merge "Avoid NPE when ProviderInfo is missing." into klp-dev
Jeff Sharkey [Fri, 4 Oct 2013 21:44:56 +0000 (14:44 -0700)]
Custom pressed states, fixed column sizes.
Use custom pressed state assets. Use fixed column sizes to prevent
truncating of long dates on small screens.
Also tear down any active CAB when switching fragments.
Bug:
11032418,
11028212
Change-Id: I2bf3dc3f693319b4b55cc901ed460f60faceba35
Eino-Ville Talvala [Fri, 4 Oct 2013 21:39:58 +0000 (14:39 -0700)]
Camera2: Verbosity is verboten.
Bug:
10360518
Change-Id: I155effad61099535bee77cc0d0e380420d96770d
Alex Ray [Fri, 4 Oct 2013 21:13:34 +0000 (21:13 +0000)]
Merge "Add Consumer IR feature" into klp-dev
Chet Haase [Fri, 4 Oct 2013 01:02:21 +0000 (18:02 -0700)]
Enable transitions in lockscreen media controller
Media controller now fades between different states. The code for
doing this was already there, but this CL enables them and changes
the behavior of transition's OnPreDrawListener to do the right thing.
Also, this CL fixes a bug in ChangeText found while testing this change.
Issue #
11083563 ChangeText transition crashes when KEEP transition type used
Change-Id: I5e04c28e1b5faac017b0a4e49734d9faa7fe79cd
Jeff Sharkey [Fri, 4 Oct 2013 20:53:50 +0000 (13:53 -0700)]
Avoid NPE when ProviderInfo is missing.
Bug:
11052428
Change-Id: I6cb0cf2030a28f571c3f13cd0b9ba76627974697
Scott Main [Fri, 4 Oct 2013 20:41:09 +0000 (20:41 +0000)]
Merge "add -since flag for api level 19 to filter javadocs" into klp-dev
Baligh Uddin [Fri, 4 Oct 2013 19:50:57 +0000 (12:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I17e711092eecfea0af5f133185672b729f8d4bf1
Auto-generated-cl: translation import
Baligh Uddin [Fri, 4 Oct 2013 19:23:39 +0000 (12:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id6fb45a4be5a4e32cd673127862ff413526dcc7b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 4 Oct 2013 18:48:44 +0000 (18:48 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Svetoslav Ganov [Mon, 30 Sep 2013 16:04:50 +0000 (09:04 -0700)]
Print attributes hint not honored.
1. Initially we have a single printer, the fake PDF printer, and
wait for printers to be discovered. This printer was handling
only a couple of media sizes. Hence, if the app provides a
media size hint and the PDF printer does not support it, we
were essentially ignoring the suggested media size since it
was not supported by the selected printer and we fell back to
the default paper size for that printer. The fake PDF printer
should support all predefined media sizes.
2. The list of available paper sizes was shown in the order they
are added ignoring the current locale. It is much better user
experience if the media sizes used in the current locale are
shown at the top and all others after that. Also the media
sizes for the current locale should be alphabetically ordered
so the user can quickly find the desired one.
3. The orientation was reset on media size or printer change.
bug:
10564537
Change-Id: Iaa0d42242730ce69cea3effd4d0f4bc087068804
Alan Viverette [Fri, 4 Oct 2013 18:44:51 +0000 (11:44 -0700)]
Fix font scaling issues in FastScroller and SubtitleView
BUG:
11080227
Change-Id: I0aa84e9b56c6900ad47efd45a5a0f772ce43f810
Baligh Uddin [Fri, 4 Oct 2013 18:35:25 +0000 (11:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I927e06ba5d3e63e0744fac3faa82061dcf2c518d
Auto-generated-cl: translation import
Robert Greenwalt [Fri, 4 Oct 2013 18:33:51 +0000 (18:33 +0000)]
Merge "Revert "Use a build-specific wifi country code"" into klp-dev
Baligh Uddin [Fri, 4 Oct 2013 18:13:19 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Oct 2013 18:13:02 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Oct 2013 18:12:44 +0000 (18:12 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Oct 2013 18:08:41 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1227decae162536bf90ffb753308cb4018e0538e
Auto-generated-cl: translation import
Robert Greenwalt [Fri, 4 Oct 2013 18:07:33 +0000 (18:07 +0000)]
Merge "Un-deprecate getDhcpInfo" into klp-dev
Robert Greenwalt [Fri, 4 Oct 2013 18:06:13 +0000 (18:06 +0000)]
Merge "Don't redirect dns to an iface without dns servers" into klp-dev
Baligh Uddin [Fri, 4 Oct 2013 18:05:28 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0774c814f839f7a06aaa3cb023782e8eb0adf305
Auto-generated-cl: translation import
Baligh Uddin [Fri, 4 Oct 2013 18:02:34 +0000 (11:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id91951dbb1084dd04fd93aa1cd26b6b558ff33ef
Auto-generated-cl: translation import
Dianne Hackborn [Fri, 4 Oct 2013 17:47:33 +0000 (17:47 +0000)]
Merge "Fix issue #
10901205: Shouldn't send broadcasts (or try to bind services, etc.)..." into klp-dev
Robert Greenwalt [Fri, 4 Oct 2013 16:53:39 +0000 (09:53 -0700)]
Un-deprecate getDhcpInfo
Replacement api isn't available.
bug:
10003785
Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a
Svetoslav Ganov [Fri, 4 Oct 2013 16:50:53 +0000 (16:50 +0000)]
Merge "Deleting print job files when we do not have to." into klp-dev
Dianne Hackborn [Fri, 4 Oct 2013 16:49:04 +0000 (16:49 +0000)]
Merge "Fix issue #
11069176: Crash showing process stats" into klp-dev
Svetoslav [Fri, 4 Oct 2013 15:58:10 +0000 (15:58 +0000)]
Merge "Print UI tweaks as per UX request." into klp-dev
Svetoslav Ganov [Fri, 4 Oct 2013 15:49:03 +0000 (08:49 -0700)]
Deleting print job files when we do not have to.
The print job file name was not properly parsed. This resulted
in incorrect mapping from file to print job, thus deleting the
file when we do not have to.
bug:
11069354
Change-Id: I7b8a7a7f98dd77b34119f2a9cd16a6ec3c22b63b
Eric Laurent [Fri, 4 Oct 2013 15:18:32 +0000 (15:18 +0000)]
Merge "audioservice: fix DTMF stream volume" into klp-dev
Chet Haase [Fri, 4 Oct 2013 00:21:14 +0000 (17:21 -0700)]
Fix infinite recursion in hashcode of Spannables
An app created a SpannableStringBuilder, one of which's spans was the
instance of the string builder itself (that is, the builder contained a span
that was the builder). This caused infinite recursion in the hashcode()
method because it computes a hash from its fields, including all of its spans.
The fix detects the case where a span equals the current instance and
noops the computation on that span. A similar adjustment was made to equals()
to avoid the same recursion problem.
Issue #
11051658 StackOverflowError in android.text.SpannableStringBuilder.hashCode
Change-Id: I742687ab32d81ac51c4b9135f698cf5e96a1d295
Jonathan Dixon [Fri, 4 Oct 2013 12:01:47 +0000 (13:01 +0100)]
Fix CookieSyncManager for WebViewClassic
Add a workaround to ensure that the WebViewDatabase and JniUtil can
still be initialized as side effect of making a CookieSyncManager
This was collateral damage from the fixes for Bug
10932261
Change-Id: If5ba65a7822d5b0afc14139dd84125058bf96897
Jim Miller [Fri, 4 Oct 2013 02:26:55 +0000 (02:26 +0000)]
Merge "Replace searchlight asset" into klp-dev
Jim Miller [Fri, 4 Oct 2013 02:20:58 +0000 (19:20 -0700)]
Replace searchlight asset
Fixes bug
11030712
Change-Id: Ia25dec35dd3a8d59f98521e579bc1d269518c395
Jim Miller [Fri, 4 Oct 2013 02:18:34 +0000 (02:18 +0000)]
Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev
Jim Miller [Fri, 4 Oct 2013 01:31:34 +0000 (18:31 -0700)]
Fix bug where dismiss() was being called from the wrong thread
One-way calls to binder do not guarantee the call will always
occur on the originating thread. This fixes a rare case where
keyguard would crash due to dismiss() being called from the wrong
thread.
Fixes bug
11065316
Change-Id: Iddd281964231a152e3342e21b6b88527eab94caf
Adam Powell [Fri, 4 Oct 2013 01:29:34 +0000 (01:29 +0000)]
Merge "Fix a bug in action menu measurement" into klp-dev
Dianne Hackborn [Fri, 4 Oct 2013 01:27:48 +0000 (18:27 -0700)]
Fix issue #
10901205: Shouldn't send broadcasts (or try to bind services, etc.)...
...to crashing processes.
So don't.
Change-Id: I4b4fefb501b430fadaca93405206264318c8b95d
Adam Powell [Fri, 4 Oct 2013 01:21:58 +0000 (18:21 -0700)]
Fix a bug in action menu measurement
Thanks to a measurement optimization in KK, the view recycling
behavior of ActionMenuPresenter could get into a state where the
resulting ActionMenuView had changed but no layout was
requested. Explicitly request a layout during menu update. Also fix an
ancient typo.
Bug
11047996
Change-Id: I6289fd2d142ac7d2101fbec6de19b7d3d7fbd6a2
Alex Ray [Thu, 3 Oct 2013 19:17:54 +0000 (12:17 -0700)]
Add Consumer IR feature
Bug:
10676690
Change-Id: Id2c118225dc6ef259f5ed97da4071e9b6de3a83a
Eric Laurent [Fri, 4 Oct 2013 01:15:07 +0000 (18:15 -0700)]
audioservice: fix DTMF stream volume
DTMF stream must also be muted by silent mode when following ring
stream volume in order to be properly muted and unmuted when ringer
mode changes.
Also fix a problem in VolumeStreamState.setAllIndexes() when some
devices are not present in the stream state from which indexes
are copied.
Bug:
10932676.
Change-Id: I373d0fd1a475980786d97d97348d46a7e7421461
Wink Saville [Fri, 4 Oct 2013 00:52:59 +0000 (00:52 +0000)]
Merge "Use networkType to display wifi and mobile notification separately." into klp-dev
Vinit Deshapnde [Fri, 4 Oct 2013 00:40:31 +0000 (00:40 +0000)]
Merge "Set P2p statemachine's network manager before starting Wifi" into klp-dev
Dianne Hackborn [Fri, 4 Oct 2013 00:32:19 +0000 (17:32 -0700)]
Fix issue #
11069176: Crash showing process stats
Change-Id: Ie568ebcb9863bed95c775b9b28654a5e2dc464cd
Adam Powell [Fri, 4 Oct 2013 00:28:57 +0000 (00:28 +0000)]
Merge "Fix docs" into klp-dev
Yuhao Zheng [Fri, 4 Oct 2013 00:14:17 +0000 (00:14 +0000)]
Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev
Scott Main [Thu, 3 Oct 2013 23:46:53 +0000 (16:46 -0700)]
add -since flag for api level 19 to filter javadocs
Change-Id: I96e7e31f93b1e3c3877a342b84fb069bda5d92e3
Adam Powell [Thu, 3 Oct 2013 23:39:30 +0000 (16:39 -0700)]
Fix docs
Change-Id: I19e0cdab6c526f7eed376fc2067b5c49b31a3ea9
Vinit Deshapnde [Thu, 3 Oct 2013 23:18:56 +0000 (16:18 -0700)]
Set P2p statemachine's network manager before starting Wifi
Wifi statemachine starts P2p statemachine; which uses network management
service to (i.e. netd) to start p2p0 interface. But it only gets a
reference to network management service in conenctivityServiceReady().
Calling that later means there's a chance of a race between this
thread's setting of the network manager, and P2p statemachine thread's
usage of the same.
Bug:
11048296
Change-Id: If151026ed5fbb12db57ee7f9bdd47c67dd7142e5
Chet Haase [Thu, 3 Oct 2013 23:08:22 +0000 (23:08 +0000)]
Merge "Fix lockscreen wave animation artifacts" into klp-dev
Chet Haase [Wed, 2 Oct 2013 23:11:54 +0000 (16:11 -0700)]
Fix lockscreen wave animation artifacts
On some display sizes, the wave animation was sometimes
running more than once, starting over in the center and animating
outward... partially.
The problem was that the calculations determining the alpha value
of the dots was returning bogus values when the display area was
large enough, which is why the bug is only on some devices.
This fix simplifies the math and ensures that the wave only animates
once, from start to finish.
Issue #
11005936 regression on lockscreen animation for multi-wave widget
Change-Id: Id21a2e4d2271f01c82c4bc6e1f37d78e68b9b6e4
Adam Powell [Thu, 3 Oct 2013 22:35:34 +0000 (22:35 +0000)]
Merge "Add a scrubber to keyguard; layout tweaks" into klp-dev
Jim Miller [Thu, 3 Oct 2013 22:32:24 +0000 (22:32 +0000)]
Merge "Update default keyguard clock to new UX specification" into klp-dev
Jim Miller [Tue, 1 Oct 2013 23:55:19 +0000 (16:55 -0700)]
Update default keyguard clock to new UX specification
Change-Id: I0d5f302d8bd5922acd45cfe1de42cb76cebc02e5
Yuhao Zheng [Thu, 3 Oct 2013 21:37:47 +0000 (14:37 -0700)]
New Telephony APIs to return MMS UA and UAProfUrl
Added two public APIs under TelephonyManager to return MMS UserAgent and
UAProfUrl strings, for apps that handle SMS/MMS.
Bug:
11054501
Change-Id: Ifa1a64990fa2bf7d0e340d784a9672bf79525338
Adam Powell [Mon, 30 Sep 2013 23:16:24 +0000 (16:16 -0700)]
Add a scrubber to keyguard; layout tweaks
Switch KeyguardTransportControlView over to using RemoteController
instead of the internal API.
Guard transition animations behind a flag until we can work out some
intermittent issues.
Change-Id: Ie9f41339ce6e735c5d524db88437672f2c9859e2
Michael Wright [Thu, 3 Oct 2013 21:51:58 +0000 (21:51 +0000)]
Merge "Ensure WallpaperEngine has correct size information" into klp-dev
Raph Levien [Thu, 3 Oct 2013 20:48:04 +0000 (13:48 -0700)]
Fix Text appears on top of existing text when composing in gmail.
Fix for bug
6473708. This patch changes from "last update wins" to
merging together the change regions, in the logic of deciding which
blocks need to be updated for painting, so that when there are multiple
changes batched for a draw, they're all taken into account.
Change-Id: I183d453c436125e5efec7031b4d61b43989653f9
Craig Mautner [Thu, 3 Oct 2013 21:28:38 +0000 (21:28 +0000)]
Merge "Retain IME assignment if no windows accept input." into klp-dev
Vinit Deshapnde [Thu, 3 Oct 2013 21:19:52 +0000 (21:19 +0000)]
Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev
Michael Wright [Thu, 3 Oct 2013 21:16:42 +0000 (14:16 -0700)]
Ensure WallpaperEngine has correct size information
Currently it's possible for the WallpaperManagerService to receive a
request to change the desired wallpaper size between when it attaches
to the WallpaperService and when the Engine attaches back to it. This
means that the Engine will be created with the prior dimensions and
won't receive the update. Check to see if we're in this state and
make note to update the Engine once it attaches to ensure that the
Engine always has the correct dimensions.
Bug:
10853302
Change-Id: I8d5cd3371b269dbb4c0ff2d75c68529b69028ae5
Robert Greenwalt [Thu, 3 Oct 2013 21:13:49 +0000 (21:13 +0000)]
Revert "Use a build-specific wifi country code"
This reverts commit
c33cd23c17c24df33550a6662cedfe60b323604a.
bug:
11064682
Change-Id: I35825a7005e75f3abf02f23f31dee1cb7b101c31
Craig Mautner [Thu, 3 Oct 2013 21:07:45 +0000 (14:07 -0700)]
Retain IME assignment if no windows accept input.
Was skipping over the default assignment due to new null value for
windows (ag/361266).
Fixes bug
10987178.
Change-Id: I89efd41ab54b42de384eec84c5e937cc2a59d099
Marco Nelissen [Thu, 3 Oct 2013 20:51:36 +0000 (20:51 +0000)]
Merge "Fix layoutlib build" into klp-dev
Marco Nelissen [Thu, 3 Oct 2013 20:40:46 +0000 (13:40 -0700)]
Fix layoutlib build
Change-Id: Ica9f506ae06311d9bcd98bc11e64a8699d4f88cb
Alan Viverette [Thu, 3 Oct 2013 20:33:56 +0000 (20:33 +0000)]
Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev
Dianne Hackborn [Thu, 3 Oct 2013 19:19:10 +0000 (19:19 +0000)]
Merge "KLP/KitKat is now API 19." into klp-dev
Dianne Hackborn [Thu, 3 Oct 2013 18:05:14 +0000 (11:05 -0700)]
KLP/KitKat is now API 19.
Bug:
10348975
Change-Id: I19bf1a56064deda2e59085520960aac8ce3a825b
Jonathan Dixon [Thu, 3 Oct 2013 18:52:56 +0000 (18:52 +0000)]
Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev
Eino-Ville Talvala [Thu, 3 Oct 2013 18:33:54 +0000 (18:33 +0000)]
Merge "Camera2: Implement idle callbacks" into klp-dev
Dianne Hackborn [Thu, 3 Oct 2013 17:45:42 +0000 (17:45 +0000)]
Merge "Implement issue #
11050739: Show swapped out RAM" into klp-dev
Dianne Hackborn [Thu, 3 Oct 2013 17:44:38 +0000 (17:44 +0000)]
Merge "Fix issue #
10378741: configupdater needs to be explicit when it calls startService()" into klp-dev
Dianne Hackborn [Thu, 3 Oct 2013 17:44:18 +0000 (17:44 +0000)]
Merge "Fix issue #
11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev
Dianne Hackborn [Thu, 3 Oct 2013 17:42:26 +0000 (10:42 -0700)]
Fix issue #
10378741: configupdater needs to be explicit when it calls startService()
Not enough time to fix everything, so instead we'll make it a warning
in this release and finish up turning it into a target-SDK based
exception in the next release.
Change-Id: I5aae64a1225a145f03ba4162238b53d5e401aba2
Dianne Hackborn [Thu, 3 Oct 2013 17:23:04 +0000 (17:23 +0000)]
Merge "Fix issue #
10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev
Daniel Sandler [Thu, 3 Oct 2013 17:20:21 +0000 (17:20 +0000)]
Merge "Goo goo ga joob." into klp-dev
Dianne Hackborn [Thu, 3 Oct 2013 17:19:20 +0000 (10:19 -0700)]
Fix issue #
10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
...fails from KRS84 across all platforms
My fix for issue #
10807048 was wrong, wrong, wrong. The problem was
actually just a stupid mistake in ArrayMap.erase(). This makes it
all right.
Change-Id: I762f7a2d5100bceb86a091ab3d6368edc21b4266
Jeff Sharkey [Thu, 3 Oct 2013 17:18:38 +0000 (17:18 +0000)]
Merge "Fix mount path prefix checking." into klp-dev
Jonathan Dixon [Thu, 3 Oct 2013 10:03:31 +0000 (11:03 +0100)]
Decouple construction of WebView, CookieSyncManager, WebViewDatabase
Bug
10932261
Most of this flow exists purely to get the Context from
CookieSyncManager.createInstance over to WebViewDatabaseClassic. Make
that depenency more explicit (with a TODO to remove it) and this allows
a much simpler CookieSyncManager implementation for the normal case.
Note after this patch, CookieSyncManager.getInstance() is technically fine
to call without a prior call to createInstance, but retaining the
ordering requirement as a convenience for anyone developing on new OS
but still supporting the older versions.
(Note that CookieSyncManager instance is not required for correct
operation of either existing webview, so these changes only impact
the public API contract of object lifetimes, not the underlying
implementation)
Change-Id: I51fdd6622704f1c749277fee6df2f84ac4c704d2
Marco Nelissen [Thu, 3 Oct 2013 16:34:57 +0000 (16:34 +0000)]
Merge "Add PowerManager method to assign blame to a single uid" into klp-dev