OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "Part of corrections from KLP API Review: Media" into klp-dev
Jeff Tinker [Sat, 14 Sep 2013 00:16:34 +0000 (00:16 +0000)]
Merge "Part of corrections from KLP API Review: Media" into klp-dev

10 years agoMerge "Fix merged operation clipping" into klp-dev
Chris Craik [Sat, 14 Sep 2013 00:12:37 +0000 (00:12 +0000)]
Merge "Fix merged operation clipping" into klp-dev

10 years agoMerge "Prune shared users that the system declares but does not use" into klp-dev
Christopher Tate [Sat, 14 Sep 2013 00:11:47 +0000 (00:11 +0000)]
Merge "Prune shared users that the system declares but does not use" into klp-dev

10 years agoMerge "Remove obsolete assets from target /system/media/video/" into klp-dev
Glenn Kasten [Sat, 14 Sep 2013 00:07:44 +0000 (00:07 +0000)]
Merge "Remove obsolete assets from target /system/media/video/" into klp-dev

10 years agoMerge "Fix issue #10747324: adb install hangs" into klp-dev
Dianne Hackborn [Sat, 14 Sep 2013 00:04:43 +0000 (00:04 +0000)]
Merge "Fix issue #10747324: adb install hangs" into klp-dev

10 years agoFix issue #10747324: adb install hangs
Dianne Hackborn [Sat, 14 Sep 2013 00:01:26 +0000 (17:01 -0700)]
Fix issue #10747324: adb install hangs

Dumb typo was clearing the wrong service array, causing
us to sometimes forget we were launching a service.

Change-Id: Ie1aba0e07d19e85a104a5985e3cead5f28a0556a

10 years agoPrune shared users that the system declares but does not use
Christopher Tate [Fri, 13 Sep 2013 23:58:36 +0000 (16:58 -0700)]
Prune shared users that the system declares but does not use

Bug 10184643

Change-Id: I72c5177c621c24fac34bf8744eb6c5108b6d3464

10 years agoMerge "Don't recycle action button views" into klp-dev
Adam Powell [Fri, 13 Sep 2013 23:46:38 +0000 (23:46 +0000)]
Merge "Don't recycle action button views" into klp-dev

10 years agoMerge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev
Rachad Alao [Fri, 13 Sep 2013 23:44:43 +0000 (23:44 +0000)]
Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev

10 years agoMerge "More UX updates around picking images." into klp-dev
Jeff Sharkey [Fri, 13 Sep 2013 23:33:27 +0000 (23:33 +0000)]
Merge "More UX updates around picking images." into klp-dev

10 years agoMerge "When launching home activity, make sure it is top." into klp-dev
Craig Mautner [Fri, 13 Sep 2013 23:33:17 +0000 (23:33 +0000)]
Merge "When launching home activity, make sure it is top." into klp-dev

10 years agoMerge "Roaming Icon should not displayed with Indosat's old SIM" into klp-dev
Vineeta Srivastava [Fri, 13 Sep 2013 23:29:31 +0000 (23:29 +0000)]
Merge "Roaming Icon should not displayed with Indosat's old SIM" into klp-dev

10 years agoMerge "Implement #10749688: Improve low memory reporting" into klp-dev
Dianne Hackborn [Fri, 13 Sep 2013 23:06:07 +0000 (23:06 +0000)]
Merge "Implement #10749688: Improve low memory reporting" into klp-dev

10 years agoMore UX updates around picking images.
Jeff Sharkey [Fri, 13 Sep 2013 20:42:19 +0000 (13:42 -0700)]
More UX updates around picking images.

When picking images or videos, hide the titles in recents, since the
thumbnails should speak for themselves.  Also respect new flag that
allows a directory to request their titles be hidden.

Show directory icon hint in grid mode when showing a thumbnail, to
remind user it's a directory.

Filter directories out of recents.  Hide most action bar icons on
phones, even when room.  Only show drawer on first launch.  Hide most
drawer headers to match spec.

Bug: 10710331
Change-Id: I0ef1973ddd62750f57345336388366eda1449720

10 years agoImplement #10749688: Improve low memory reporting
Dianne Hackborn [Wed, 11 Sep 2013 02:06:15 +0000 (19:06 -0700)]
Implement #10749688: Improve low memory reporting

This significantly reworks the logging we do when
all cached processes are killed:

- We now collect the list of processes in-place so we
  have a snapshot of exactly when the low memory situation
  happened.
