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

48242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
3e5e805594 Fix media scanner uri handling. 
If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: Ifdf3a177750f1e71ca5a058fa534d272e1505653
 2011-03-29 13:29:42 -07:00
Mike Lockwood
60355780ea am 038c7297: am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 
* commit '038c7297c9e2e4b6cdb490ac9fe7102da434278a':
  UsbService: Fix JNI local reference leaks in the USB host support code
 2011-03-28 11:04:29 -07:00
Mike Lockwood
038c7297c9 am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 
* commit 'b115807aaf0fc6326903302be9bd9ff3877fa968':
  UsbService: Fix JNI local reference leaks in the USB host support code
 2011-03-28 11:02:58 -07:00
Mike Lockwood
b115807aaf am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 
* commit '7661dd8de10d2400cedc421358c4261556b2b5c8':
  UsbService: Fix JNI local reference leaks in the USB host support code
 2011-03-28 11:00:33 -07:00
Mike Lockwood
7661dd8de1 Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 2011-03-28 10:58:03 -07:00
Andreas Huber
ab13a89c99 am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit 'a4a81aef39b15649bda146476d98f23ac554887f':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:34:06 -07:00
Andreas Huber
a4a81aef39 am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit 'e7cedad2b8408a13c610f3a7fcf13597a432a37d':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:26:21 -07:00
Andreas Huber
e7cedad2b8 am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:16:52 -07:00
Andreas Huber
2edbdcc6f2 Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 2011-03-28 08:11:26 -07:00
Mike Lockwood
8f8c6023f2 UsbService: Fix JNI local reference leaks in the USB host support code 
Bug: 4175857

Change-Id: I8b385f2257e509b0fb4d5f9516e9813b8165352d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-27 19:35:43 -07:00
Wink Saville
3c630f3363 am 238b5c4e: am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE 
* commit '238b5c4e8470c51582ed53e3987626720ab4c013':
  Work around for operator not being correct.
 2011-03-26 16:55:23 -07:00
Wink Saville
8d4857ce4a am 9c2c7ace: am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE 
* commit '9c2c7ace9e5658cb2c16b6e720ac39ea349d5921':
  Add some debug to apn list creation routines.
 2011-03-26 16:53:32 -07:00
Wink Saville
238b5c4e84 am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE 
* commit '9eac2c077a92a95d0b7a9c766d4c6ee92f625d2e':
  Work around for operator not being correct.
 2011-03-26 16:52:53 -07:00
Wink Saville
9c2c7ace9e am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE 
* commit '3420f85cc65af8e3ec6c651667c8cffbac60ba4e':
  Add some debug to apn list creation routines.
 2011-03-26 16:51:13 -07:00
Wink Saville
9eac2c077a Merge "Work around for operator not being correct." into honeycomb-LTE 2011-03-26 16:50:17 -07:00
Wink Saville
3420f85cc6 Merge "Add some debug to apn list creation routines." into honeycomb-LTE 2011-03-26 16:48:35 -07:00
Ramesh Sudini
4bdadc2e6c am 2f4f92a9: am fbe284b6: Telephony: Fix eHRPD Service State Mapping. 
* commit '2f4f92a9974de34aa62974335e700a554426d0c2':
  Telephony: Fix eHRPD Service State Mapping.
 2011-03-26 09:30:25 -07:00
Ramesh Sudini
2f4f92a997 am fbe284b6: Telephony: Fix eHRPD Service State Mapping. 
* commit 'fbe284b6756b44819e9f4d13938bad06b238d112':
  Telephony: Fix eHRPD Service State Mapping.
 2011-03-26 09:23:23 -07:00
Wink Saville
2a3aa2a32e Work around for operator not being correct. 
This is a STOPSHIP work-around until we figure out why
getSIMOperatorNumeric is not returning valid values.
It has returned NULL, "00000", "310004", "311480" and
once a value "83????", I don't remember the exact value.

Change-Id: I4f1d16c853047b72dd987572d3d67dcc2cd697a2
 2011-03-26 09:13:20 -07:00
Ramesh Sudini
fbe284b675 Telephony: Fix eHRPD Service State Mapping. 
Change-Id: I415c11dc0e1817f7772160c1103105d6007ffdff
 2011-03-26 08:40:32 -07:00
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
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
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