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

18753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
6d43ebb807 Merge "Make the simulator boot again." 2010-02-18 11:11:29 -08:00
Joe Onorato
6a6588b4ac am 6371a2d3: am ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair 
Merge commit '6371a2d31f30b473e91be9cced64a2527c086af1'

* commit '6371a2d31f30b473e91be9cced64a2527c086af1':
  Don't crash the system process when apps give us a bad foreground service notification.
 2010-02-18 11:02:48 -08:00
Romain Guy
f59a3c14c1 am ab4835ee: (-s ours) am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE. 
Merge commit 'ab4835ee0df866a4f7982644742e2b758c50fdd7'

* commit 'ab4835ee0df866a4f7982644742e2b758c50fdd7':
  Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
 2010-02-18 11:02:32 -08:00
Romain Guy
24f8a85078 am 6f4a52a3: (-s ours) am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE 
Merge commit '6f4a52a3f7c6bd87e7109d741441bff332a445a4'

* commit '6f4a52a3f7c6bd87e7109d741441bff332a445a4':
  Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
 2010-02-18 11:02:21 -08:00
Romain Guy
011c440b9d am 6c71d476: (-s ours) am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005. 
Merge commit '6c71d476f32adb5308a2a9e32660b66b2b7e6c1a'

* commit '6c71d476f32adb5308a2a9e32660b66b2b7e6c1a':
  Manual merge of 40080 DO NOT MERGE
 2010-02-18 11:02:11 -08:00
android-build SharedAccount
eca5c293c6 am f8bb2a9a: (-s ours) am 5d72a8dd: cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491 
Merge commit 'f8bb2a9ad096071fb7d45c769d031b2e1853317e'

* commit 'f8bb2a9ad096071fb7d45c769d031b2e1853317e':
  cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
 2010-02-18 11:01:01 -08:00
Marco Nelissen
62dbb22bd4 Make the simulator boot again. 2010-02-18 10:56:30 -08:00
Dianne Hackborn
65e7277391 Merge "Fixing bug 2451615 - Accessibility services are started upon system reboot while accessibility is disabled" 2010-02-18 10:49:00 -08:00
Kenny Root
52120865e1 Merge "Fix enum reference" 2010-02-18 10:47:25 -08:00
Dianne Hackborn
852d1e97fb Merge "Fix for bug 2448479" 2010-02-18 10:46:45 -08:00
Leon Scroggins
bcbf564a3f At the end of a zoom, only check if the textfield is onscreen. 
Previously, we checked to see if the IME was active on the WebTextView,
in an attempt to fix http://b/issue?id=2266066 .  If so, we move the
textfield on screen. However, that is resulting in
http://b/issue?id=2147168 , where a textfield far offscreen is being
scrolled on screen at the end of a zoom, and with this change, the
latter bug is fixed.  Further, I am no longer able to reproduce the
earlier bug with this change.
 2010-02-18 13:31:47 -05:00
Fabrice Di Meglio
24b5bdd29e Fix bug #2331761 (Instances of a recurring event are missing) 
by detecting and ignoring malformed recurrences

Change-Id: I4b3aa5db27d8da6616b52fdc7b522d4d92fdc30c
 2010-02-18 10:27:37 -08:00
Gilles Debunne
d651629478 Merge "List.GetCheckItemIds no longer includes unchecked items." 2010-02-18 10:26:34 -08:00
Gilles Debunne
fd3ddfa6f0 List.GetCheckItemIds no longer includes unchecked items. 
Unchecked items remain in the mCheckStates with an associated false value.
Now filtered out.

Added a unit test to ensure non regression.

Change-Id: If0b1a38aa06881055c87a97b3afb2c7fb48656f1
http://b/issue?id=2440815
 2010-02-18 10:24:09 -08:00
Kenny Root
d7a0cdee1d Merge "Adjust SQLiteDatabase/Program buffer sizes" 2010-02-18 10:21:36 -08:00
Fred Quintana
bf1b59c057 Merge "remove check for obsolete property ro.config.sync" 2010-02-18 10:16:18 -08:00
Kenny Root
f80efdf7e2 Adjust SQLiteDatabase/Program buffer sizes 
Some error messages would have clobbered some memory adjacent to them,
so increase the buffer sizes to fit them.

Change-Id: I9c4a3f3444bf57b5d2bd1b7a2546e16137747ad0
 2010-02-18 10:13:11 -08:00
Robert Greenwalt
589f37cd27 Merge "Add Java hookup to netd interface notifications." 2010-02-18 10:11:27 -08:00
Eric Rowe
3d4178fe1a Merge "Fix formatting of ANRs." 2010-02-18 09:58:07 -08:00
Kenny Root
f5a7c121dd Change buf size holding integer in ResourceTable 
A 32-bit integer can be 10 characters long plus a byte for \0 at the
end.

Change-Id: I58040fe6e1674e78bcc6e07463ff36fb26e280f4
 2010-02-18 09:44:35 -08:00
Kenny Root
a6fe26c58f Merge "Range check in MediaScanner::processDirectory" 2010-02-18 09:36:08 -08:00
Kenny Root
7fe4fe68fa Range check in MediaScanner::processDirectory 
Make sure we don't have an empty string before checking if it's a
directory since this string is tainted.

Change-Id: I5eb310ced58c3c64a7af2d11b80326efe5adbcab
 2010-02-18 09:26:47 -08:00
