54411 Commits

Author SHA1 Message Date
James Dong
0e27fce923 Do not wait for unlaunched threads in stop()
Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
2011-07-11 12:51:21 -07:00
James Dong
6e65a4a4ff Merge "Release camera if CameraSource::start() has not been called" 2011-07-11 12:46:35 -07:00
Jamie Gennis
97eae025ad EGL: fix the ANativeWindow size/fmt override
This change fixes how the Android EGL layer overrides the size and
format of an ANativeWindow in eglCreateWindowSurface.  The new behavior
is to leave the size untouched when overriding the format.  The previous
behavior was to reset the ANativeWindow to use the default size set by
the ANativeWindow implementation.

It also adds two new 'perform' methods to the ANativeWindow interface:
set_buffers_dimensions and set_buffers_format, and redefines the
behavior of set_buffers_geometry to be the combination of these two new
methods.

Additionally, this change adds an error check for the return value of
the new native_window_set_buffers_format call, which required adding a
(stub) handler for to FramebufferNativeWindow.

Change-Id: I805c7ccd8d4730dfb132d10d8bc3fb058a0b9df1
2011-07-11 12:31:45 -07:00
Mike Lockwood
a59a1bad85 Merge "Remove unnecessary locking from MediaScanner JNI code" 2011-07-11 12:15:21 -07:00
Mike Lockwood
af16d0b30e Remove unnecessary locking from MediaScanner JNI code
There is nothing in this file that requires a global lock.
Furthermore, the lock can cause timeouts in native_finalize if one instance
is being garbage collected while another is busy in processDirectory

Bug: 5002520

Change-Id: I8717f8edeb932200d9f76b3d98915cfbe18b6ec6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-11 15:07:10 -04:00
Jamie Gennis
0fec106d85 Add the spec for EGL_ANDROID_blob_cache.
Change-Id: Ibaff52fee5c856283536ad37251cc80a9f3f938b
2011-07-11 12:06:54 -07:00
Adam Powell
6f76635ee0 New assets from UX for dialogs/menu frames
Change-Id: If23f37f1aadb90af175664bdd2ddc485559e6781
2011-07-11 12:06:05 -07:00
Eric Laurent
325b8e83a6 Audio Effect API: process reverse stream function
Added function to audio effect interface for processing of
a reverse stream.
This is necessary for audio pre processes like echo cancellation.

Change-Id: I6e12d79dbbed6376acdfc79304b8c0ab3f705eae
2011-07-11 12:00:53 -07:00
Jaikumar Ganesh
fb658c72a3 Bluetooth Health APIs
1. Remove the check of configs in BluetoothHealth.
   This check is useless since BluetoothHealth is a proxy.

2. Add a wrapper and a callback class. We shouldn't expose
   Binder interfaces as public APIs.

Change-Id: If62620b4251cf93f3f97d2fe63099e40fae7da4d
2011-07-11 11:32:27 -07:00
Elliott Hughes
d44e1b6033 Merge "SDK_INT is not "current" on unreleased builds." 2011-07-11 11:24:54 -07:00
Andy McFadden
503f5301cd Merge "Relocate common Calendar classes" 2011-07-11 11:24:23 -07:00
Fabrice Di Meglio
aa69594032 Merge "Fix View reset of layoutDirection and textDirection" 2011-07-11 10:52:09 -07:00
Freeman Ng
8516448ea8 Merge "remove old style button bar look" 2011-07-11 10:46:12 -07:00
Mike Lockwood
ce060f722a Merge "UsbDeviceManager: Fix indentation" 2011-07-11 10:41:52 -07:00
Mike Lockwood
e6d24ab6a9 Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system" 2011-07-11 10:41:08 -07:00
Mike Lockwood
abc4ac6d48 UsbDeviceManager: Fix indentation
Change-Id: I3eb1d407bdb4bf885d1765eedbfb30555f558b3b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-11 13:40:08 -04:00
Mike Lockwood
7a59dd2ce3 MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system
Bug: 4561836

Change-Id: I2bffb93b032038f6c220c24c752ccd7ca66c23a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-11 13:40:02 -04:00
Fabrice Di Meglio
7f86c806ad Fix View reset of layoutDirection and textDirection
- do it in onDetachedFromWindow()
- make naming consistent too
- update unit tests