- In that snapshot we include the key process state: oom
  adj, proc state, adj reasons.
- The report then asynchronously collects pss information
  for those processes.
- The ultimate data printed to the log looks like a mix
  between the "dumpsys meminfo" and "dumpsys activity"
  output.  This code no longer uses "dumpsys meminfo"
  itself, so some of that data is no longer included,
  in particular pss organized by allocation type.

In doing this, I realized that the existing code that is
supposed to run "procstats" is not currently working.  And
at that point I realized, really, when we are collecting
this pss data we'd really like to include all those native
processes using ghod-only-knows how much RAM.  And guess
what, we have a list of processes available in
ProcessCpuTracker.

So we now also collect and print information for native
processes, and we also do this for "dumpsys meminfo" which
really seems like a good thing when we are printing summaries
of all pss and such.

I also improved the code for reading /proc/meminfo to be
able to load all the interesting fields from there, and
am now printing that as well.

Change-Id: I9e7d13e9c07a8249c7a7e12e5433973b2c0fdc11

10 years agoMerge "Fixed review comments" into klp-dev
Zhihai Xu [Fri, 13 Sep 2013 23:00:21 +0000 (23:00 +0000)]
Merge "Fixed review comments" into klp-dev

10 years agoWhen launching home activity, make sure it is top.
Craig Mautner [Fri, 13 Sep 2013 22:34:08 +0000 (15:34 -0700)]
When launching home activity, make sure it is top.

Because recents sits on the same stack as launcher it can sometimes be
above launcher. When we were launching home activity because the flag
told us to we would sometimes launch recents instead. This fix makes
sure that the home activity is on the top when it is supposed to be
launched next.

Previously this was fixed by having recents move itself to the back
of the stack after it launched an activity (b/9750207 and ag/336019).
But that solution caused the AppTransition to be set to
TRANSIT_TASK_TO_BACK which left the SOFT_INPUT_IS_FORWARD_NAVIGATION
flag unset. This in turn caused IMEs to remain unlaunched when
returning from recents (b/10240567).

Fixes bug 10240567.

Change-Id: I35c6619af0e68d0e6d9ab87cad06ea7c27e11e27

10 years agoMerge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev
Victoria Lease [Fri, 13 Sep 2013 22:32:58 +0000 (22:32 +0000)]
Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev

10 years agoPart of corrections from KLP API Review: Media
Jeff Tinker [Fri, 13 Sep 2013 22:32:08 +0000 (15:32 -0700)]
Part of corrections from KLP API Review: Media

b/10461617

Change-Id: Ic2e102c39428f7cef2923d00a67aec8c77cd108e

10 years agoRoaming Icon should not displayed with Indosat's old SIM
Sungmin Choi [Fri, 13 Sep 2013 20:42:34 +0000 (13:42 -0700)]
Roaming Icon should not displayed with Indosat's old SIM

Bug: 10403087
Change-Id: If2ea5650ed9a665da94f2941507fb273800b3ab8

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 13 Sep 2013 22:13:09 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView
Deepanshu Gupta [Fri, 13 Sep 2013 22:01:00 +0000 (15:01 -0700)]
am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView

* commit '31207780338b97e396927701ca0da7a61d6d44b2':
  Fix ClassCastException when rendering ListView

10 years agoam 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView
Deepanshu Gupta [Fri, 13 Sep 2013 21:57:35 +0000 (14:57 -0700)]
am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView

* commit '0ecfe3819269062805c4c56cdc1470c2fc3856c8':
  Fix ClassCastException when rendering ListView

10 years agoam 54d88f76: Fix ClassCastException when rendering ListView
Deepanshu Gupta [Fri, 13 Sep 2013 21:55:06 +0000 (14:55 -0700)]
am 54d88f76: Fix ClassCastException when rendering ListView

* commit '54d88f7678387a6eb871ec2dccd36af4ff35b1fe':
  Fix ClassCastException when rendering ListView

10 years agoFix merged operation clipping
Chris Craik [Fri, 13 Sep 2013 21:41:31 +0000 (14:41 -0700)]
Fix merged operation clipping

bug:10745870

Missing 'const' meant MergingDrawBatch would never clip anything.

Change-Id: Ia6367eff94cf5f437efafbc3ba7f0da102ffd956

