drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,529 Commits 1 Branch 0 Tags
Commit Graph

54529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
1ea4cc6464 Merge "Return stats from inactive ifaces, packet counts." 2011-07-12 11:09:09 -07:00
Fabrice Di Meglio
eb982f3991 Merge "Fix scrolling bug causing centered cursor." 2011-07-12 09:39:18 -07:00
James Dong
dcf8934f4e Make MetadataBufferType.h C-friendly 
Change-Id: I4388d8f6cf30f08858aec73aa971647feae4a5e3
 2011-07-12 09:35:40 -07:00
Ben Murdoch
a698e6a6db Merge changes I829b5d24,I521c0989 
* changes:
  Add missing auto-fill strings.
  Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
 2011-07-12 08:51:23 -07:00
Glenn Kasten
d28848b5b6 OMX CallbackDispatcher uses C++ Thread not pthread 
This permits leveraging future improvements to Thread.

Change-Id: I45e25a309e7edd1d4f0dacc5ec987329afa497d9
 2011-07-12 07:49:40 -07:00
Ben Murdoch
06da76bd2d Add missing auto-fill strings. 
These strings had a defintion native side, but no corresponding
definition java side which would lead to a crash. Strings taken from
chrome/app/generated_resources.grd - see
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/app/generated_resources.grd?r1=75912&r2=76117&pathrev=88489

Also note that credit_card_number_preview_format is no longer needed.

See also change Ib861245e26197938bb2c5cf0f99c1d797ab0fbf2

Change-Id: I829b5d24e6f9a04211ee91c3f670c8659c004cd9
 2011-07-12 14:54:40 +01:00
Ben Murdoch
bfcc595307 Merge Chromium at r12.0.742.93: Update auto-fill regular expressions. 
See diff from last update here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_resources.grd?r1=75368&r2=82248

Change-Id: I521c098932dfcfcb728ed2d96afd22b7926e88e9
 2011-07-12 14:54:20 +01:00
Mark Brophy
622c03e6cf Merge "Expose app resume times to the ApplicationProvider." 2011-07-12 02:57:16 -07:00
satok
6df76aa9f1 Merge "Change IME picker dialog from Activity to Broadcast" 2011-07-11 22:12:59 -07:00
Jeff Brown
bd882b1c87 Remove the simulator target from all makefiles. 
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
 2011-07-11 22:12:16 -07:00
Mathias Agopian
e230189444 Merge "fix a weird use of Vector::appendVector()" 2011-07-11 18:30:41 -07:00
Mathias Agopian
e92963c3f9 Merge "Fix typo in an assert's log" 2011-07-11 18:30:29 -07:00
Romain Guy
5fccb70de9 Add test for bug #4970944 
Change-Id: I3e7287bc406ff497a49cf823cee53b1a943a74a9
 2011-07-11 18:23:09 -07:00
Doug Felt
25b9f42737 Fix scrolling bug causing centered cursor. 
Change-Id: I792a2c4d291e2ac5f0d1ed6e74f5e2ecb395c010
 2011-07-11 17:48:50 -07:00
Dave Santoro
d7bdc18f87 Add data_set column for raw contacts and groups. 
This provides a way for multiple sync adapters to exist for a single
account type.  Internally, for example, we can use these new columns
to support separate sync adapters (and sourced data) for Focus,
Emerald Sea, and Latitude.

Change-Id: I1b8dfd79e9fb2dfcee6ac6d4adb947093f5c2324
 2011-07-11 17:24:45 -07:00
Jamie Gennis
2d6bb33800 Merge changes I002177a6,Ibaff52fe 
* changes:
  Add the EGL_ANDROID_recordable spec.
  Add the spec for EGL_ANDROID_blob_cache.
 2011-07-11 17:14:33 -07:00
Jamie Gennis
8f80f152e5 Add the EGL_ANDROID_recordable spec. 
Change-Id: I002177a68fafd6bb941aa64445c85fd5ff56223a
 2011-07-11 17:13:02 -07:00
John Wang
2ea7e443b2 Add getImei() to Phone interface. 
Need IMEI to be displayed in LTE Settings. Since getDeviceId() returns MEID for LTE device,
getImei() is added to return IMEI for all devices. getImei returns null if not set (as SipPhone).

bug:4983512
Change-Id: Idfe2ec8de514f330248db7a9de7e241f9a38cb96
 2011-07-11 17:00:16 -07:00
Robert Greenwalt
0870e81467 Merge "Fix wifi tethering." 2011-07-11 16:47:25 -07:00
Guang Zhu
5a8eccbfb9 Merge "allow Uri as intent extra in am command" 2011-07-11 16:45:35 -07:00
satok
683e2383c8 Change IME picker dialog from Activity to Broadcast 
Change-Id: I4822899f34a2951d2f2a1258d1adcc7d8fccbb12
 2011-07-12 08:28:52 +09:00
Mathias Agopian
198fd888ad fix a weird use of Vector::appendVector() 
operator= is way more efficient.

Change-Id: I61c9adb1413bed230801a77151b8f7000fd11471
 2011-07-11 16:26:36 -07:00
Mathias Agopian
cf7e3a5984 Fix typo in an assert's log 
Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
 2011-07-11 16:26:18 -07:00
Jeff Sharkey
9e6615afab Watch for external Secure.DATA_ROAMING changes. 
Continue reading/writing Secure.DATA_ROAMING, but also observe
external changes and reevaluate connection state.

Bug: 5011957
Change-Id: Idc6589cf251adcf3110d9c9eb4ef1bd5fb936d14
 2011-07-11 16:20:23 -07:00
