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

62886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
276642baf1 Uniform rethrowing of NDC exceptions. 
Change-Id: I7e8b050f09ef0d3aebd5b5a72f856eb86dd25935
 2011-12-01 11:24:24 -08:00
Fabrice Di Meglio
a90d65265f Merge "Improve TextLayoutCache logging" 2011-11-30 15:58:49 -08:00
Fabrice Di Meglio
56e6e54927 Improve TextLayoutCache logging 
- make logs more consistent and readable
- add more logs information

Change-Id: Idfe5bb53e9163c4c07a9b4267b66b0d0e164a498
 2011-11-30 15:48:18 -08:00
Dianne Hackborn
f11fd2724f am 2fc9467e: am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 
* commit '2fc9467e9a2ef1c22a0bc81cbcd2ced878dbdef7':
  Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?
 2011-11-30 14:18:59 -08:00
Dianne Hackborn
dd07aa072f am a5b8883b: am f8d20bd6: Merge "Turn off debug log." into ics-mr1 
* commit 'a5b8883b0db9d6e129b88f003b541fafd829c77b':
  Turn off debug log.
 2011-11-30 14:16:20 -08:00
Dianne Hackborn
2fc9467e9a am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 
* commit '88f10c6ce5a97b1990934148deb8ed6aa6ef7a48':
  Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?
 2011-11-30 14:15:55 -08:00
Romain Guy
15540f8284 am 937925f5: am 7797cae2: Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1 
* commit '937925f56952f015a7ee7ea91b29f60b8c631d9e':
  Cache drawable constant states instead of drawables Bug #5678369
 2011-11-30 14:13:49 -08:00
Dianne Hackborn
a5b8883b0d am f8d20bd6: Merge "Turn off debug log." into ics-mr1 
* commit 'f8d20bd6495883e98e23827a2e5ed03766fe483b':
  Turn off debug log.
 2011-11-30 14:13:42 -08:00
Dianne Hackborn
88f10c6ce5 Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 2011-11-30 14:12:44 -08:00
Dianne Hackborn
f8d20bd649 Merge "Turn off debug log." into ics-mr1 2011-11-30 14:11:17 -08:00
Romain Guy
937925f569 am 7797cae2: Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1 
* commit '7797cae2564eccf6d817b06d8116bd9cdc8e9ed4':
  Cache drawable constant states instead of drawables Bug #5678369
 2011-11-30 14:09:21 -08:00
Romain Guy
7797cae256 Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1 2011-11-30 14:07:34 -08:00
Mathias Agopian
b665687a55 am e2970700: am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 
* commit 'e2970700e921da4226061988a6e8953b1fbfb5a9':
  add a way to access the version string of the h/w implementation of EGL
 2011-11-30 13:57:46 -08:00
Mathias Agopian
e2970700e9 am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 
* commit 'e8ba2aba934e3767d2081007bba93bad68566d22':
  add a way to access the version string of the h/w implementation of EGL
 2011-11-30 13:54:46 -08:00
David Brown
f40e91c77e Merge "Add support for country specific emergency number handling." 2011-11-30 13:54:31 -08:00
Mathias Agopian
e8ba2aba93 Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 2011-11-30 13:52:21 -08:00
The Android Open Source Project
d96452e04e Reconcile with ics-mr1-release 
Change-Id: I00b8d5eecea650df527aa3c21bb4a7270a196401
 2011-11-30 12:55:39 -08:00
Daniel Sandler
b2b0d91d34 am 7413d49b: am 865b9802: Merge "Expanding NotificationManager\'s event logging." into ics-mr1 
* commit '7413d49bfa80fb22480adc5e9d0c7be7d1034363':
  Expanding NotificationManager's event logging.
 2011-11-30 11:58:46 -08:00
