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

96693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Colonna
d219cebfcb am eceef837: am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 
* commit 'eceef837e34e6860ad532d15402435606550f3fa':
  Ignoring FUL unlock signal if user changed fixes b/7572354
 2012-11-29 12:48:41 -08:00
Zhihai Xu
55b82a8688 am aaa453db: am 2c7dac19: am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit 'aaa453dbbdd9307ddc8fbd32e7f3c1e673e02b83':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-29 12:48:36 -08:00
Brian Colonna
eceef837e3 am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 
* commit 'ceb87a664fdcfa08f98238bfe41fc3a03603cbf8':
  Ignoring FUL unlock signal if user changed fixes b/7572354
 2012-11-29 12:45:18 -08:00
Zhihai Xu
aaa453dbbd am 2c7dac19: am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit '2c7dac19dd2cab68587cd129b45ad593f7bfdc44':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-29 12:45:09 -08:00
Craig Mautner
8f0bdb5bb6 Merge "Extract AppTransition from WindowManager" 2012-11-29 11:43:49 -08:00
Elliott Hughes
7905db94ad am 878da653: am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error." 
* commit '878da6532836ec09f6d27e8f5af79444c79e78b6':
  Fix AndroidHttpClient documentation error.
 2012-11-29 10:24:14 -08:00
Elliott Hughes
878da65328 am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error." 
* commit '9ed4abd875852524c5dd366f30b5b7bda93f0da3':
  Fix AndroidHttpClient documentation error.
 2012-11-29 10:21:23 -08:00
Elliott Hughes
a0e1f91b98 am 565de5f6: am 820b3e29: Merge "Make transactGetSockaddr locale safe" 
* commit '565de5f6cb75631f6b23011fcac4fcf8be8d5c5e':
  Make transactGetSockaddr locale safe
 2012-11-29 09:49:40 -08:00
Elliott Hughes
9ed4abd875 Merge "Fix AndroidHttpClient documentation error." 2012-11-29 09:23:54 -08:00
Elliott Hughes
565de5f6cb am 820b3e29: Merge "Make transactGetSockaddr locale safe" 
* commit '820b3e29caab93de9535f18d98c6fd264c7fa983':
  Make transactGetSockaddr locale safe
 2012-11-29 09:14:35 -08:00
Elliott Hughes
820b3e29ca Merge "Make transactGetSockaddr locale safe" 2012-11-29 08:50:23 -08:00
Elliott Hughes
d2dcd7ada3 Fix AndroidHttpClient documentation error. 
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.

Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
 2012-11-29 08:32:13 -08:00
Alex Ray
3251d36313 Merge "core: Update Java wrappers for atrace." 2012-11-28 17:11:00 -08:00
Chet Haase
288f20c603 am 51812754: am 25082e33: Merge "Another optimization of glyph cache uploads" 
* commit '518127549997fbf01fd3af59c4312e43f137e194':
  Another optimization of glyph cache uploads
 2012-11-28 15:05:03 -08:00
Chet Haase
5181275499 am 25082e33: Merge "Another optimization of glyph cache uploads" 
* commit '25082e3326a3133607129b3e4cea983b113e9764':
  Another optimization of glyph cache uploads
 2012-11-28 15:02:09 -08:00
Chet Haase
25082e3326 Merge "Another optimization of glyph cache uploads" 2012-11-28 14:46:14 -08:00
Brian Colonna
ceb87a664f am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 
* commit '6f6facc17812fe529f3de0b75de5f9011d73eacc':
  Ignoring FUL unlock signal if user changed fixes b/7572354
 2012-11-28 12:48:32 -08:00
Brian Colonna
6f6facc178 Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 2012-11-28 12:46:24 -08:00
Wink Saville
43cdf6d679 Merge "Use Rlog instead of Log" 2012-11-28 12:31:04 -08:00
Zhihai Xu
2c7dac19dd am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit 'e3f7c45241a90d3e4b76d28911831f5dcbaaa038':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-28 12:21:11 -08:00
Zhihai Xu
e3f7c45241 Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 2012-11-28 12:19:42 -08:00
Adam Powell
507a2d9852 am c87b053b: am b29dc7e3: am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 
* commit 'c87b053bf92bf39644b554673bc4480606df57e3':
  Remove overzealous mutate() sanity check in LayerDrawable
 2012-11-28 11:33:49 -08:00
Adam Powell
c87b053bf9 am b29dc7e3: am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 
* commit 'b29dc7e37bc110894cd6287f071f6ba0e4d800a7':
  Remove overzealous mutate() sanity check in LayerDrawable
 2012-11-28 11:31:40 -08:00
Zhihai Xu
3e1c6f8a10 am ccacaf94: am a6433475: am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit 'ccacaf9434bdd0d89aede6dfa1409a4ab6241063':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:30:06 -08:00
Adam Powell
b29dc7e37b am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 
* commit 'f3a39f2df40503e8e3a91937f9f5f33b43528274':
  Remove overzealous mutate() sanity check in LayerDrawable
 2012-11-28 11:29:51 -08:00
Zhihai Xu
ccacaf9434 am a6433475: am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit 'a64334756858b9fd3bad2c263feea00233699218':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:27:55 -08:00
Adam Powell
f3a39f2df4 Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 2012-11-28 11:27:21 -08:00
Zhihai Xu
a643347568 am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit '5c0f3e5075c8ac8b22bbaeb32bddfada9657577a':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:26:08 -08:00
Zhihai Xu
5c0f3e5075 Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 2012-11-28 11:22:21 -08:00
Scott Main
ce4a9a34b6 am 33a8b28f: am 1cc041f7: am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '33a8b28f04ae689f3d5e24ef46df1dea76be602b':
  docs: update dreamservice description
 2012-11-28 11:04:18 -08:00