10 years agoNotoColorEmoji.ttf is the new AndroidEmoji.ttf
Victoria Lease [Fri, 13 Sep 2013 21:11:58 +0000 (14:11 -0700)]
NotoColorEmoji.ttf is the new AndroidEmoji.ttf

Bug: 10144988
Change-Id: I04ebb86e283b752c43597b5f908f5c28f7806ee1

10 years agoMerge "checkMobileProvisioning should not block." into klp-dev
Wink Saville [Fri, 13 Sep 2013 20:55:36 +0000 (20:55 +0000)]
Merge "checkMobileProvisioning should not block." into klp-dev

10 years agoMerge "Guarantee that PAC Local Proxy owns Port" into klp-dev
Jason Monk [Fri, 13 Sep 2013 20:31:53 +0000 (20:31 +0000)]
Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev

10 years agoCamera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
Zhijun He [Fri, 13 Sep 2013 18:32:20 +0000 (11:32 -0700)]
Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG

It collides with HAL ZSL template, rename it to TEMPLATE_ZERO_SHUTTER_LAG and
hide it for now.

Bug: 10690122
Change-Id: I793154849aa7aa4bf4874e2ff3f3890dd05b1f9e

10 years agoam a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc
Scott Main [Fri, 13 Sep 2013 20:04:43 +0000 (13:04 -0700)]
am a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc

* commit 'a73e5df060262d1fc92f76fcc7a3a3d4537f9a0a':
  fix title for uses-sdk doc

10 years agoam cdde6dc6: am 95e7df91: fix title for uses-sdk doc
Scott Main [Fri, 13 Sep 2013 20:02:20 +0000 (13:02 -0700)]
am cdde6dc6: am 95e7df91: fix title for uses-sdk doc

* commit 'cdde6dc6675207708020fbe7458b13ccf22fe492':
  fix title for uses-sdk doc

10 years agoMerge "Add hidden API for querying available 'home' activities" into klp-dev
Christopher Tate [Fri, 13 Sep 2013 20:01:17 +0000 (20:01 +0000)]
Merge "Add hidden API for querying available 'home' activities" into klp-dev

10 years agoMerge "Move search to roots; Documents root; hide empty." into klp-dev
Jeff Sharkey [Fri, 13 Sep 2013 20:00:14 +0000 (20:00 +0000)]
Merge "Move search to roots; Documents root; hide empty." into klp-dev

10 years agoam 95e7df91: fix title for uses-sdk doc
Scott Main [Fri, 13 Sep 2013 19:59:59 +0000 (12:59 -0700)]
am 95e7df91: fix title for uses-sdk doc

* commit '95e7df915fd3c173b4d8d71c1ac5cbeaa8c8e7ed':
  fix title for uses-sdk doc

10 years agofix title for uses-sdk doc
Scott Main [Fri, 13 Sep 2013 19:55:20 +0000 (12:55 -0700)]
fix title for uses-sdk doc

Change-Id: I544868d209f04cb46928861148e9320fc0118f56

10 years agocheckMobileProvisioning should not block.
Wink Saville [Fri, 13 Sep 2013 19:40:11 +0000 (12:40 -0700)]
checkMobileProvisioning should not block.

In checkMobileProvisioning the call to mdst.isProvisioningNetwork() is
a blocking call and during monkey testing without SIM this is causing
ANR's. Move the initial test for provisioning into isMobileOk so
checkMobileProvisioning doesn't block.

If mobile is not supported return CMP_RESULT_NO_CONNECTION.

Cleaned up some debug.

Bug: 10674404
Change-Id: I10a0e922cd6ea9790f66e2083f37e68cb0a8861f

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 13 Sep 2013 19:23:22 +0000 (12:23 -0700)]
Import translations. DO NOT MERGE

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

10 years agoAdd hidden API for querying available 'home' activities
Christopher Tate [Thu, 5 Sep 2013 23:38:58 +0000 (16:38 -0700)]
Add hidden API for querying available 'home' activities

To support improved home-app selection UX in Settings.

Bug 9958444

Change-Id: I106090784618bf7bea6fce28f4f9b9fb8480d310

10 years agoMove search to roots; Documents root; hide empty.
Jeff Sharkey [Fri, 13 Sep 2013 04:59:06 +0000 (21:59 -0700)]
Move search to roots; Documents root; hide empty.

Documents searches now happen root-wide, instead of only under a
subdirectory.  Updates abstract class and flags to match.  Add flag
for a root to indicate it's empty, and hide empty roots in UI unless
creating.