Daniel Sandler
7413d49bfa am 865b9802: Merge "Expanding NotificationManager\'s event logging." into ics-mr1 
* commit '865b98024fb5fa21854feb578b8816bbb72120ba':
  Expanding NotificationManager's event logging.
 2011-11-30 11:55:50 -08:00
Daniel Sandler
865b98024f Merge "Expanding NotificationManager's event logging." into ics-mr1 2011-11-30 11:54:17 -08:00
Jeff Sharkey
28147b654b am 827eed06: am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 
* commit '827eed06cd60edf6bb873c7603ec3150b2ba8157':
  Avoid airplane mode labels when Wi-Fi enabled.
 2011-11-30 11:48:21 -08:00
Jeff Sharkey
827eed06cd am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 
* commit '47e4015ba23c507196980dcb4a311afc7e2358b1':
  Avoid airplane mode labels when Wi-Fi enabled.
 2011-11-30 11:46:19 -08:00
Jeff Sharkey
47e4015ba2 Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 2011-11-30 11:44:54 -08:00
Dianne Hackborn
bbb09aceb6 Turn off debug log. 
Change-Id: I1d4612133580d493d81d0b15752e009202e95ce0
 2011-11-30 11:40:40 -08:00
Dianne Hackborn
1fbee79eb3 Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset? 
Calls to get the display size no longer need to acquire the global
window lock.

Change-Id: I751ea6ed0e20f1f521783f4bd5a8f9c31cd43573
 2011-11-30 11:29:58 -08:00
Jeff Sharkey
ec9cc1bcc8 Avoid airplane mode labels when Wi-Fi enabled. 
When refreshing network views, avoid setting airplane mode icon and
labels when connected to Wi-Fi network.

Bug: 5262367
Change-Id: Ib831ce06bab67fffcc14a8c3b1ba9e437a74761d
 2011-11-30 11:20:40 -08:00
Svetoslav Ganov
ddd51fdb71 am 4661a05b: am 2f504d9e: Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1 
* commit '4661a05bef8c98b18698202c758067ac9c965f77':
  NumberPicker incorrectly shown for the old theme.
 2011-11-30 10:51:31 -08:00
Dianne Hackborn
27a7b13666 am 9c83b6ff: am db904b47: Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1 
* commit '9c83b6ffca5d23257a99c805d8e4540ac80e53c3':
  Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data
 2011-11-30 10:51:29 -08:00
Narayan Kamath
4f9787d6f4 am 7dfb3e61: am cc084f1d: Fix superfluous onError callbacks. 
* commit '7dfb3e611a9b4db4ffadcaa18a833de083647159':
  Fix superfluous onError callbacks.
 2011-11-30 10:51:10 -08:00
Mathias Agopian
993b2099ce am 55d3880e: am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1 
* commit '55d3880eed3450748eb7b97281e030902ee29c2a':
  SurfaceTexture: add EGL_KHR_fence_sync option
  SurfaceTexture: add a blit-to-FBO test
 2011-11-30 10:50:52 -08:00
Jamie Gennis
df96385b9a am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 
* commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6':
  SurfaceMediaSource: use the vid enc usage bit
 2011-11-30 10:50:49 -08:00
Chris Craik
267a4b0627 am c649180d: am f296ee69: Merge "Send animation start notification back to webkit from ui thread" into ics-mr1 
* commit 'c649180d7c12b0b4bc3c183a6431da26cff74819':
  Send animation start notification back to webkit from ui thread
 2011-11-30 10:50:42 -08:00
Romain Guy
39fe17c8fb Cache drawable constant states instead of drawables 
Bug #5678369

Caching drawables directly in a static map was responsible for runtime
restarts. If two different UI threads requested the same drawable, the
first thread to issue the request would be given a drawable callback
belonging to the second thread. This would cause an exception in
ViewRootImpl on invalidate.

The solution is to store the drawable states and to create a new
drawable instance every time a drawable is requested from the
cache. This is similar to how preloaded resources are handled.

