110518 Commits

Author SHA1 Message Date
keunyoung
1eb0637f2a fix race condition when a new display is added
- When a new display is added, display add event triggers handleDisplayAddedLocked in
  WindowManagerService asynchronously.
- After creating virtual display, application can move on and call addWindow before
  handleDisplayAddedLock is called.
- Application's addWindow leads into creating a new DisplayContent, and a window will be added there.
- But when handleDisplayAddedLocked is called later, it will create a new DisplayContent for the
  display, and the window added by the application will be lost.
- This CL tries to fix the issue by checking the presence of DisplayContent before creating a new
  one.

bug: 9975297

Change-Id: I9fac7ffb57c3e1effa8f0e950539cfae73e7e1c6
2013-08-12 16:21:14 -07:00
Vinit Deshapnde
4b2766a3d8 Fix a bug in single socket connection to Wifi Supplicant
My change to post messages without IFACE=<iface> prefix to all interfaces
was correct; but messages sent with IFACE=p2p-p2p0-0 et al were being sent
to p2p monitor only. This change mimics that to resolve some issues
introduced by the single socket change.

Bug: 10257602
Change-Id: Ia6164cb3cfd11c2a0a7b011eceaeabfd9677f62c
2013-08-12 15:54:01 -07:00
Victoria Lease
ebec4b6e38 Merge "fix kBW_Format glyphs" into klp-dev 2013-08-12 22:39:26 +00:00
Victoria Lease
723b2feb92 fix kBW_Format glyphs
Oops! kBW_Format was omitted from a couple of switch statements,
resulting in glyphs in that format being invisible.

Bug: 10206452
Change-Id: Ib2aa52250aeeecc0de1b1b78e3d0f568f368c73e
2013-08-12 15:12:49 -07:00
Romain Guy
d1f6b6245c Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev 2013-08-12 20:52:13 +00:00
Alan Viverette
890db42b0d Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev 2013-08-12 20:47:39 +00:00
Svetoslav
b9b1701dca Merge "Make PrintFileDocumentAdapter non-final." into klp-dev 2013-08-12 20:34:12 +00:00
Svetoslav
9abf735387 Make PrintFileDocumentAdapter non-final.
Change-Id: I89a46bf766f5270dfaba7482b7b7cd997e19821a
2013-08-12 13:32:52 -07:00
Alan Viverette
b339cc5bcb Not create context menu when mouse right click outside list/grid items
Even if mouse right click outside of list/grid items, a context menu
is made. But there is no item of the list, so a context menu info is
null. Then, NullPointerException happens at onCreateContextMenu()
using a context menu info.
For fixing the problem, check mTouchMoude and mMotionPosition to
distingusih where is clicked, on a list item or not, before
performButtonActionOnTouchDown() which makes a context menu.

Manually merged from AOSP contribution.

Change-Id: I778be73df36abbfd4ba9534d8e7a1ece6844ed40
Author: henrik baard <henrik.baard@sonymobile.com>
2013-08-12 13:29:15 -07:00
Romain Guy
b15b446f42 Take text alignment into account to compue text bounds
Bug #10258621

Change-Id: I91abf1829a1814410ce8c0c2c17d888031987f18
2013-08-12 13:25:29 -07:00
Chet Haase
cd89feb9d1 Merge "pause/resume for Animators" into klp-dev 2013-08-12 19:57:23 +00:00
Craig Mautner
b6da9115ee Merge "Remove incorrect warning." into klp-dev 2013-08-12 19:43:25 +00:00
Craig Mautner
61574705d3 Remove incorrect warning.
The warning about an ActivityRecord not being assigned a task was
incorrect in the location modified by this fix. In this case an
existing ActivityRecord is relaunched so it is not necessary to
assign the task to the passed ActivityRecord.

Addresses the warning associated with bug 10181389.

Change-Id: I76d5066c320bf9da2663bc34bcaca801ad4953bc
2013-08-12 12:29:40 -07:00
Katie McCormick
076d378760 am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit '6441b9bd19c9226ad1e6c01008b79a51baf75cff':
  Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:25:41 -07:00
Katie McCormick
6441b9bd19 am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit 'e50078961ab0134ff5bcf57a9e8cc4b04027f942':
  Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:21:47 -07:00
Katie McCormick
e50078961a am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit 'e78b4f53392d25eda4a121670aca518df9615f71':
  Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:18:45 -07:00