Define "Documents" public directory and storage backend to contain
files.

Bug: 107120571071086510710758
Change-Id: I8716367568969f9cb1d83927b2bf5a7013809350

10 years agoDon't recycle action button views
Adam Powell [Fri, 13 Sep 2013 17:57:06 +0000 (10:57 -0700)]
Don't recycle action button views

Recycling action button views interferes with transition
animations. Suppress menu item view recycling for them.

Change-Id: I69d7561e337be7e4a89b7cf30b6c9439f2d49cc2

10 years agoRemove obsolete assets from target /system/media/video/
Glenn Kasten [Fri, 13 Sep 2013 17:16:12 +0000 (10:16 -0700)]
Remove obsolete assets from target /system/media/video/

These were previously used for background replacement effect, but it seems
like they aren't needed any more and just take up space in filesystem.

Change-Id: I0782ac0c8f109e4f28e9f43c20d30dc6ccd82ef7

10 years agoImplement #10744011: Serialize running of background services
Dianne Hackborn [Thu, 5 Sep 2013 19:31:16 +0000 (12:31 -0700)]
Implement #10744011: Serialize running of background services

Added some code to the activity manager to keep track of
services that are launching and limit the number that can
be launched concurrently.  This only comes into play under
specific circumstances: when the service launch is a background
request (so timing is not important) and its process is not
already running at a high priority.

In this case, we have a list of services that are currently
launching and when that gets too big we start delaying the
launch of future services until currently launching ones are
finished.

There are some important tuning parameters for this: how many
background services we allow to launch concurrently (currently
1 on low-ram devices, 3 on other devices), and how long we
wait for a background service to run before consider it to be
a more long-running service and go on to the next pending
launch (currently set to 15 seconds).

Also while in here, did some cleanup of the service code:

- A little refactoring to make per-user data cleaner.
- Switch to ArrayMap.

Change-Id: I09f372eb5e0f81a8de7c64f8320af41e84b90aa3

10 years agoGuarantee that PAC Local Proxy owns Port
Jason Monk [Fri, 23 Aug 2013 23:21:25 +0000 (19:21 -0400)]
Guarantee that PAC Local Proxy owns Port

This changes the PAC support to not broadcast the Proxy information until
the Local Proxy has started up and successfully bound to a port so that
the local proxy information can be guaranteed to be owned by the proxy.

Bug: 10459877
Change-Id: I175cd3388c758c55e341115e4a8241884b90d633

10 years agoMerge "SystemUI status bar/quick settings updates." into klp-dev
John Spurlock [Fri, 13 Sep 2013 08:42:06 +0000 (08:42 +0000)]
Merge "SystemUI status bar/quick settings updates." into klp-dev

10 years agoMerge "MediaFormat: add getInteger with default value convenience method" into klp-dev
Lajos Molnar [Fri, 13 Sep 2013 02:17:03 +0000 (02:17 +0000)]
Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev

10 years agoSystemUI status bar/quick settings updates.
John Spurlock [Thu, 12 Sep 2013 13:50:50 +0000 (09:50 -0400)]
SystemUI status bar/quick settings updates.

Status bar:
 - Update remaining mute/speakerphone icons.
 - Remove orange versions of wifi/signal icons.
 - Use only full versions of data type overlays.
 - Remove obsolete light versions of data type overlays.
 - Low battery color back to red.

Quick settings:
 - Update to indicate problem (orange) status.
 - Update to new battery style.

And a few remaining xx assets.

Bug:10680149
Bug:10502089
Bug:10729729
Bug:10316062
Change-Id: Iccd936d90271e4ec5c48e688917225136e7d45aa

10 years agoMerge "Don't send the same values to onUpdateSelection repeatedly" into klp-dev
Jean Chalard [Fri, 13 Sep 2013 02:16:47 +0000 (02:16 +0000)]
Merge "Don't send the same values to onUpdateSelection repeatedly" into klp-dev

10 years agoMerge "Fix CalledFromWrongThreadException in MediaPlayer's subtitle support" into...
Lajos Molnar [Fri, 13 Sep 2013 02:16:27 +0000 (02:16 +0000)]
Merge "Fix CalledFromWrongThreadException in MediaPlayer's subtitle support" into klp-dev

10 years agoFixed review comments
Kim Schulz [Thu, 22 Aug 2013 09:18:02 +0000 (11:18 +0200)]
Fixed review comments

