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

15774 Commits

Author SHA1 Message Date
Vasu Nori
1b67231483 am 9ec496b4: am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
* commit '9ec496b484305defa6cbb691b85836ace8b73a02':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
 2011-02-03 18:08:44 -08:00
Michael Jurka
bb01f8a2d0 am d51e0820: am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb 
* commit 'd51e0820b3b7a71f2b3e0447bdf05188588c6003':
  adding fast setters for translationx/y
 2011-02-03 18:08:17 -08:00
Romain Guy
8b113cf6d7 am cb2c84fd: am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 
* commit 'cb2c84fd81a0891071e8ed0237927ad785751850':
  Refresh display lists when turning off layers rendering. Bug #3420565
 2011-02-03 18:08:03 -08:00
Jaikumar Ganesh
b3c4efc22d Merge "Wait till SDP records are registered before sending intent." 2011-02-03 17:27:10 -08:00
Cary Clark
39530f8fc7 am 859563eb: am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb 
* commit '859563ebf7edbb6d556ef10bac7315fdc564e73a':
  stop GL drawing thread before killing WebCore
 2011-02-03 17:17:45 -08:00
Romain Guy
b0905c998d am 20bf23e5: am ac14db72: Merge "Fast transform properties setters. Bug #3413510" into honeycomb 
* commit '20bf23e5e4172f5f80ce6c4cc16168355b107f0d':
  Fast transform properties setters. Bug #3413510
 2011-02-03 17:17:21 -08:00
Daniel Sandler
4dce4fc8ea am a2e82d4c: am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb 
* commit 'a2e82d4c69bc25eb9f262be0efb4bd38695c4f86':
  Implement priority ordering in notifications.
 2011-02-03 17:16:54 -08:00
Romain Guy
9bd32c235d am 109da7df: am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433" into honeycomb 
* commit '109da7dfd4c0766274b17467880ee673c731735c':
  Allocate layers from the layers pool. Bug #3413433
 2011-02-03 17:16:19 -08:00
Jaikumar Ganesh
50b40cec9c Wait till SDP records are registered before sending intent. 
Wait till all SDP records are registered, before sending STATE_ON intent.
This would fix crashes in Settings app when the profile manager
is not registered.
Problem:
  We were sending Bluetooth State on intent before we got the uuid state
  change intent from Bluez, which is asynchronous.
  Hence when the Settings app queries for the profiles
  to decide if headset profile was registered it would get false and
  the profile manager would be null causing crashes.
  This was not 100 % reproducible, well because it was a race condition.

Change-Id: I791eb63dfbc78aba4c06fd8db933069cb5fde00d
 2011-02-03 17:02:06 -08:00
Robert Greenwalt
f8d40f0d55 Merge "Bind addr and prefixLength together in LinkAddress" 2011-02-03 13:17:48 -08:00
Vasu Nori
9ec496b484 am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
* commit 'e1cbd0a85f09a54f8bf28545ac67455b7dcd2532':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
 2011-02-03 12:24:59 -08:00
Marco Nelissen
770d02c2fa Unhide MediaStore.getVersion so Music2 can use it. 
Change-Id: I006860fe2bd828ffdc598dc89329eba952fde5b3
 2011-02-03 12:23:40 -08:00
Vasu Nori
e1cbd0a85f Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
This reverts commit 6bc710f769618e87b98d51cd02241e6b1a2fb653, reversing
changes made to 7ba35f5ab3c838c7f1b3ab957be685ac1f506b2a.
 2011-02-03 12:20:31 -08:00
Michael Jurka
d51e0820b3 am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb 
* commit '8275c6087897e8fd614681d1cd12db62e6b9fcd5':
  adding fast setters for translationx/y
 2011-02-03 12:02:37 -08:00
Michael Jurka
8275c60878 Merge "adding fast setters for translationx/y" into honeycomb 2011-02-03 12:00:37 -08:00
Romain Guy
cb2c84fd81 am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 
* commit '3b66e43e8c5671c646ccc6d52b0f2dec13898c91':
  Refresh display lists when turning off layers rendering. Bug #3420565
 2011-02-03 11:46:47 -08:00
