29698 Commits

Author SHA1 Message Date
Romain Guy
8e0d7bcef1 Merge "Improve profiling by using Choreographer" 2012-11-29 13:04:18 -08:00
Romain Guy
d075031944 Improve profiling by using Choreographer
This will avoid jank and lead to better measurements.

Change-Id: Id18587a0a0b7d45adb3a65dfc427800565cc5d0b
2012-11-29 11:34:43 -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
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
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
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
Daniel Sandler
690d2052b2 am 6684a2ce: am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev
* commit '6684a2ce1abd94972d5480c2214a9509781c755b':
  Cleanups in Notification.java.
2012-11-27 18:43:46 -08:00
Daniel Sandler
6684a2ce1a am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev
* commit 'bf0e106a7d755355d7ff53a2b319e2e91c154641':
  Cleanups in Notification.java.
2012-11-27 18:41:01 -08:00
Daniel Sandler
bf0e106a7d Merge "Cleanups in Notification.java." into jb-mr1.1-dev 2012-11-27 18:38:33 -08:00
Dianne Hackborn
816a5d9c27 am 360acd03: am 78551bc7: am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev
* commit '360acd03bfe0d597ee845d2392d715633a89e12b':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
2012-11-27 17:34:11 -08:00
Winson Chung
fb8ca912e8 am d0079891: am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev
* commit 'd0079891e3a8034f560eaf88d5be692b61ca4b9a':
  Removing unecessary additional lock metadata from QuickSettings user tile.
2012-11-27 17:33:46 -08:00
Andreas Huber
585c07e9ac Stop caching stream duration, it might change (increase) dynamically.
Change-Id: Ia829f47602e6961f24464da36a0162b8c1d7d6c8
related-to-bug: 6870049
2012-11-27 15:50:43 -08:00
Romain Guy
dccf9337e6 Merge "Add support for face attribute to HTML string resources Bug #7480719" 2012-11-27 14:35:24 -08:00
Romain Guy
a8f6d5f072 Add support for face attribute to HTML string resources
Bug #7480719

This change also adds the alias "color" for the attribute "fgcolor".
This change also unifies HTML colors parsing between the Html class
and StringBlock for consistency.

Change-Id: I696a6e080387901d88e9baf7cb989b892f14b9db
2012-11-27 14:34:33 -08:00
Romain Guy
f6ae4b897b Reset stored background resource when setting a bg color
This sequence of operations would prevent the background from
changing:

setBackgroundResource(R.something)
setBackgroundColor(aColor)
setBackgroundResource(R.something)

The last call would be no-oped.

Change-Id: I436a33599c88e35f6f36bdd63e9c256c9219e052
2012-11-27 13:57:27 -08:00
Chet Haase
3b2b3aaf9f am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev
* commit '47a8e863e32dc634aa1df79d805f4a366e13d4e9':
  Fix infinite recursive loop DO NOT MERGE
2012-11-27 12:49:16 -08:00
Chet Haase
47a8e863e3 Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev 2012-11-27 12:47:19 -08:00
Dianne Hackborn
360acd03bf am 78551bc7: am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev
* commit '78551bc7d5541c86503b32db0e3e2564218bf179':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
2012-11-27 11:36:34 -08:00
Winson Chung
d0079891e3 am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev
* commit '9f6e8ddf5d48a695b26f1d9759696b56952177bd':
  Removing unecessary additional lock metadata from QuickSettings user tile.
2012-11-27 11:36:13 -08:00
Dianne Hackborn
78551bc7d5 am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev
* commit 'ba4ac51823c59152e2167365b81ac56857b6b4d0':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
2012-11-27 11:31:53 -08:00
Winson Chung
9f6e8ddf5d am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev
* commit '2b847c39336024a958742195de4f406e7aa79540':
  Removing unecessary additional lock metadata from QuickSettings user tile.
2012-11-27 11:31:03 -08:00
László Dávid
6ead9418ff Fix infinite recursive loop DO NOT MERGE
FindBugs description:

There is an apparent recursive loop at IntProperty.java
in method set(Object, Integer)

This method unconditionally invokes itself. This would seem
to indicate an infinite recursive loop that will result in a stack overflow.

Note: Checked into AOSP. Cherry-picking for mr1.1.

Issue #7621806 IntProperty has infinite recursion bug

Change-Id: I2f52dd3689198cb948925aa65dd9c95be7888fe7
2012-11-27 11:11:10 -08:00
Dianne Hackborn
ba4ac51823 Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 2012-11-27 11:06:35 -08:00
Dianne Hackborn
8103890a59 Improve debugging for issue #7586414: AlarmManager wakelocks held
In alarm manager, print a summary of the top 10 alarms by time
being executed.  Keep track of execution time (and wake count) of
each type of alarm for each application so this can be printed in
the summary (and used to compute the top 10 alarms).  Rework how
the alarm summary stats are tracked so that we don't need to hold
on to the full Intent for each stat and can get the Intent information
at the time the alarm is sent rather than waiting for whatever Intent
comes back in the result.

Also in the battery stats: sort the kernel wake locks by time, add
a new section showing all partial wake locks across all applications
sorted by time.

Finally a new LocalLog class that is used by AlarmManager to log
important warning messages, so these can also be later found in
its dumpsys output.

Change-Id: Icc07810053e60fb623a49937e696819cb8352b06
2012-11-27 11:05:42 -08:00
Chet Haase
62d3fd89ec am 161194da: am d8a6b544: am 21243369: Merge "Fix infinite recursive loop"
* commit '161194daad7cee031475648be294e5e9d4bc6d68':
  Fix infinite recursive loop
2012-11-27 09:41:16 -08:00
Chet Haase
161194daad am d8a6b544: am 21243369: Merge "Fix infinite recursive loop"
* commit 'd8a6b5445c070e1ab5d86a87e6669340591625d7':
  Fix infinite recursive loop
2012-11-27 09:39:16 -08:00
Chet Haase
d8a6b5445c am 21243369: Merge "Fix infinite recursive loop"
* commit '2124336984cb6c189f03c271636a1cc8babb2371':
  Fix infinite recursive loop
2012-11-27 09:37:23 -08:00
Chet Haase
2124336984 Merge "Fix infinite recursive loop" 2012-11-27 08:34:18 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
2012-11-27 08:21:11 -08:00
Przemyslaw Szczepaniak
2d940bcbd1 Make TTS input string limit public and documented.
TTS input limit is now publicly available from getMaxSpeechInputLength()
static method.

Bug: 7456118
Change-Id: Ib2afbb7202ad9dc15895f322fbd1480a5f1f7278
2012-11-27 03:25:27 -08:00
Scott Kennedy
c40d1153e0 Unhide SparseLongArray
Because it's useful.

Change-Id: I6c71a49eed2c0c366e8afa874ebbc48cfe816a90
2012-11-26 17:51:04 -08:00