- fixed review comments (internal+google)
- corrected tabs/spaces
- Add connection id header for obex client operations
- added support for implementing ProfileService class

Change-Id: Idab8b4fa54a0f31bec4ffa263a69a9850a07f858

Bug:10692365

10 years agoMerge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev
Alan Viverette [Fri, 13 Sep 2013 01:45:10 +0000 (01:45 +0000)]
Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev

10 years agoMerge "Remove unneeded print APIs and update the min margins APIs." into klp-dev
Svetoslav [Fri, 13 Sep 2013 01:43:40 +0000 (01:43 +0000)]
Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev

10 years agoMerge "Always disable the clip for layers Bug #8149344" into klp-dev
Romain Guy [Fri, 13 Sep 2013 01:18:30 +0000 (01:18 +0000)]
Merge "Always disable the clip for layers Bug #8149344" into klp-dev

10 years agoMerge "DocumentsUI tablet support." into klp-dev
Jeff Sharkey [Fri, 13 Sep 2013 00:21:52 +0000 (00:21 +0000)]
Merge "DocumentsUI tablet support." into klp-dev

10 years agoAdd live region politeness to View, AccessibilityNodeInfo
Alan Viverette [Fri, 13 Sep 2013 00:16:09 +0000 (17:16 -0700)]
Add live region politeness to View, AccessibilityNodeInfo

Alters the content change API to contain a bit mask of types of
changes represented by the event. Live regions send CONTENT_CHANGED
events immediately. Removes unused APIs for EXPANDABLE/EXPANDED.

BUG: 10527284
Change-Id: I21523e85e47df23706976dc0a8bf615f83072c04

10 years agoMerge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev
Robert Greenwalt [Fri, 13 Sep 2013 00:04:30 +0000 (00:04 +0000)]
Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev

10 years agoRemove unneeded print APIs and update the min margins APIs.
Svetoslav [Thu, 12 Sep 2013 21:37:47 +0000 (14:37 -0700)]
Remove unneeded print APIs and update the min margins APIs.

1. Removed unneeded code in Resolution that was storing its
   label as resource and package name. We do not have predefined
   resolutions, therefore we always persist the label.

2. Renamed the print attribute margins to minMargins to reflect
   that these are the minimal margins the printer support. Updated
   the docs as well.

3. Renamed the create method of all builder to build.

bug:10727487

Change-Id: Ie72ab8aaa5215b8bd2853885011b3b4efa4deb2e

10 years agoMerge "Define config_volte_replacement_rat." into klp-dev
Wink Saville [Thu, 12 Sep 2013 23:49:50 +0000 (23:49 +0000)]
Merge "Define config_volte_replacement_rat." into klp-dev

10 years agoDocumentsUI tablet support.
Jeff Sharkey [Thu, 12 Sep 2013 23:25:02 +0000 (16:25 -0700)]
DocumentsUI tablet support.

Shows as a faux dialog on larger tablets, since the normal dialog
themes from framework don't support action bars.  Instead, this hacks
itself to look like a dialog with an InsetDrawable.  Detects touches
in dim area to dismiss dialog.

Show all action bar icons on tablets, and roots panel is always
visible with a different shadow. Show settings in dialog. Allow mode
switches in recents.

Bug: 10329832
Change-Id: Id02982ce7b0d4694962d32f8d5286fdfcc207208

10 years agoMerge "Fix build break with missing VDBG." into klp-dev
Stephen Hines [Thu, 12 Sep 2013 23:33:25 +0000 (23:33 +0000)]
Merge "Fix build break with missing VDBG." into klp-dev

10 years agoMerge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev
Raph Levien [Thu, 12 Sep 2013 23:28:29 +0000 (23:28 +0000)]
Merge "Fix for AIOBE at android.text.AndroidBidi.directions" into klp-dev

10 years agoMerge "Publish Print Api for Webview" into klp-dev
Selim Gurun [Thu, 12 Sep 2013 23:22:28 +0000 (23:22 +0000)]
Merge "Publish Print Api for Webview" into klp-dev

10 years agoFix for AIOBE at android.text.AndroidBidi.directions
Raph Levien [Thu, 12 Sep 2013 21:55:38 +0000 (14:55 -0700)]
Fix for AIOBE at android.text.AndroidBidi.directions

This fixes bug 9900288: Multiple apps crashing; AIOBE at
android.text.AndroidBidi.directions.