Katie McCormick
e78b4f5339 Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:07:26 -07:00
Chet Haase
8aa1ffb0ed pause/resume for Animators
It is now possible to pause Animator-based animations. Pausing an
animator causes it to hold the current time/value indefinitely, or
until end/cancel/resume is called. When resume() is called, it continues
from where it left off.

There is a new listener interface on Animator, AnimatorPauseListener,
which can be used to listen to pause/resume events.

Change-Id: I77d1535e792fb7bf349f549a0ac0a0d85958cb47
2013-08-12 11:51:32 -07:00
Selim Gurun
1232c51eed Merge "Add the API to support webview printing" into klp-dev 2013-08-12 18:27:38 +00:00
Romain Guy
964f2b3028 Merge "Update Bitmap.createBitmap() documentation" into klp-dev 2013-08-12 18:11:36 +00:00
Romain Guy
790552b240 Update Bitmap.createBitmap() documentation
Change-Id: Ic2efed6cc03c8b2c2d9810b7ab645b0b98b91e1f
2013-08-12 11:10:27 -07:00
Selim Gurun
2167c0be56 Add the API to support webview printing
Bug: 10190508
Change-Id: I47fc46bb1ea632876048b29621843f781c47aab7
2013-08-12 10:55:39 -07:00
Scott Main
b45b39a263 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 'cdf3455c502891683eaa242a14e413ff947dabe3':
  Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
2013-08-12 10:46:33 -07:00
Scott Main
cdf3455c50 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 '6dd38cc5343106251c8d66ab11bb93550082e594':
  Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
2013-08-12 10:44:44 -07:00
Scott Main
6dd38cc534 Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
Submitted the original revert too soon.

This reverts commit ebcee19783c4fe5ba776353e95974383850a4685.

Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
2013-08-12 17:40:37 +00:00
Scott Main
fefff42255 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 '7466b998e6091b4857372611c66b6eca2b9324fb':
  Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later.
2013-08-12 10:15:29 -07:00
Andreas Huber
226065bbe6 Expose MediaCodec.setParameters API to
- change video target bitrate on the fly
- request sync frames
- temporarily suspend feeding input buffers to the encoder

Change-Id: If5cf1162b2eeb28ac08288ecfa9f0e9823dd972e
2013-08-12 10:14:11 -07:00
Scott Main
7466b998e6 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 'ebcee19783c4fe5ba776353e95974383850a4685':
  Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later.
2013-08-12 10:14:03 -07:00
Scott Main
ebcee19783 Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev"
revert to fix conflicts, i'll fix it all later.

This reverts commit 385bb2eb5184686c2d953fe4757522e61acb3392.

Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
2013-08-12 17:08:28 +00:00
Scott Main
b478b10f34 Revert "Doc change: collapse key fix."
To resolve conflict. I'll fix it all later.

This reverts commit 53d9628d080aa7339b724a994607022c5386a566.
2013-08-12 09:57:24 -07:00
Andreas Huber
8d5f3e31c9 Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef
for safer refcounting. Previously jclass objects were not DeleteLocalRef'ed
at all, leading us to exhaust the local ref pool quickly in certain
circumstances.

This change also makes sure we properly serialize int64_t entries when
converting from AMessage to HashMap and boosts thread priority for
java-instantiated MediaCodecs slightly from NORMAL to FOREGROUND.

Change-Id: I4ebdd8a5ca6b3442698c9f86fcc31af8c199aaf5
2013-08-12 09:23:49 -07:00
Baligh Uddin
2bab15e513 Import translations. DO NOT MERGE
Change-Id: Iff45d8191fc4ac1fb7ae48c680cebd3f9dcf83da
Auto-generated-cl: translation import
2013-08-12 09:06:40 -07:00
Baligh Uddin
8ec6f76c6f Import translations. DO NOT MERGE
Change-Id: I7f40ed1081baa41a3990a2a0a7e59f0e1df97752
Auto-generated-cl: translation import
2013-08-12 08:47:17 -07:00
Martin Kosiba
9a68f82f37 Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE
Cherry pick of master I210dbab01c8b8d1eeff316a23c5d011e2e6c2a74

This exposes the super_onDrawVerticalScrollBar method which will
be called by the WebViewChromium implementation.

