48543 Commits

Author SHA1 Message Date
Wink Saville
c6c7ebd92c Add some debug to apn list creation routines.
Change-Id: Ic5055daefd50b6371f129d82313c533a04cd75b1
2011-03-26 08:04:30 -07:00
Dirk Dougherty
88a88b5e4a am 538626ec: am 79da5c2d: am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '538626ec0f9e05a0a4720c930cb380babdfdd9f9':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:29:51 -07:00
Dirk Dougherty
538626ec0f am 79da5c2d: am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '79da5c2da018a2066b7e5d6e8de0c03d00c20492':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:27:18 -07:00
Dirk Dougherty
79da5c2da0 am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '0b9bacc69314fc6480d1ebe67b7ee0d0aebca5c0':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:25:45 -07:00
Mathias Agopian
1b339099b9 Merge "merge libsurfaceflinger_client into libgui" 2011-03-25 19:25:32 -07:00
Dirk Dougherty
0b9bacc693 am 085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '085baa2cc3f2d23523377b1df390cec5d3bf1445':
  Doc change: Fix scale on highlights screen shots.
2011-03-25 19:22:55 -07:00
Dirk Dougherty
085baa2cc3 Doc change: Fix scale on highlights screen shots.
Change-Id: Id2608498baac70dc69d7b716bbb00f0799af03ca
2011-03-25 19:07:30 -07:00
Mathias Agopian
696257ccf3 merge libsurfaceflinger_client into libgui
this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
2011-03-25 18:42:40 -07:00
Andreas Huber
59529e1474 After a seek there's a brief period where audio time isn't reestablished.
Don't use audio time to trigger a "we're very late, skipping ahead" action
until it's reestablished.

Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1
related-to-bug: 4173683
2011-03-25 16:40:50 -07:00
Nick Pelly
87e04970ab am a585eb17: am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit 'a585eb17aba237b6de393b9fb88e03b996cb63c1':
  NfcAdapterExtras: reset singleton state if initialization fails.
2011-03-25 16:39:06 -07:00
Andreas Huber
e8ab51f593 am e2cb08bd: am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
* commit 'e2cb08bd4c3bc7e7045e107af41f7228d780be04':
  Make sure we post a video event when seeking after seeing video EOS before.
2011-03-25 16:38:57 -07:00
Nick Pelly
a585eb17ab am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit '14923862577ef785d20fc5c627248897c9eaddb6':
  NfcAdapterExtras: reset singleton state if initialization fails.
2011-03-25 15:51:42 -07:00
Andreas Huber
e2cb08bd4c am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
* commit '2fee96bcc057d9b5a9ac912af79fd838f5a42964':
  Make sure we post a video event when seeking after seeing video EOS before.
2011-03-25 15:40:56 -07:00
Andreas Huber
2fee96bcc0 am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
* commit '1457ef74d49ee56097ad97cc078e898326beb7db':
  Make sure we post a video event when seeking after seeing video EOS before.
2011-03-25 15:38:34 -07:00
Andreas Huber
1457ef74d4 Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 2011-03-25 15:33:58 -07:00
satok
1be6cce701 Merge "Removed APIs for setCorrectionSpan from InputConnection" 2011-03-25 15:22:15 -07:00
satok
e3797a15fb Removed APIs for setCorrectionSpan from InputConnection
("setCorrectionSpan" was added in Id3abc9ea4d11753cd )

Also..
- Added a class java doc for CorrectionSpan
- Removed FLAG_DEFAULT
- Changed the return type of getSuggestions from Array<CharSequence> to String[]

Change-Id: If5eb091e307a7a40c5b4a70ec1fe6059ecd9fb2d
2011-03-26 07:20:34 +09:00
Jeff Brown
3a98ffe22a Merge "Fix focused application handle." 2011-03-25 15:09:55 -07:00
Jeff Brown
a2cc28d732 Fix focused application handle.
Fix a bug where we were always setting the focused application
handle to NULL.  This broke ANR processing while starting
applications and caused input events to be dropped while
starting applications.

Bug: 4174573
Change-Id: Icd7b8c4c49ed73c41978f3ff076c2e5cd839a802
2011-03-25 15:06:17 -07:00
Adam Powell
1453f0926f am 7dfc6a9e: am c8c78eed: am baa3380d: Fix bug 4170809 - Pages with flash lose touch events
* commit '7dfc6a9e322e9c0367a6372b25694d926d79a618':
  Fix bug 4170809 - Pages with flash lose touch events
2011-03-25 14:54:10 -07:00
Jeff Hamilton
96cf34d362 Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 2011-03-25 14:53:14 -07:00
Stephen Hines
e80b8736d6 Merge "Properly handle script teardown." 2011-03-25 14:52:22 -07:00
Adam Powell
7dfc6a9e32 am c8c78eed: am baa3380d: Fix bug 4170809 - Pages with flash lose touch events
* commit 'c8c78eed52148441a4a549a9a19914bbbde6ad17':
  Fix bug 4170809 - Pages with flash lose touch events