The AndroidBidi.directions() method was not correctly handling the case
of a run of length 0, causing ArrayIndexOutOfBoundsException. This
patch simply avoids accessing the levels array in that case.

Change-Id: I036a85b7792ea3364725a87033ca74b94f0e93a1

10 years agoFix build break with missing VDBG.
Stephen Hines [Thu, 12 Sep 2013 23:16:00 +0000 (16:16 -0700)]
Fix build break with missing VDBG.

Change-Id: Iaf64cf49300a6a0a91374efa3030d6894367c9b8

10 years agoAlways disable the clip for layers
Romain Guy [Thu, 12 Sep 2013 23:09:19 +0000 (16:09 -0700)]
Always disable the clip for layers
Bug #8149344

Change-Id: Ifd413cadb171232eb846b3d91b05b2d2457b9f35

10 years agoMerge "Not change the print options on printer change if possible." into klp-dev
Svetoslav [Thu, 12 Sep 2013 22:38:35 +0000 (22:38 +0000)]
Merge "Not change the print options on printer change if possible." into klp-dev

10 years agoMediaFormat: add getInteger with default value convenience method
Lajos Molnar [Thu, 12 Sep 2013 04:04:49 +0000 (21:04 -0700)]
MediaFormat: add getInteger with default value convenience method

Change-Id: I58947a2f4a286fef74f74cb189469278056d4759
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117

10 years agoFix CalledFromWrongThreadException in MediaPlayer's subtitle support
Lajos Molnar [Thu, 12 Sep 2013 05:10:01 +0000 (22:10 -0700)]
Fix CalledFromWrongThreadException in MediaPlayer's subtitle support

Call selectTrack/setSubtitleWidget only from MP's looper or the
applications's event thread, which is the same for now (we only
support subtitles in VideoView.)

Change-Id: Ic1de923b801f28657f37e0330b95c321931a6960
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10691837
Bug: 10326117

10 years agoMerge "Disable additional logging in WifiConfigStore/WifiNative" into klp-dev
Vinit Deshapnde [Thu, 12 Sep 2013 22:19:15 +0000 (22:19 +0000)]
Merge "Disable additional logging in WifiConfigStore/WifiNative" into klp-dev

10 years agoMerge "Allow phone to enter suspend with positive proximity." into klp-dev
Jeff Brown [Thu, 12 Sep 2013 22:15:37 +0000 (22:15 +0000)]
Merge "Allow phone to enter suspend with positive proximity." into klp-dev

10 years agoMerge "Move DeferredDisplayState out of ops" into klp-dev
Chris Craik [Thu, 12 Sep 2013 22:08:54 +0000 (22:08 +0000)]
Merge "Move DeferredDisplayState out of ops" into klp-dev

10 years agoDisable additional logging in WifiConfigStore/WifiNative
Vinit Deshapnde [Thu, 12 Sep 2013 21:53:46 +0000 (14:53 -0700)]
Disable additional logging in WifiConfigStore/WifiNative

It was introduced to debug the disappearing APs; now that we think that
we've got to the bottom of it, it is being disabled by default. Set VDBG
to true to get it back.

Bug: 10568538

Change-Id: I226cacf48cccba9671f09164bbb50380adc6b322

10 years agoAllow phone to enter suspend with positive proximity.
Jeff Brown [Thu, 12 Sep 2013 03:45:25 +0000 (20:45 -0700)]
Allow phone to enter suspend with positive proximity.

As part of the power manager rewrite in JB MR1, we removed the ability
for the phone to suspend with positive proximity because it was not
clear that the proximity sensor was always correctly registered as
a wake-up source.  The sensor service itself does not contain any
code to manage wake-ups.  Therefore proximity sensor based wake-up
relies on the sensor driver acquiring a timed wake lock when the
sensor reports a negative result.  This behavior is not very well
defined in the sensor HAL so there is a chance that it will not
work reliably on all devices.

This change adds a new config.xml resource to specify whether the
device should be allowed to suspend when the screen is off due to
positive proximity.  Devices that support this feature should set
the "config_suspendWhenScreenOffDueToProximity" resource to "true" in
their resource overlays.  The feature is disabled by default.

Bug: 9760828
Change-Id: Ic65ab7df0357271b133e2e44f5e35e7756e1e9e0

10 years agoNot change the print options on printer change if possible.
Svetoslav [Wed, 11 Sep 2013 04:08:32 +0000 (21:08 -0700)]
Not change the print options on printer change if possible.