Scott Main
33a8b28f04 am 1cc041f7: am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '1cc041f7d7e76b77375ec03a1c626cb3a7952fc7':
  docs: update dreamservice description
 2012-11-28 11:02:41 -08:00
Scott Main
1cc041f7d7 am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '7538ff0920a8cbdfe68885221d1275633eafc613':
  docs: update dreamservice description
 2012-11-28 10:43:22 -08:00
Scott Main
7538ff0920 am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '35473e6e6d2d17c859173ca0cf0dfdcfcb0b4663':
  docs: update dreamservice description
 2012-11-28 10:40:18 -08:00
Scott Main
35473e6e6d Merge "docs: update dreamservice description" into jb-mr1-dev 2012-11-28 10:05:54 -08:00
Andreas Huber
c653df4643 am 8fac23f2: am 8be8ee4c: am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 
* commit '8fac23f23df08b192a542be57b09badfbb0a1bf4':
  Stop caching stream duration, it might change (increase) dynamically.
 2012-11-28 09:47:50 -08:00
Andreas Huber
8fac23f23d am 8be8ee4c: am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 
* commit '8be8ee4c4a2f6386680bc8c6aeb88c597d5f4dcd':
  Stop caching stream duration, it might change (increase) dynamically.
 2012-11-28 09:44:44 -08:00
Andreas Huber
8be8ee4c4a am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 
* commit 'f0afad008bf78576ff364bcd8bc93b7aa8090b34':
  Stop caching stream duration, it might change (increase) dynamically.
 2012-11-28 09:43:29 -08:00
Andreas Huber
f0afad008b Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 2012-11-28 09:39:27 -08:00
Svetoslav Ganov
ec45cc096d Merge "Switching the accessibility poolable classes to the new pool management APIs." 2012-11-28 09:16:45 -08:00
Svetoslav Ganov
f4782ec9c5 Switching the accessibility poolable classes to the new pool management APIs. 
The pool management APIs were simplified and using them requires much less
code than implementing your own pooling. Using common pooling logic is
also less error prone. This change swithces AccessibilityEvent and
AccessibilityNodeInfo to the new APIs.

Change-Id: I2dcfe2e1b0b0be5f89bd92359766ae3d6f8a143b
 2012-11-28 09:11:51 -08:00
Daniel Sandler
cfb95d0549 am e9316c06: am 78d2febf: am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 
* commit 'e9316c06756f4553c812b34cf023f54a514e86aa':
  New timings for default & fallback notification vibration.
 2012-11-28 06:31:53 -08:00
Ken Sumrall
fa5a2593c9 am be473c8f: Merge branch \'jb-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr1-dev-plus-aosp 
* commit 'be473c8fd12955dcb861f330f5f7a4a2a453c8df':
 2012-11-28 06:31:49 -08:00
Daniel Sandler
57f39c23b6 am 690d2052: am 6684a2ce: am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev 
* commit '690d2052b2d5eb7c471c93aacec4f5e28b42107f':
  Cleanups in Notification.java.
 2012-11-28 06:31:45 -08:00
Daniel Sandler
e9316c0675 am 78d2febf: am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 
* commit '78d2febf1f3730c8ad5a6747456529cd1f34b0c7':
  New timings for default & fallback notification vibration.
 2012-11-28 06:30:15 -08:00
Ken Sumrall
be473c8fd1 Merge branch 'jb-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr1-dev-plus-aosp 2012-11-28 06:30:14 -08:00
Daniel Sandler
78d2febf1f am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 
* commit 'c7f55f5595fb6ffdec7796e801545156aefd3655':
  New timings for default & fallback notification vibration.
 2012-11-28 06:28:13 -08:00
Daniel Sandler
c7f55f5595 Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 2012-11-28 06:22:53 -08:00
Alex Ray
8a6787b1c7 core: Update Java wrappers for atrace. 
Atrace functionality moved to cutils.  Add ATRACE_TAG_HAL.

Change-Id: I80e1c9438bfd2436559b64e94e4009cb9c5dbc09
 2012-11-27 23:11:16 -08:00
Svetoslav Ganov
4cdb0adcb3 Merge "Simplification of the poolable management utils." 2012-11-27 19:13:12 -08:00
Svetoslav Ganov
abae2a1b89 Simplification of the poolable management utils. 
Before to implement a pool of objects, the pooled class had to implement an
   interface which was leaking the pool management APIs. This requires
   hiding APIs - inconvenient at best. Further, each client had to
   implement the chaining of pooled instances which means adding a couple
   of member variables which are manipulated by the implemented interface
   methods. As a consequence the client is aware of how pooling is
   implemented which is error prone and breaks encapsulation. Now the
   pool objects are responsible for managing pooling state via reusable
   wrapper objects and the clients are oblivious of how pooling is done.
   Creating a thin cached wrapper for each pooled object has minimal
   performance impact while making the code more maintainable. Actually
   implementing of the old version of the APIs was taking as much code
   as implementing the pooling yourself.

   Also clients had to implement a poolable manager whose responsibility
   was to create new instances and provide callbacks when an instance
   is added to or removed from the pool. Now, the clinet class should
   create a static member for the pool and expose obtain/aquire and
   release/recycle methods in which it should create a new instance if
   the pool did not return one and clear the state of the host when
   it is returned to the pool. Updated the JavaDoc with a best practice.

   The pooling was composed of several interfaces and classes scattered
   over a few files, now all this is in a single small file.

   Update all usages of the pooling APIs in the framework.

Also one had to write a poolable
   manager which

Change-Id: Ib8dc286040eb3d7cb7d9668ba76fead05cb97647
 2012-11-27 19:10:51 -08:00