2011-03-25 14:49:11 -07:00
Andreas Huber
16ede3c535 Make sure we post a video event when seeking after seeing video EOS before.
Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba
related-to-bug: 3316960
2011-03-25 14:47:38 -07:00
Adam Powell
c8c78eed52 am baa3380d: Fix bug 4170809 - Pages with flash lose touch events
* commit 'baa3380d74928baf6a5685c54c719af37171a625':
  Fix bug 4170809 - Pages with flash lose touch events
2011-03-25 14:45:06 -07:00
Eric Hassold
bad2506ae9 Merge "Make objects collection a member of egl_display object" 2011-03-25 14:42:15 -07:00
Kenny Root
ff5075944e Merge changes Ia7add63e,Ic7571dae
* changes:
  Split dump and annotate users of mPackages lock
  Split PackageManagerService into subclasses
2011-03-25 14:41:34 -07:00
Eric Hassold
8caf4c6dbb Make objects collection a member of egl_display object
Move EGL objects (contexts, surfaces, ...) collection from global
static into EGL display object. Since EGL implementation currently
supports only one display, this doesn't change current logic. This
aims at preparing for next coming changes in eglTerminate() to
support per-display cleanup.

Bug: 4152714
Change-Id: I5e424781b89c3c275f9922f943463d5f6b1f6bc6
2011-03-25 14:37:19 -07:00
Jeff Hamilton
10de0b31df Make STOP_APP_SWITCHES signatureOrSystem.
The NFC service relies on this permission
for it's dispatching mechanism and it is
no longer signed with the platform cert.

Bug: 4173610
Change-Id: I598ad2889c4af307f04433093923255fe7daedbb
2011-03-25 16:17:53 -05:00
satok
c50232d517 Add hashCode to InputMethodInfo
The uniqueness of InputMethodInfo was guaranteed by mId (like InputMethodInfo#equals), but the hashCode was not implemented in the same way.
This change fixes a problem happening when the user gets the hashCode of InputMethodInfo obtained through IPC.

Change-Id: Ib876c5cb0d778481100597ec31202f94fb7b8f37
2011-03-26 06:12:58 +09:00
Adam Powell
baa3380d74 Fix bug 4170809 - Pages with flash lose touch events
Fix WebView touch cancel behavior when we time out waiting for a
response from webkit.

Change-Id: I0aeeea64b156e204dbe2dda913a42df28704ed16
2011-03-25 13:58:19 -07:00
Gilles Debunne
8da36372a3 Merge "Fix a leak in TextView around ViewTreeObserver" 2011-03-25 11:57:17 -07:00
Adam Cohen
ba08462ebe Merge "Modifying RemoteViewsFactory interface" 2011-03-25 11:19:34 -07:00
Irfan Sheriff
05f14e2bcf Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 2011-03-25 11:01:02 -07:00
Gilles Debunne
6f72cf8057 Fix a leak in TextView around ViewTreeObserver
Port of AOSP change 21909 into master.

Change-Id: I5a3490a6e0151867840507d0137ee811ea2fb139
2011-03-25 10:49:44 -07:00
James Dong
f4aa99aa56 am 70a5b031: am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
* commit '70a5b0317d5029b34be26a423c0ebeaa74b728ed':
  Switch to use SF cached source
2011-03-25 10:29:20 -07:00
James Dong
70a5b0317d am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
* commit '9fb98238e5837a68fb16bcb9a23469f27124c304':
  Switch to use SF cached source
2011-03-25 10:27:05 -07:00
James Dong
9fb98238e5 am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
* commit '837430dd3440f6e71f68ef755399e22386dee084':
  Switch to use SF cached source
2011-03-25 10:24:44 -07:00
James Dong
837430dd34 Merge "Switch to use SF cached source" into honeycomb-mr1 2011-03-25 10:22:57 -07:00
Gloria Wang
503b111b24 am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:11:49 -07:00
Irfan Sheriff
c0e0dbb454 DO NOT MERGE Pick upstream intf with valid IP conf
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration

Bug: 3362306
Change-Id: I3e8ab5ef30b69f1adab755d83f5b65c078f73936
2011-03-25 10:09:55 -07:00
Gloria Wang
ed7b688c01 am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'aac43ea193e0cbd440854f3425579f9ff04abac3':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:09:09 -07:00
Gloria Wang
aac43ea193 am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:05:50 -07:00
Gloria Wang
b8b85ea296 Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 2011-03-25 10:01:37 -07:00
Robert Greenwalt
568845a766 Merge "Fix some alt-network issues." into gingerbread 2011-03-25 09:35:53 -07:00
Robert Greenwalt
7cf5b419da Fix some alt-network issues.
Two issues.
1) remove default routes for non-default networks.
2) don't report mobile is the active default network just because
   it is active.

bug:4157610
Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
2011-03-25 08:59:08 -07:00
Jesse Wilson
1e0efd157b Merge "Fix MemoryFile's output stream to advance." 2011-03-25 08:47:53 -07:00
James Dong
3be1593628 Switch to use SF cached source
bug - 3500025

Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
2011-03-25 08:41:57 -07:00
Brian Carlstrom
4ad06c32bd Merge "Tracking SamplingProfiler change in libcore" 2011-03-24 20:38:05 -07:00
Jeff Hamilton
ad91eee277 am 9c1ef098: Update the value for the NFC shared UID.
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
2011-03-24 20:21:41 -07:00