If the user selects some print options from the dialog and then
changes the printer to one that has the same capabilities the
selections in the UI should not change.

bug:10631856

Change-Id: Ia76ce58c446815e3498d2f4b4739dee62d11d96a

10 years agoFix Batched Scan Results to give Timestamp in uS
Robert Greenwalt [Wed, 11 Sep 2013 22:21:10 +0000 (15:21 -0700)]
Fix Batched Scan Results to give Timestamp in uS

ScanResult should have timestamp in uS but we are getting age in ms
from the wifi driver - multiply to have the same units though not
the implied precision.

bug: 10410465
Change-Id: Idf5c5996d69a4793dae3d74edb790d40b9bd3298

10 years agoMerge "Make View onKeyUp symmetric with onKeyDown." into klp-dev
Jeff Brown [Thu, 12 Sep 2013 20:53:15 +0000 (20:53 +0000)]
Merge "Make View onKeyUp symmetric with onKeyDown." into klp-dev

10 years agoMerge "Don't track LocationManager internal requests in AppOps (b/10725757). AppOps...
David Christie [Thu, 12 Sep 2013 20:39:31 +0000 (20:39 +0000)]
Merge "Don't track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location.  There is no reason to show Android OS in that list simply because of internal location requests supporting other clients." into klp-dev

10 years agoMove DeferredDisplayState out of ops
Chris Craik [Wed, 11 Sep 2013 23:23:37 +0000 (16:23 -0700)]
Move DeferredDisplayState out of ops

bug:9969358

Instead of storing DeferredDisplayState within an op (thus forcing ops
to be tied to a single state instance), associate each op with a new
state at DeferredDisplayList insertion time.

Now, DisplayLists (and the ops within) can be reused in a single
DeferredDisplayList draw call, as ops will use different state
instances at different points in the frame.

Change-Id: I525ab2abe0c3883679f2fa00b219b293e9ec53d9

10 years agoMerge "Fix invalid Wifi Network system crash" into klp-dev
Vinit Deshapnde [Thu, 12 Sep 2013 20:28:57 +0000 (20:28 +0000)]
Merge "Fix invalid Wifi Network system crash" into klp-dev

10 years agoMerge "Handle print serivce crashes." into klp-dev
Svetoslav [Thu, 12 Sep 2013 20:24:40 +0000 (20:24 +0000)]
Merge "Handle print serivce crashes." into klp-dev

10 years agoDon't track LocationManager internal requests in AppOps (b/10725757).
David Christie [Thu, 12 Sep 2013 20:04:32 +0000 (13:04 -0700)]
Don't track LocationManager internal requests in AppOps (b/10725757).
AppOps stats are used to populate the "apps recently using location"
list in settings->location.  There is no reason to show Android OS
in that list simply because of internal location requests supporting
other clients.

Change-Id: I6908aa63deb19d22733b8d9cdae6ea5dbbea55e0

10 years agoMerge "Hide translucent activity conversion API" into klp-dev
Chet Haase [Thu, 12 Sep 2013 19:41:33 +0000 (19:41 +0000)]
Merge "Hide translucent activity conversion API" into klp-dev

10 years agoMerge "Fix TechChange's assumption about TextView targets" into klp-dev
Chet Haase [Thu, 12 Sep 2013 19:41:16 +0000 (19:41 +0000)]
Merge "Fix TechChange's assumption about TextView targets" into klp-dev

10 years agoMerge "Camera2: Fix build: Add new key to API" into klp-dev
Eino-Ville Talvala [Thu, 12 Sep 2013 19:06:55 +0000 (19:06 +0000)]
Merge "Camera2: Fix build: Add new key to API" into klp-dev

10 years agoCamera2: Fix build: Add new key to API
Eino-Ville Talvala [Thu, 12 Sep 2013 18:52:45 +0000 (11:52 -0700)]
Camera2: Fix build: Add new key to API

Change-Id: Ie44a9e3b1c8d04dd266d39f59a5916ddaf5fca67

10 years agoMerge "Camera2: Add a missing key for controlling shading map mode" into klp-dev
Eino-Ville Talvala [Thu, 12 Sep 2013 18:32:29 +0000 (18:32 +0000)]
Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev

10 years agoMerge "Fix Wifi Batch Scanning" into klp-dev
Robert Greenwalt [Thu, 12 Sep 2013 18:22:28 +0000 (18:22 +0000)]
Merge "Fix Wifi Batch Scanning" into klp-dev

