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

64115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Block
8564c8da81 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
 2012-01-06 10:07:54 +00:00
Ken Wakasa
c42e6a0bed Merge "Comment clean up for InputMethodSubtype." 2012-01-05 19:45:30 -08:00
Rajdeep Dua
3dc5a2eacf Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366" 2012-01-05 19:41:23 -08:00
Ken Wakasa
9a74476c0a Comment clean up for InputMethodSubtype. 
Change-Id: I50bca715f4caa669cb341b36a3d46358e1ad1ded
 2012-01-06 12:32:15 +09:00
Fabrice Di Meglio
d4a69b4a1c Merge "Fix bug #5753006 Garbled Labels in Maps" 2012-01-05 15:18:52 -08:00
Teng-Hui Zhu
a4ad2928eb Merge "getDuration can be only called after prepared." 2012-01-05 14:47:01 -08:00
David Hu
0df0ed5814 Merge "BandwidthTestRunner" 2012-01-05 14:39:45 -08:00
Marco Nelissen
4b4d00e714 Merge "ThumbnailUtils: To fix misuse of FileInputStream." 2012-01-05 14:11:40 -08:00
Steve Block
bd47cac4df Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:07:02 -08:00
Fabrice Di Meglio
c726ff02c7 Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long" 2012-01-05 13:55:01 -08:00
Fabrice Di Meglio
c511bee87c Fix bug #5753006 Garbled Labels in Maps 
- it was a regression introduced into this CL: https://android-git.corp.google.com/g/#/c/154240/5
- basically needed to set the GlyphID encoding to the Skia Paint as we are now using glyphID resulting
from the Harfbuzz shaping
- also define GlyphID encoding as the default on the Paint class

Change-Id: Idb7c2c57ac67595425ce3be9421258962690fcdd
 2012-01-05 13:30:54 -08:00
Scott Main
d1a8229227 am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* commit '47228cac900cd58d0687b6e6d980381cfc8010a1':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 12:09:07 -08:00
The Android Open Source Project
b1483cb9ca am d32ee5ba: Reconcile with ics-mr1-release 
* commit 'd32ee5baa057992431263907ec5cf8f19b43c043':
 2012-01-05 12:08:48 -08:00
Robert Greenwalt
32350c7ab2 Merge "Filter our v6 address from tethering dns." 2012-01-05 11:39:26 -08:00
Scott Main
47228cac90 am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* commit 'dacbf67ab915fa8b987f6fb9f044160af92652cd':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:45:19 -08:00
Scott Main
dacbf67ab9 Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* changes:
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:42:52 -08:00
Glenn Kasten
6b14d58580 Merge "Remove the notion of "active track" from mixer" 2012-01-05 08:20:10 -08:00
The Android Open Source Project
d32ee5baa0 Reconcile with ics-mr1-release 
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
 2012-01-05 07:45:28 -08:00
Glenn Kasten
a8719ad9d5 Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 2012-01-05 07:38:29 -08:00
Glenn Kasten
e80a4ccd2b Use the standard CC_LIKELY and CC_UNLIKELY macros 
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose.  So rename the private
uses to use the standard names.

In addition, AudioFlinger was relying on the macro expanding to extra ( ).

Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
 2012-01-05 07:33:45 -08:00
Rajdeep Dua
cf06d7390c Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) 
Bug Id : 5813366

Change-Id: Icc482ad820a91a1896c61db67bb6b95cc2ae4c5b
 2012-01-05 16:27:15 +05:30
Dongwon Kang
3993818689 ThumbnailUtils: To fix misuse of FileInputStream. 
We need to close it explicitly after using it. Without this, fd will be closed
non-deterministically, and that will break the decode procedure.

Bug: 5808889
Change-Id: Icf9ff9abd6e327b122c6916df9750016b3d1b616
 2012-01-05 17:17:48 +09:00
Wink Saville
9a03482c66 am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 
* commit '3ed2803691cc271fe6b893dc46d49fca2fce61df':
  Enhancement on ICS data stall polling logic
 2012-01-04 21:52:13 -08:00
Wink Saville
efd617e01f am 0ad96f89: am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 
* commit '0ad96f89401920486b68d8404f6a143870d57500':
  Add support of dislaying Alpha tag for BIP commands
 2012-01-04 21:52:10 -08:00
Wink Saville
7da207b574 am a3534ad4: am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 
* commit 'a3534ad4a4b936a2629f4a0b854b814b3494ac7e':
  Support suggestedRetryTime in CDMA DCT
 2012-01-04 21:52:06 -08:00
Bart Sears
39f0554098 am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 
* commit '875b69928193e464243cf491bfe861f30644e9b4':
  Do not allow file:// access when it is disabled. Do not merge.
 2012-01-04 21:52:04 -08:00
Eric Laurent
dc8627e7dc resolved conflicts for merge of 1a4b9939 to master 
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
 2012-01-04 17:39:12 -08:00
