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

32232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
464fb74e28 am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread 
Merge commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919'

* commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919':
  Add suuport for splitting touch events across windows.
 2010-09-27 14:40:38 -07:00
Joe Onorato
6d3ed72bf2 am 761427f8: am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread 
Merge commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268'

* commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268':
  We only need at most one tty icon.
 2010-09-27 14:38:37 -07:00
Alex Sakhartchouk
1121c6ce8b Merge "Error checking for MVP matrix computation. Fixing more padding bugs." 2010-09-27 14:15:39 -07:00
Vasu Nori
2953283fbd Merge "reduce synchronization on SQLiteDatabase wherever possible" 2010-09-27 14:15:08 -07:00
Joe Onorato
726e75d4d1 Merge "Merge commit 'f9f9e248' into manualmerge" 2010-09-27 14:14:47 -07:00
Joe Onorato
7ebd659dbf Merge commit 'f9f9e248' into manualmerge 
Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
	tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java

Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100
 2010-09-27 14:13:46 -07:00
Vasu Nori
8fef1b7520 reduce synchronization on SQLiteDatabase wherever possible 
Change-Id: Ibb8617667752eab45d29b01d332b68c3547bdea8
 2010-09-27 14:05:09 -07:00
Vasu Nori
ffe06127f6 remove public API setConnectionPoolSize() 
because connection pool size is now settable by modifying config.xml
of the device.

Change-Id: I973cc11d7dc10c8d95ab83e2f691068f6019fa33
 2010-09-27 13:30:49 -07:00
Jeff Brown
9785bf0f2b am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread 
Merge commit '14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp

* commit '14a288da6a372230d9af41da12241fe500eec837':
  Add suuport for splitting touch events across windows.
 2010-09-27 12:37:03 -07:00
Jeff Brown
14a288da6a Merge "Add suuport for splitting touch events across windows." into gingerbread 2010-09-27 12:33:14 -07:00
Guang Zhu
c18ac6ef84 Merge "skip 2d.drawImage.broken.html layout test" 2010-09-27 12:22:17 -07:00
Guang Zhu
4022d94658 skip 2d.drawImage.broken.html layout test 
this test currently blocks on some type of test devices

Change-Id: Ifacc520c441cf4142b5e6d28bde2b86728b5fc35
 2010-09-27 12:20:25 -07:00
Hung-ying Tyan
2079843412 am 45a83a89: am fccd5bc7: Fix build. 
Merge commit '45a83a896701f61f72082f7116b85d1537ebf4cb'

* commit '45a83a896701f61f72082f7116b85d1537ebf4cb':
  Fix build.
 2010-09-27 11:57:08 -07:00
Joe Onorato
761427f85b am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread 
Merge commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29' into gingerbread-plus-aosp

* commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29':
  We only need at most one tty icon.
 2010-09-27 11:56:29 -07:00
Joe Onorato
f9f9e248a0 am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread 
Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp

* commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
  If an icon add remove get coalesced, don't remove some other icon.
 2010-09-27 11:56:24 -07:00
Hung-ying Tyan
45a83a8967 am fccd5bc7: Fix build. 
Merge commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f' into gingerbread-plus-aosp

* commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f':
  Fix build.
 2010-09-27 11:52:35 -07:00
Hung-ying Tyan
5a474a2bb8 am 44669d31: am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread 
Merge commit '44669d31d1d5b094d7b7d3e393281440ea0c9536'

* commit '44669d31d1d5b094d7b7d3e393281440ea0c9536':
  SipAudioCall: remove SipManager dependency.
 2010-09-27 11:47:42 -07:00
Hung-ying Tyan
6cf8f64be3 am c5027642: am 025a39af: SIP: misc fixes 
Merge commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d'

* commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d':
  SIP: misc fixes
 2010-09-27 11:47:37 -07:00
Hung-ying Tyan
031d878682 am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error 
Merge commit 'fe2d279c5ef571340f20d433badd9f68072299af'

* commit 'fe2d279c5ef571340f20d433badd9f68072299af':
  SipService: handle cross-domain authentication error
 2010-09-27 11:47:32 -07:00
Dan Morrill
2b0fa71c1a am c6581a10: am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details 
Merge commit 'c6581a1046b062d0e06e50e9b09e6c12a8e54efc'

* commit 'c6581a1046b062d0e06e50e9b09e6c12a8e54efc':
  Adding a feature to indicate that the device possesses low-latency audio.
 2010-09-27 11:45:51 -07:00
Joe Onorato
524ae7dd14 Merge "We only need at most one tty icon." into gingerbread 2010-09-27 11:41:24 -07:00
Joe Onorato
6fa4de3cff Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread 2010-09-27 11:40:15 -07:00
Vasu Nori
2a06a019d1 Merge "bug:2868568 reduce the message level from error to warning" 2010-09-27 11:39:44 -07:00
Vasu Nori
f7ebe8e856 bug:2868568 reduce the message level from error to warning 
it is a rather harmless message. no need to set ERROR level
and no need to make it sound so fatal

Change-Id: I9d00563a3b869d8223cb21a98014c02535021d11
 2010-09-27 11:37:54 -07:00
Joe Onorato
a78df9f2b6 We only need at most one tty icon. 
Change-Id: Id8e2c6ba9b15ebafcf12b484f175fdaf98c1fa8a
 2010-09-27 11:36:03 -07:00
Joe Onorato
795f2840b4 If an icon add remove get coalesced, don't remove some other icon. 
Also adds a test case and turns off the extra logging we added to debug this.

Change-Id: I8640938ae4d1e75c88213177888f363e05ce0fa0
 2010-09-27 11:34:46 -07:00