Change-Id: I3fe348633c163514e67b7712f1e9a086dee3d338
2013-08-12 13:15:20 +01:00
Ben Murdoch
ed735c9aeb Add missing cleanspec
Change-Id: I92d6329e3c404249876e707048f6808f35fb019b
2013-08-12 09:33:38 +01:00
Jeff Sharkey
998cfa2c63 Merge "API to discover granted Uri permissions." into klp-dev 2013-08-12 03:59:58 +00:00
Jeff Sharkey
08da7a1143 API to discover granted Uri permissions.
Now that granted Uri permissions can be persisted across reboots,
offer APIs to discover them. Returns incoming or outgoing grants
matching the requested flags and mask. Add helper method to discover
"open" documents using this new API and filtering for non-documents.

Require that callers own at least of the filtering packages to avoid
exposing all grants. Switch internal grant tracking to use ArrayMap.

Change-Id: I0a755f221d0d160b411f8d3cfc48279b64345733
2013-08-11 20:56:15 -07:00
Jeff Sharkey
c2f8da8756 Merge "Bring along BridgeContext for the ride." into klp-dev 2013-08-12 02:09:51 +00:00
Jeff Sharkey
b9be11c370 Bring along BridgeContext for the ride.
Change-Id: Ic11c0df447c82be3922d529f18a290cfdfec6b05
2013-08-11 19:08:39 -07:00
Jeff Sharkey
436b6ee350 Merge "Catch a few extra users of UserEnvironment." into klp-dev 2013-08-12 00:46:33 +00:00
Jeff Sharkey
7f392defcc Catch a few extra users of UserEnvironment.
Change-Id: I3112773b72c329893e4118ef1c4f4087d899139e
2013-08-11 17:42:17 -07:00
Jeff Sharkey
6e14b22cfe Merge "APIs for multiple external storage devices." into klp-dev 2013-08-12 00:13:35 +00:00
Jeff Sharkey
1abdb71230 APIs for multiple external storage devices.
Provide developer APIs to discover application-specific paths on
secondary external storage devices.  Covers files, cache, and OBB
directories.  Apps will not have write access outside their package-
specific directories on secondary devices, so only primary storage is
exposed through Environment.

Creation of .nomedia files will be handled by FUSE daemon in future
change.

Change-Id: Ifcce6201a686d80269d7285adb597c008cf8fa7c
2013-08-11 17:07:44 -07:00
Svetoslav Ganov
b8160401a6 Merge "Fix the build" into klp-dev 2013-08-11 22:27:00 +00:00
Svetoslav Ganov
55daead3c5 Fix the build
Change-Id: Icf3b339f7b300cc8673443fa8afd38ce78964683
2013-08-11 15:26:13 -07:00
Svetoslav Ganov
c7c4d6dd4d Merge "Refinement of the print service APIs." into klp-dev 2013-08-11 21:42:54 +00:00
Svetoslav Ganov
798bed6cc7 Refinement of the print service APIs.
1. Factored out the printer discovery APIs of a print service in a
   dedicated session object that is created by the print service on
   demand. This ensures that added/removed/updated printers from
   one session do not interfere with another session.

2. Updated the app facing APIs to pass in a document info along
   with a printed file. Also exposed the print file adapter so
   apps that create a temporary file for printing can intercept
   when it is read by the system so the file can be deleted.

3. Updated the print service documentation.

Change-Id: I3473d586c26d8bda1cf7e2bdacb441aa9df982ed
2013-08-11 14:40:05 -07:00
Craig Mautner
0dd303cfdb Merge "Put animation background behind visible wallpaper" into klp-dev 2013-08-10 18:52:39 +00:00
Craig Mautner
6201c2ac41 Put animation background behind visible wallpaper
The new wallpaper positioning associated with multiple activity stacks
put animation backgrounds in front of the wallpaper. This caused
hideous jank. Testing for visible wallpaper and moving the background
behind it fixes the jank.

Fixes bug 10078282.
Possibly fixes bug 10247094.

Change-Id: I3f4e07accd7276d59725192081904b791f77781f
2013-08-10 11:48:18 -07:00
Wink Saville
a48ad8bd85 PROXY_SERVICE may be missing and its reference null.
Protect ourselves from when PROXY_SERVICE is missing
and mProxyService is null.

Bug: 10267814
Change-Id: Ia329376218e246cdde3d70b578c18466d48a6383
2013-08-10 11:22:31 -07:00