Shimeng (Simon) Wang
4eb02a13b3 Merge "Use more accurate height/width ratio." 2011-02-03 11:44:06 -08:00
Romain Guy
3b66e43e8c Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 2011-02-03 11:43:17 -08:00
Romain Guy
9d18f2d189 Refresh display lists when turning off layers rendering. 
Bug #3420565

Change-Id: I2139540e591a97cd487e3d7cce6b70d6b23df9de
 2011-02-03 11:32:38 -08:00
Marco Nelissen
3822f73a58 Add a convenience method for getting the media provider version. 
b/3350571

Change-Id: I1280a49029aa75643397fab7113b4dd80b639809
 2011-02-03 10:59:30 -08:00
Shimeng (Simon) Wang
a0cc8642cc Use more accurate height/width ratio. 
When calculating the view height, use more accurate height/width
ratio, instead of the second hand ratio after height and width
are calculated and rounded.

This prevents the height value to be fluctuated by 1 sometimes
when zooming.

issue: 3385757
Change-Id: I08bf5478ae8b8fd799df892e19f450cb558d8b7f
 2011-02-03 10:24:03 -08:00
Mike Lockwood
04f024d564 Merge changes I80558c62,I6587f580 
* changes:
  UsbService: Blacklist HID boot subclass devices (keyboards and mice)
  UsbService: Add support for blacklisting certain USB busses
 2011-02-03 09:51:06 -08:00
Cary Clark
859563ebf7 am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb 
* commit 'aa7dc92838f4e3d423b2a738f54de9b83f83794b':
  stop GL drawing thread before killing WebCore
 2011-02-03 08:52:21 -08:00
Cary Clark
aa7dc92838 Merge "stop GL drawing thread before killing WebCore" into honeycomb 2011-02-03 08:48:24 -08:00
Cary Clark
d9fd857ca9 stop GL drawing thread before killing WebCore 
The TexturesGenerator thread references pictures owned by the
WebCore thread, so must be stopped before the WebCore thread
is deleted.

Requires a companion change in external/webkit

bug:3406185
Change-Id: I5b2f8b3b52367b05301c76e5bd22a95fcd0338d5
 2011-02-03 05:37:04 -05:00
Michael Jurka
dece29ffd3 adding fast setters for translationx/y 2011-02-03 01:41:49 -08:00
Romain Guy
20bf23e5e4 am ac14db72: Merge "Fast transform properties setters. Bug #3413510" into honeycomb 
* commit 'ac14db72ca55110326f4ceb9ac34fddd360036f4':
  Fast transform properties setters. Bug #3413510
 2011-02-03 01:37:29 -08:00
Romain Guy
ac14db72ca Merge "Fast transform properties setters. Bug #3413510" into honeycomb 2011-02-03 01:11:39 -08:00
Romain Guy
da489796e5 Fast transform properties setters. 
Bug #3413510

Change-Id: I2c83e219faff697a48a160fee627f87422a2cd08
 2011-02-03 01:05:15 -08:00
Daniel Sandler
a2e82d4c69 am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb 
* commit '6f922cbe823c19234bc15eea9ac709f399e9a63c':
  Implement priority ordering in notifications.
 2011-02-02 22:41:25 -08:00
Daniel Sandler
a31e4190cb Implement priority ordering in notifications. 
Ongoings are the only notifications currently given higher
priority (and it's in an internal data structure, not a
public API, so fear not about abuse---this will be no worse
than on the phone where ongoings floated to the top).

The only thing left is to give privileged customers a way to
alter the priority of their notifications.

Bug: 3412807
Bug: 3146719
Change-Id: I9e738cc413982845cf4858faa8ccd0a7dbf3187c
 2011-02-03 01:01:20 -05:00
Romain Guy
109da7dfd4 am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433" into honeycomb 
* commit '5bfd1afffe361958682bcb899b763ce35ec00c3a':
  Allocate layers from the layers pool. Bug #3413433
 2011-02-02 21:07:17 -08:00
Romain Guy
5bfd1afffe Merge "Allocate layers from the layers pool. Bug #3413433" into honeycomb 2011-02-02 21:05:35 -08:00
Romain Guy
09b7c91de7 Allocate layers from the layers pool. 
Bug #3413433