Kenny Root
75bbe2b7c7 Merge "Store AudioTrack return value for error condition" 2010-02-18 09:24:42 -08:00
Robert Greenwalt
e325392c25 Add Java hookup to netd interface notifications. 2010-02-18 09:23:25 -08:00
Kenny Root
3cbd62c3ce Store AudioTrack return value for error condition 
Store AudioTrack->initCheck()'s return value so we can return it after
the AudioTrack is deleted.

Change-Id: Ie042a7d6a54d7f9afd8a5767cfd167dbeb2e5c04
 2010-02-18 09:03:34 -08:00
Kenny Root
fedfea24e7 Fix enum reference 
Was using argument that is set default to NULL as a shortcut to an
enum's value. Change it to reference to class directly to avoid a null
pointer dereference.

Change-Id: I16b8ee15af4f095f027113131d574b70768994b0
 2010-02-18 08:54:47 -08:00
Mike Lockwood
6f760ee1c2 Merge "Catch Java exceptions in the FileObserver JNI code" 2010-02-18 07:47:53 -08:00
Mike Lockwood
4b9f74a2d3 Merge "Don't return passive location provider unless app has fine permissions." 2010-02-18 06:38:12 -08:00
Cary Clark
bf8f3a888c Merge "add support for audio/3gpp" 2010-02-18 06:28:45 -08:00
Mike Reed
35d2621b3a Merge "update dox" 2010-02-18 06:11:39 -08:00
Cary Clark
1b098a6852 add support for audio/3gpp 
This parallels an entry in WebCore/platform/MIMETypeRegistry.cpp

http://b/2452889
http://code.google.com/p/android/issues/detail?id=3728
 2010-02-18 09:08:42 -05:00
Bryan Mawhinney
43cc4696bf Don't return passive location provider unless app has fine permissions. 2010-02-18 13:00:16 +00:00
Joe Onorato
6371a2d31f am ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair 
Merge commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af' into eclair-plus-aosp

* commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af':
  Don't crash the system process when apps give us a bad foreground service notification.
 2010-02-18 04:52:46 -08:00
Joe Onorato
ee3bbefd34 Merge "Don't crash the system process when apps give us a bad foreground service notification." into eclair 2010-02-18 04:46:32 -08:00
Joe Onorato
34fcf97103 Don't crash the system process when apps give us a bad foreground service notification. 2010-02-18 07:45:17 -05:00
Mike Lockwood
59d25d00a1 Catch Java exceptions in the FileObserver JNI code 
Change-Id: I8aed85baadef7a3ea80333b33df0743e0d349915
BUG: 2404428
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-02-18 07:09:06 -05:00
Romain Guy
ab4835ee0d am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE. 
Merge commit '00b17659bb4b2774580eea523c5f23b588105ab6' into eclair-plus-aosp

* commit '00b17659bb4b2774580eea523c5f23b588105ab6':
  Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
 2010-02-17 21:22:52 -08:00
Romain Guy
6f4a52a3f7 am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE 
Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp

* commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e':
  Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
 2010-02-17 21:17:48 -08:00
Romain Guy
00b17659bb Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE. 
Prevent infinite loop in the Phone UI.
 2010-02-17 21:16:36 -08:00
Romain Guy
67e9e9df92 Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE 
Fix the lock screen.
 2010-02-17 21:12:47 -08:00
Romain Guy
6c71d476f3 am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005. 
Merge commit '8368ef0b670f8193f3161671b119e78b1fb659a1' into eclair-plus-aosp

* commit '8368ef0b670f8193f3161671b119e78b1fb659a1':
  Manual merge of 40080 DO NOT MERGE
 2010-02-17 21:10:34 -08:00
Romain Guy
8368ef0b67 Manual merge of 40080 DO NOT MERGE 
Properly notifies listener when an animation is cancelled.
Bug: #2428005.
 2010-02-17 20:49:10 -08:00
Mathias Agopian
eba3bb06a8 Merge "Remove a dependency of Region (libui) on Parcel (libbinder)." 2010-02-17 20:27:45 -08:00
Mathias Agopian
e59a54c0ed Remove a dependency of Region (libui) on Parcel (libbinder). 2010-02-17 20:26:47 -08:00
Svetoslav Ganov
714cff0693 Fixing bug 2451615 - Accessibility services are started upon system reboot while accessibility is disabled 2010-02-17 19:36:28 -08:00
Eric Rowe
6f4f619369 Fix formatting of ANRs. 
Fix for cases where an extra newline would be added and/or a newline at the end of a line would be ommited.
 2010-02-17 18:29:04 -08:00
Jaikumar Ganesh
cf5f652740 Set error condition correctly when device is already created. 
When device is already created, and we call CreateDevice, we
need to report the error correctly. Only then the SDP query
will be done from java land.
 2010-02-17 17:19:26 -08:00
Dan Egnor
8a2e011195 Add some useful methods to OperationScheduler to inquire into 
the history, in case you want to second-guess its scheduling.
 2010-02-17 17:07:01 -08:00
Svetoslav Ganov
9b31779eab Fix for bug 2448479 2010-02-17 16:46:42 -08:00
Andreas Huber
fc081668c3 Merge "We are cancelling this event during reset, but the event may have already been dispatched at the time, blocking on the mutex. While it's blocking, reset() cancels the event, we're then unblocked and bad things(tm) happen." 2010-02-17 16:10:29 -08:00