Teng-Hui Zhu
0d1d30b330 getDuration can be only called after prepared. 
bug:5816130
Change-Id: I4f264ef612995bc4f7bc3e378893ed9491423fdc
 2012-01-04 17:28:58 -08:00
Scott Main
e63163a334 docs: second set of diagram updates 
Change-Id: I1df85b6a954c29344d537737da57683b2c7941fd
 2012-01-04 17:20:48 -08:00
The Android Automerger
6590d88f65 merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:42:23 -08:00
Fabrice Di Meglio
bd7cdc32eb Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long 
- do not clear the smart pointer when the cache entry does not fit the cache size

Change-Id: I49f1aa1e70018bb7d6a8fb076d9269d0ec6a5d98
See: http://code.google.com/p/android/issues/detail?id=23337
 2012-01-04 14:25:54 -08:00
Wink Saville
3ed2803691 am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 
* commit 'c697ebfdd671c7f4cf338d601917de16d2f1f135':
  Enhancement on ICS data stall polling logic
 2012-01-04 13:55:28 -08:00
Wink Saville
c697ebfdd6 Merge "Enhancement on ICS data stall polling logic" into ics-mr1 2012-01-04 13:53:25 -08:00
Wink Saville
0ad96f8940 am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 
* commit 'd4d35168129d544f62cee7e1f83c5bf15d9f291d':
  Add support of dislaying Alpha tag for BIP commands
 2012-01-04 13:51:59 -08:00
Wink Saville
d4d3516812 Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 2012-01-04 13:50:04 -08:00
Wink Saville
a3534ad4a4 am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 
* commit 'c97d0e43bacdae735071d6d7026175fbc4bdafca':
  Support suggestedRetryTime in CDMA DCT
 2012-01-04 13:49:37 -08:00
Bart Sears
875b699281 am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 
* commit '705665acda5fec6c8c76683b2e5850b0bd447449':
  Do not allow file:// access when it is disabled. Do not merge.
 2012-01-04 13:49:34 -08:00
Wink Saville
c97d0e43ba Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 2012-01-04 13:47:55 -08:00
Bart Sears
705665acda Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 2012-01-04 13:47:09 -08:00
Eric Laurent
1a4b99396d am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 
* commit 'fb578b6b88af51812b71a86ad4dd3a7de56e394b':
  audioflinger: fix clicks on 48kHz audio.
 2012-01-04 13:00:49 -08:00
Eric Laurent
fb578b6b88 Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 2012-01-04 12:58:17 -08:00
Siva Velusamy
157fea642c gltrace: add user settings to control data captured. 
Currently users do not have control over the amount of data
captured during tracing. This patch adds 3 settings that users
can enable/disable at runtime:
  - capture framebuffer on eglSwap() calls
  - capture framebuffer on glDraw*() calls
  - capture texture data passed to glTexImage*() calls
Disabling these options when not needed signficantly decreases
the size of the trace file, and reduces performance overhead for
the running application.

These settings are stored in the per process GLTraceState.
A separate thread listens for commands from the host, and updates
the state based on the user commands.

Change-Id: Ic4518b94e8bcbc5330ac7138153721caa98b365d
 2012-01-04 12:50:13 -08:00
Siva Velusamy
193b45970e Merge "gltrace: add start time & duration to each traced call." 2012-01-04 12:48:52 -08:00
Siva Velusamy
974a166022 Merge "gltrace: transport buffering and context management" 2012-01-04 12:47:29 -08:00
Steve Block
6215d3ff4b Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
 2012-01-04 20:05:49 +00:00
Scott Main
16a21720d9 am 319c3bcb: am c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url 
* commit '319c3bcbb1b0163040984e263b5b16005f81adba':
  docs: add Teleepoch VID/driver info and update Huawei url
 2012-01-04 12:03:22 -08:00
Scott Main
319c3bcbb1 am c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url 
* commit 'c8810c2feb53bd423d0ef31bc10d22fc4cbf9c89':
  docs: add Teleepoch VID/driver info and update Huawei url
 2012-01-04 12:01:02 -08:00
Scott Main
c8810c2feb docs: add Teleepoch VID/driver info 
and update Huawei url

Change-Id: I4d6720d132f0d4e53bb25aa225327e38ba969881
 2012-01-04 11:57:18 -08:00
Siva Velusamy
5ed919e33d gltrace: add start time & duration to each traced call. 
Change-Id: Idfec8f715f6000594b6381cbfdee9fdf6d89f484
 2012-01-04 11:38:37 -08:00
Siva Velusamy
1e81e710fc gltrace: transport buffering and context management 
This patch adds two improvements:
1. Protobuf messages are buffered and sent in chunks.
2. Multiple EGL contexts are handled properly: Corresponding
to each EGLContext, a GLTraceContext with a unique ID is created.
On eglMakeCurrent, the appropriate GLTraceContext is set and is
used while tracing subsequent GL Calls in that thread.

Change-Id: I34076376d3e5af205c87c7396ea47659844abd6e
 2012-01-04 11:38:37 -08:00