Mike Lockwood
ec67253bf0 Merge "MTP: Fix local reference leaks." 2010-09-27 11:26:27 -07:00
Hung-ying Tyan
44669d31d1 am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread 
Merge commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8' into gingerbread-plus-aosp

* commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8':
  SipAudioCall: remove SipManager dependency.
 2010-09-27 11:20:35 -07:00
Hung-ying Tyan
c5027642ff am 025a39af: SIP: misc fixes 
Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp

* commit '025a39af346f39743c1e384b9000ce1baee36562':
  SIP: misc fixes
 2010-09-27 11:20:30 -07:00
Hung-ying Tyan
fe2d279c5e am 00a22064: SipService: handle cross-domain authentication error 
Merge commit '00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp

* commit '00a22064efef4f574e439079aae2deae1a087a31':
  SipService: handle cross-domain authentication error
 2010-09-27 11:20:24 -07:00
Hung-ying Tyan
fccd5bc78f Fix build. 
Change-Id: Ie47b63f02764e8a1ca1d36f502b6b4134859ff0d
 2010-09-28 02:16:32 +08:00
Gil Dobjanschi
bf836ec6ed Merge "Bug fix: getDuration vs. getDurationTimeline" 2010-09-27 11:15:24 -07:00
Jamie Gennis
b4b4f8c805 Merge "Fix the CameraHardwareInterface::setPreviewWindow comment." 2010-09-27 11:12:15 -07:00
Hung-ying Tyan
fd144d7667 Merge "SipAudioCall: remove SipManager dependency." into gingerbread 2010-09-27 10:54:27 -07:00
Hung-ying Tyan
025a39af34 SIP: misc fixes 
+ check REQUEST_TERMINATED response on INVITE not CANCEL,
+ check if a TransactionTerminatedEvent matches the ongoing transaction,
+ add log to track SipConnection disconnect events.

Change-Id: I28325be62ac44e4a7507d3c4b5b78b066c0ea2ad
 2010-09-28 01:52:42 +08:00
Hung-ying Tyan
00a22064ef SipService: handle cross-domain authentication error 
and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.

http://b/issue?id=3020185

Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
 2010-09-27 10:45:24 -07:00
Dan Morrill
c6581a1046 am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details. We can do a d 
Merge commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp

* commit '4e9751f0770c8bfe6f7d57465cba754af5aa942b':
  Adding a feature to indicate that the device possesses low-latency audio.
 2010-09-27 10:39:19 -07:00
Dan Morrill
4e9751f077 Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread 2010-09-27 10:30:41 -07:00
Alex Sakhartchouk
7215b5115e Error checking for MVP matrix computation. 
Fixing more padding bugs.

Change-Id: Ic5d4260027b7dc86a50fdab7221c7296c7d3ea0d
 2010-09-27 10:29:47 -07:00
Gil Dobjanschi
4b66f7a53f Bug fix: getDuration vs. getDurationTimeline 
Change-Id: I41a40a3fc3b3674b5fcacecda174e924211b4ad2
 2010-09-27 10:26:11 -07:00
Huahui Wu
a6c2ddbf2a Merge "Bug 2372180: pass multi-touch events from browser to webkit. Since the UI uses multi-touch for zooming, the event is passed to webkit only when the webpage doesn't allow zooming. 1. Updated the data structure TouchEventData in WebViewCore.java to take multiple points and used it everywhere. 2. Added a passMultiTouchToWebkit() function to do what its name means. 3. Added the multi-point touch support to dumprendertree." 2010-09-27 10:22:41 -07:00
Mike Lockwood
731a95a5f1 Merge changes I424ba760,Ic0826085 
* changes:
  MTP: Implement extra object properties for audio, video and image files
  MediaStore: Add helper method to create Uri for querying genre for an audio file
 2010-09-27 10:18:47 -07:00
Mike Lockwood
8839471f4d MTP: Fix local reference leaks. 
We cannot rely on the VM automatically freeing local references for us
in a timely manner in JNI code that is not called directly from Java.

Change-Id: I6ee8a9a97cb557b9d3b2ace4e4d20467b436fb9c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-27 13:16:53 -04:00
Mike Lockwood
ae078f7dac MTP: Implement extra object properties for audio, video and image files 
Read-only support at this point.

BUG: 2869730

Change-Id: I424ba760c8f5f4af394bd65276f19438fa6da6cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-27 13:16:53 -04:00
Mike Lockwood
bdb05df757 MediaStore: Add helper method to create Uri for querying genre for an audio file 
Change-Id: Ic08260854ef2555682c1a169e7ceb9ecc91628c6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-27 13:16:43 -04:00
James Dong
e9e0e0e970 am a9f17c8b: am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread 
Merge commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d'

* commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d':
  Fix track duration calculation if the start timestamp is non-zero
 2010-09-27 10:16:38 -07:00
James Dong
a9f17c8b42 am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread 
Merge commit 'bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp

* commit 'bf47092e1e76224474745b6919febd3aa9df5bcf':
  Fix track duration calculation if the start timestamp is non-zero
 2010-09-27 10:13:04 -07:00
James Dong
bf47092e1e Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread 2010-09-27 10:08:52 -07:00
James Dong
dacebe62c6 Fix track duration calculation if the start timestamp is non-zero 
o Updated the comments in the patch
o Added some additional checks on the timestamp

Change-Id: I8ad81eb6bfe358c1db5245cbb52efc905cdc234c
 2010-09-27 10:02:15 -07:00
Andreas Huber
a54abd06d2 am fa5c8fc4: am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread 
Merge commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc'

* commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc':
  Support other kinds of HTTP redirect in NuHTTPDataSource
 2010-09-27 09:28:06 -07:00