This change will be beneficial to Launcher to avoid hiccups when
swiping pages of icons. When a layer is discarded, it is kept
in the layers pool instead of being destroyed right away. This
favors memory reuse over allocations.

Change-Id: Ifb6944ba83d6ceb67c331527c0827b26ce648eb1
 2011-02-02 20:28:09 -08:00
Svetoslav Ganov
0bbfbb5916 Merge "NumberPicker should not play initial animation while in edit mode" 2011-02-02 17:22:21 -08:00
Svetoslav Ganov
5d3aa2c5e9 Merge "Leaking connection to the Text-To-Speech service." 2011-02-02 17:21:27 -08:00
Svetoslav Ganov
4acac231b0 Leaking connection to the Text-To-Speech service. 
bug:3417215

1. Now the Text-To-Speech instance is exposed to JavaScript
   and removed from JavaScript in the attach and detach from
   window callbacks which is consistent with what WebView
   does with its tree observer callbacks.

Change-Id: I3e084ba938ba6f13c578317129264dbcbdcf6450
 2011-02-02 17:20:01 -08:00
Romain Guy
dcbcb680bc am 44e3b0d0: am f44ed5ad: Merge "Don\'t clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433" into honeycomb 
* commit '44e3b0d0344955d5ce1bbb0b329627e24b7dd468':
  Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433
 2011-02-02 17:15:26 -08:00
Vasu Nori
b73fb5401e am 99e8e047: am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb 
* commit '99e8e0470249ce145003cc1eabc5ae391af34a06':
  bug:3414192 new API to designate a download to be OTA update
 2011-02-02 17:15:16 -08:00
Romain Guy
44e3b0d034 am f44ed5ad: Merge "Don\'t clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433" into honeycomb 
* commit 'f44ed5adc42fefa0c91fc79c5e3c20e1cdc7d697':
  Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433
 2011-02-02 16:47:09 -08:00
Vasu Nori
99e8e04702 am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb 
* commit '6bc710f769618e87b98d51cd02241e6b1a2fb653':
  bug:3414192 new API to designate a download to be OTA update
 2011-02-02 16:47:05 -08:00
Romain Guy
f44ed5adc4 Merge "Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433" into honeycomb 2011-02-02 16:44:07 -08:00
Vasu Nori
6bc710f769 Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb 2011-02-02 16:43:56 -08:00
Leon Scroggins
8287edd3ae am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb 
* commit '8257e4d7e2b1ac9b8310a326cf8f4b53aba760ec':
  DO NOT MERGE. Only scroll if the IME is open in certain cases.
 2011-02-02 15:52:00 -08:00
Romain Guy
62687ec12c Don't clobber the local dirty rect after rendering a layer. 
Bug #3417254
Bug #3413433

Change-Id: I8045e9ec414ebe4ce4d38124142a00726d2c634d
 2011-02-02 15:44:19 -08:00
Svetoslav Ganov
4fd9dae6a2 NumberPicker should not play initial animation while in edit mode 
bug:3417930

1. Added a check if the widget is in edit mode to determine if to
   play the initial annimation.

Change-Id: Ibcf23fa1ec55a1950323e71eda90da6418b655fb
 2011-02-02 15:17:24 -08:00
Vasu Nori
72725ebcad bug:3414192 new API to designate a download to be OTA update 
Change-Id: Iae2f6185e130324ad956f594e78b1d8b2176c808
 2011-02-02 15:08:49 -08:00
Stan Chesnutt
045b166ac2 Provide an empty List of dns servers, protecting against an NPE if the 
DHCP server omits the list of DNS servers from the DHCP-OFFER packet.

Change-Id: I4cdb3d47f36ecceaef390948741c0632067ee8ba
 2011-02-02 12:10:21 -08:00
Leon Scroggins
e89d6418be DO NOT MERGE. Only scroll if the IME is open in certain cases. 
Bug:3411564

Requires a change in external/webkit.

Already submitted to master.

Change-Id: Id5b8765bde4070f04fce0743c56a038f88e816ec
 2011-02-02 15:05:30 -05:00
Brian Carlstrom
dd1729b9e6 Merge "Removing android.security.MessageDigest" 2011-02-02 10:15:06 -08:00