Change-Id: I47e24e2a168cf67a3589185c6cd77b70f9a1c7cf
 2011-11-30 10:34:07 -08:00
Svetoslav Ganov
4661a05bef am 2f504d9e: Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1 
* commit '2f504d9ea8aa18cd8dbaa2dcc3f3959252b414cc':
  NumberPicker incorrectly shown for the old theme.
 2011-11-30 10:27:45 -08:00
Svetoslav Ganov
2f504d9ea8 Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1 2011-11-30 10:25:42 -08:00
Dianne Hackborn
9c83b6ffca am db904b47: Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1 
* commit 'db904b4782a4dfc9d81d5d0616dea3656893b539':
  Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data
 2011-11-30 10:22:37 -08:00
Dianne Hackborn
db904b4782 Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1 2011-11-30 10:20:29 -08:00
Jeff Sharkey
cf5b90b45c Merge "Clean up InterfaceConfiguration flags." 2011-11-30 10:20:07 -08:00
Steve Block
6a8c48f6aa Merge "Clean up JavaDoc for GeolocationPermissions" 2011-11-30 10:04:37 -08:00
Steve Block
7351adf76a Clean up JavaDoc for GeolocationPermissions 
Much of the current JavaDoc for GeolocationPermissions exposes implementation
details which are of no interest to a Java developer. Move these comments out
of the JavaDoc and clean up the text.

Bug: 5461416
Change-Id: I95a68fe15016fadc729d8d857fd69b2c927a5ea9
 2011-11-30 18:03:30 +00:00
Dianne Hackborn
ed032e7873 am 500862b4: am 1808f214: Merge "Fix issue #5636525: ANR observed in setup wizard after changing language" into ics-mr1 
* commit '500862b44c8ecbb867144781239bd55b6d3c9489':
  Fix issue #5636525: ANR observed in setup wizard after changing language
 2011-11-30 09:58:18 -08:00
Teng-Hui Zhu
0e9f0c3e13 am e9dc400c: am d3788b97: Merge "WebView animation support" into ics-mr1 
* commit 'e9dc400c080577b74a59085f9c2428c92ee21e16':
  WebView animation support
 2011-11-30 09:58:02 -08:00
Romain Guy
9e81c791af am 7e6077c7: am a9a91ad3: Merge "Improve screenshot animation performance Bug #5525888" into ics-mr1 
* commit '7e6077c73999d906aa84b8dd4344bab996c75080':
  Improve screenshot animation performance Bug #5525888
 2011-11-30 09:57:57 -08:00
Andreas Huber
7ba11ef4a0 Merge "resolved conflicts for merge of 3d630e86 to master" 2011-11-30 09:55:47 -08:00
Nick Kralevich
cdc8a01e26 Merge "allow dumpstate to work with dmesg_restrict=1" 2011-11-30 09:55:06 -08:00
Andreas Huber
db85b54395 resolved conflicts for merge of 3d630e86 to master 
Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
 2011-11-30 09:53:40 -08:00
The Android Automerger
127c35553d merge in ics-mr1-release history after reset to ics-mr1 2011-11-30 06:46:17 -08:00
Narayan Kamath
7dfb3e611a am cc084f1d: Fix superfluous onError callbacks. 
* commit 'cc084f1d734c1e332d6acc1f89204036ee82bd0c':
  Fix superfluous onError callbacks.
 2011-11-30 04:57:10 -08:00
Narayan Kamath
cc084f1d73 Fix superfluous onError callbacks. 
When stop() is called twice or after done().This relates
to bug 5662598 because users using the old deprecated API
will see two calls to onUtteranceCompleted.

bug:5662598
Change-Id: I5d59cf66b4f4c8650d3f8f9e503ac3f33132c0d0
 2011-11-30 12:32:15 +00:00
Narayan Kamath
7a44d68249 Merge "Allow multiple TextToSpeech instances per calling app." 2011-11-30 02:45:22 -08:00