10 years agoMerge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev
Igor Murashkin [Thu, 12 Sep 2013 18:21:15 +0000 (18:21 +0000)]
Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev

10 years agoFix TechChange's assumption about TextView targets
Chet Haase [Thu, 12 Sep 2013 18:19:32 +0000 (11:19 -0700)]
Fix TechChange's assumption about TextView targets

Some of the code in the TextChange transition assumed that the
start values for a transition were for a TextView object. This may
not be the case, and we should return early (without creating an
animator) when it is not.

Issue #10725388 Frequent Framework crashes across apps

Change-Id: I6999eb2288f107f4b93ddb5b77cd068069d831ed

10 years agoMerge "Show alternate menu panel on devices with menu key" into klp-dev
Adam Powell [Thu, 12 Sep 2013 18:12:05 +0000 (18:12 +0000)]
Merge "Show alternate menu panel on devices with menu key" into klp-dev

10 years agoCamera2: Add a missing key for controlling shading map mode
Eino-Ville Talvala [Thu, 12 Sep 2013 18:11:27 +0000 (11:11 -0700)]
Camera2: Add a missing key for controlling shading map mode

Bug: 10726421
Change-Id: If41e00c921ab493c7427575258fed63cbbc22dc1

10 years agoMerge "Add exclude() methods to Transition" into klp-dev
Chet Haase [Thu, 12 Sep 2013 18:07:40 +0000 (18:07 +0000)]
Merge "Add exclude() methods to Transition" into klp-dev

10 years agoMerge "Don't restore EAP-TLS networks from backup" into klp-dev
Vinit Deshapnde [Thu, 12 Sep 2013 17:53:39 +0000 (17:53 +0000)]
Merge "Don't restore EAP-TLS networks from backup" into klp-dev

10 years agoam 7bf74bc0: am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing...
Joe Malin [Thu, 12 Sep 2013 17:53:26 +0000 (10:53 -0700)]
am 7bf74bc0: am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs

* commit '7bf74bc04c4e6fa022a84a4e586aca43816ec1f9':
  Android Training: Add Location Testing Lesson

10 years agoHandle print serivce crashes.
Svetoslav [Wed, 11 Sep 2013 04:08:32 +0000 (21:08 -0700)]
Handle print serivce crashes.

1. Now after a print service crashes we are bringing it to the same
    state of its lifecycle. For example, if a service does a discovery
    and crashes we recreate the discovery session call the start
    discovery method and so on.

2. Turned off debugging logs since we have fully fledged state dump.

bug:10697779

Change-Id: Id790537461428e96b197eef12258996bda2bd1ce

10 years agoam 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into...
Joe Malin [Thu, 12 Sep 2013 17:51:12 +0000 (10:51 -0700)]
am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs

* commit '1e3a02030949df8c1d1f37a37fc23f25357632f0':
  Android Training: Add Location Testing Lesson

10 years agoam 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
Joe Malin [Thu, 12 Sep 2013 17:48:38 +0000 (10:48 -0700)]
am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs

* commit '6f9e30e3b76f564db3a56de24e4efdc5a64455f0':
  Android Training: Add Location Testing Lesson

10 years agoMerge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
Joe Malin [Thu, 12 Sep 2013 17:45:05 +0000 (17:45 +0000)]
Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs

10 years agoMerge "Remove spurious density-specific default wallpaper." into klp-dev
Daniel Sandler [Thu, 12 Sep 2013 17:35:52 +0000 (17:35 +0000)]
Merge "Remove spurious density-specific default wallpaper." into klp-dev

10 years agoAndroid Training: Add Location Testing Lesson
Joe Malin [Sat, 27 Jul 2013 00:26:52 +0000 (17:26 -0700)]
Android Training: Add Location Testing Lesson

Change-Id: I855e1c3dd0db65be7dc970437af2d52ccf836cb7

10 years agoDefine config_volte_replacement_rat.
Wink Saville [Thu, 12 Sep 2013 07:05:17 +0000 (00:05 -0700)]
Define config_volte_replacement_rat.

Default value is 0 which means there is no replacement and
PhoneProxy#phoneObjectUpdater will not replace a VoLTE RAT.

Bug: 10673760
Change-Id: Ic77411b5da415c620fce5a185ca1d7542dfe3b7f