Change-Id: I320fcdbf75166bae793c4409e7344608b696667f
2011-07-11 10:39:29 -07:00
Chia-chi Yeh
3b219a51a9 am 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
* commit '4821d3bdf8ce35408c6a10fe45c39a5e701ea8e2':
  VpnService: stop VPN when unknown DNS servers show up.
2011-07-11 10:29:32 -07:00
Chia-chi Yeh
4821d3bdf8 Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE 2011-07-11 10:25:28 -07:00
Mike Lockwood
f81673d767 Merge "MediaScanner: Use bulk inserts when in batch mode" 2011-07-11 09:12:21 -07:00
Mike Lockwood
bd682b0408 MediaScanner: Use bulk inserts when in batch mode
To do this we need to move the logic for determining media type to MediaProvider
Make some things in MediaFile public so they can be used from MediaProvider

Bug: 4948188

Change-Id: I6ab168b6b4d45b2fc91ea8bd52ca58283b0efc14
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-11 11:55:26 -04:00
Logan Chien
ef72ff220c Use resource entry name instead of mangled name.
Change-Id: I833fa1b529fe505ce20ede12b7f4b5952a6ac1f0
2011-07-11 15:32:24 +08:00
Wink Saville
0ddd996006 am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
* commit '12b91edc81763b69090bf5815bc8d59ab8d8f342':
  Add a property so that CSIM provision check can be bypassed
2011-07-10 19:35:14 -07:00
Wink Saville
12b91edc81 Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE 2011-07-10 19:33:54 -07:00
Kazuhiro Ondo
e5d891e84e Add a property so that CSIM provision check can be bypassed
To support test environment where a call box is used with
non-provisioned SIM.

Bug: 5010622
Change-Id: I0dd2d3c2d199f600e5979c865f97b41e2fbb706d
2011-07-10 19:18:21 -07:00
Elliott Hughes
2455efebcc SDK_INT is not "current" on unreleased builds.
This change (in combination with a dalvik change) ensures that system_server
doesn't run with JNI app workarounds turned on.

Bug: 4772166
Change-Id: Ia015aa56b5684a176de3c123e8aec7f35e7ecac5
2011-07-10 19:08:44 -07:00
Freeman Ng
6bc6de6737 remove old style button bar look
bug: 4524233
Change-Id: Ie41f760258b7b673264d802c7dcc554b226e0e6e
2011-07-10 18:35:19 -07:00
Kazuhiro Ondo
a9e00a4ac8 am 89799e72: Fix incorrect ERI banner format
* commit '89799e72eee54935ec5830f89dfd0a7d32983917':
  Fix incorrect ERI banner format
2011-07-10 17:21:52 -07:00
Logan Chien
e723caee39 Fix typo: mFieldCount -> mPragmaCount.
Change-Id: I081a521c13a78bc5ec1bf9faecb066bed5ca8ab4
2011-07-11 07:57:24 +08:00
Kazuhiro Ondo
89799e72ee Fix incorrect ERI banner format
Fix conflicting display issue with ERI and CSIM SPN test.
Do not display them together but only override ERI text with CSIM
SPN in home area.

Bug: 5008969
Change-Id: I88383acd1c7f4c5bfb1f66349ff2f37b2edbbc9c
2011-07-10 16:26:42 -07:00
Jeff Sharkey
ddafb64f94 Merge "Cached NTP time for system services." 2011-07-10 16:18:58 -07:00
Kazuhiro Ondo
99cd66711b am 64ba5eaa: Concurrent multi-PDP support in TrafficStats
* commit '64ba5eaa40614877c679b3fbaaa3c2efd17d50d2':
  Concurrent multi-PDP support in TrafficStats
2011-07-10 16:16:54 -07:00
Daniel Lehmann
9b94fd63fa Remove restricted white-listing
Commit after provider changes

Bug:4974334
Change-Id: I66bc3c13165ea86725b769c287475dec396841e2
2011-07-10 15:06:25 -07:00
Kazuhiro Ondo
64ba5eaa40 Concurrent multi-PDP support in TrafficStats
Quick fix to enable concurrent multiple PDP support in TrafficStats.
Just updated the list of hard-coded mobile interfaces for now.