David 'Digit' Turner
0814a9aa0c am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp 
* commit 'db4c5f352d6eb8e248953ccff1dbecb1270af4c5':
  NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
  Fix missing NL
 2011-07-11 16:15:27 -07:00
Scott Main
9b446cd6b4 am bc047bb0: am e32c49ab: docs: de-new sidenavs 
* commit 'bc047bb03e6084ded47ffd5d810045ca973d54e5':
  docs: de-new sidenavs
 2011-07-11 16:08:27 -07:00
Scott Main
bc047bb03e am e32c49ab: docs: de-new sidenavs 
* commit 'e32c49ab2c5d6b347b39635a0202d7dbdc1f0769':
  docs: de-new sidenavs
 2011-07-11 16:06:25 -07:00
Robert Ly
4e40015899 am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a 
* commit '1e4cf2dddbac4d357731ffaf02c4402426aa3763':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
 2011-07-11 16:05:40 -07:00
Robert Ly
1e4cf2dddb am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a 
* commit '10a36020e3d37ef088f5f7ed6d64ba35847fc069':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
 2011-07-11 16:03:30 -07:00
Scott Main
e32c49ab2c docs: de-new sidenavs 
Change-Id: I2aaafe763e4b006059222677e563963d3284d314
 2011-07-11 16:03:10 -07:00
Jeff Brown
9f845cff9b Merge "Increase activity timeouts when using a wrapper process." 2011-07-11 16:00:11 -07:00
Robert Ly
10a36020e3 cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a 
Change-Id: I4cb22b628978c86b5c07ff80b2fe8547e25015a1
 2011-07-11 15:58:28 -07:00
Jeff Brown
3f9dd287b9 Increase activity timeouts when using a wrapper process. 
This patch enables the Zygote to tell the ActivityManager when
it has started a process with a wrapper attached so that the
ActivityManager can allow it extra time to start up or process
events.

This is useful when wrapping an app with Valgrind or other tools
which add significant runtime overhead.

Bug: 4584468
Change-Id: I5db6f2f15cd30b0ec40f547d2fadfa216de2926d
 2011-07-11 15:57:15 -07:00
David 'Digit' Turner
db4c5f352d resolved conflicts for merge of 7816eded to gingerbread-plus-aosp 
Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa
 2011-07-12 00:57:09 +02:00
Scott Main
22f4e8f627 am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard 
* commit '56a085c98801d9c4b08cbf398d8225b6761816ac':
  docs: fix date on opengl dashboard
 2011-07-11 15:53:09 -07:00
Mike Lockwood
801525cecc Merge "UsbDeviceManager: Include kernel USB state in dumpsys output" 2011-07-11 15:52:30 -07:00
Mike Lockwood
8f540d4d02 Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state" 2011-07-11 15:52:06 -07:00
Scott Main
56a085c988 am d3fa7bd1: docs: fix date on opengl dashboard 
* commit 'd3fa7bd1e873d885f00b11bb8123284357ccd362':
  docs: fix date on opengl dashboard
 2011-07-11 15:50:16 -07:00
Scott Main
d3fa7bd1e8 docs: fix date on opengl dashboard 
Change-Id: I0d4443664fb61466de441c1be702a351fbf28ac1
 2011-07-11 15:47:41 -07:00
Jason Sams
ac7f69bac3 Merge "Add error checks for AllocationAdapters being used in unsupported ways." 2011-07-11 15:47:36 -07:00
Jamie Gennis
308f9f6b24 Merge "EGL: fix the ANativeWindow size/fmt override" 2011-07-11 15:47:20 -07:00
Romain Guy
f21f07627d Merge "Always make GL calls with a valid EGL context. Bug #5010760" 2011-07-11 15:37:24 -07:00
Romain Guy
039857520b Always make GL calls with a valid EGL context. 
Bug #5010760

Change-Id: If7500ef69683948e727df1406f458f18b11259d1
 2011-07-11 15:33:51 -07:00
Robert Greenwalt
7c34f29c8a Fix wifi tethering. 
The new link-status netlink monitor is a bit chatty and we were getting race conditions.
The wl0.1 soft-ap interface was getting created, but in the off state.  We would report
it available (link-added always reports it) causing wifi to start tethering, but then
we'd sometimes get a link-status-down notification and a link-status-up, causing wifi
to freak out with these two requests.

The simple fix was to not listen to the new link-status notifications.  This should be
redesigned in the future.
bug:4983942

Change-Id: Ica4f34d8bf2a07fc19b35a1e15283a7f8022165e
 2011-07-11 15:24:43 -07:00
Mike Lockwood
6ea146c239 UsbDeviceManager: Include kernel USB state in dumpsys output 
Change-Id: Ia7f015057e24f376e285a40e583644f9d0b9213e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-11 18:23:44 -04:00
Mike Lockwood
c264afeb55 UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state 
This makes it more robust when recovering from runtime restarts

Bug: 4986841

Change-Id: I54b94213447130ca881c66da2d0ce490242f0c96
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-11 18:23:44 -04:00
Eric Laurent
c478f13535 Merge "Audio Effect API: process reverse stream function" 2011-07-11 15:20:27 -07:00
Daniel Lehmann
96fc8269ed Merge "Remove restricted white-listing" 2011-07-11 15:10:04 -07:00
Jaikumar Ganesh
e544a1dbc9 Merge "Query the correct Extra for BT intents." 2011-07-11 14:41:02 -07:00
Xavier Ducrohet
77eaa10949 new button graphics for layoutlib. 
Change-Id: I12a6bf9df87552321452ca3344449814cd3102bb
 2011-07-11 14:40:48 -07:00