Bug: 4553527
Change-Id: I44ce73f3000542d6457f353bb561a2275684af6b
2011-07-10 14:40:43 -07:00
Jim Miller
38715a8d86 Merge "Fix 4942542, 4590542: Password unlock fixes" 2011-07-10 14:35:32 -07:00
Jeff Sharkey
104344e507 Cached NTP time for system services.
Uses NTP server and timeout from secure settings, or fallback to
defaults in resources.  Update various system services to use cached
NTP time when fresh enough, or force updates as needed.

Bug: 4517273
Change-Id: Ie1c4c4883836013d02ca0bbd850cf8949f93b34b
2011-07-10 14:25:18 -07:00
James Dong
8d19d3ae1e Release camera if CameraSource::start() has not been called
Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
2011-07-10 14:19:26 -07:00
Mark Brophy
9fc0330832 Expose app resume times to the ApplicationProvider.
Add ActivityManager.getAllPackageUsageStats which returns
the PkgUsageStats object for all packages.

In UsageStatsService, remember the last resume time of each component, and
add that info to PkgUsageStats instances.

ApplicationProvider will use getAllPackageUsageStats and the new field
in PkgUsageStats to set the new SearchManager column
SUGGEST_COLUMN_LAST_USAGE_HINT for requests with the GLOBAL_SEARCH
permission.

Change-Id: I80e9b127410ed0d528515d2256787f30a953e9b0
2011-07-10 21:19:23 +01:00
Jim Miller
17dfec7111 Fix 4689527: Fix positioning bug with RecentHorizontalScrollView, minor tweaks.
This fixes a bug where RecentsHorizontalScrollView wasn't scrolling to the most
recent app.

Contains some minor tweaks to the layout so that it doesn't overlap the notification
bad as well as starting alpha fades while draging items sooner.

Change-Id: I94df309673f316c55b2f44aff60fd3aee746b6de
2011-07-10 11:50:54 -07:00
Jeff Brown
10e8971286 Eliminate single-process mode.
Bug: 5010576

Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
2011-07-08 19:54:07 -07:00
Jim Miller
8ecfac1d8c Fix 4942542, 4590542: Password unlock fixes
Fixes issue where hint text was inappropriately shown on password unlock screen.
This was caused by TextView.setKeyListener() clearing the inputType flags.  The
workaround is to change the order of these calls.  TextView.setKeyListener()
should probably not be clearing existing inputType flags.

Fixes wake issue caused by IME events not poking the wakelock.  It now correctly pokes
the wakelock whenever the password text field changes.

Change-Id: I746b21117492c4a176f6627e7d33150e6104495e
2011-07-08 19:15:51 -07:00
Elliott Hughes
b7440a140b Merge "Pass the targetSdkVersion through to the zygote-forked dalvik." 2011-07-08 18:11:41 -07:00
Chia-chi Yeh
6a4610a1dc VpnService: stop VPN when unknown DNS servers show up.
Bug: 5002601
Change-Id: I5459db009e7391ff874623cb1830065ac75c80ed
2011-07-08 17:59:54 -07:00
Robert Ly
e25bb44c1c am d9f91425: am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit 'd9f91425fc740bc85a8629a27b68b48acaf85962':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
2011-07-08 17:53:12 -07:00
Joe Malin
6737441c17 am f84bb997: am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit 'f84bb997717501e0af8672608c9d5bd89abe5334':
  DOC CHANGE: Change GTV info on intro page
2011-07-08 17:53:09 -07:00
Joe Fernandez
c020d7b474 am d1c15f96: am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit 'd1c15f96dd2e3b07da6968ea54f6f2bdebe8e190':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
2011-07-08 17:53:06 -07:00
Wink Saville
e2dece12ba am 3ef341cd: am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '3ef341cda51d5bc35b0bc919f7514653ec194410':
  Disconnect ApnContexts in INITING state when error.
2011-07-08 17:52:56 -07:00
Wink Saville
0d171a66a4 Merge "resolved conflicts for merge of e4a56a32 to master" 2011-07-08 17:48:37 -07:00
Rajneesh Chowdury
bc2861fdbb Merge "Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn" 2011-07-08 17:00:08 -07:00