ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
42,596 Commits 2 Branches 0 Tags 54 MiB
32397c1cd3
Commit Graph

42596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Block
32397c1cd3 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
5f56dfec5a Merge "Comment clean up for InputMethodSubtype." 2012-01-05 19:45:30 -08:00
Rajdeep Dua
1f8f30c052 Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366" 2012-01-05 19:41:23 -08:00
Fabrice Di Meglio
90b3f113a8 Merge "Fix bug #5753006 Garbled Labels in Maps" 2012-01-05 15:18:52 -08:00
Teng-Hui Zhu
15f6b67fab Merge "getDuration can be only called after prepared." 2012-01-05 14:47:01 -08:00
David Hu
11d833d1db Merge "BandwidthTestRunner" 2012-01-05 14:39:45 -08:00
Marco Nelissen
93f39d8545 Merge "ThumbnailUtils: To fix misuse of FileInputStream." 2012-01-05 14:11:40 -08:00
Steve Block
c267bab3d1 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:07:02 -08:00
Fabrice Di Meglio
69b310000d 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
Scott Main
3032c5f44f 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
d9f8d8b0af am d32ee5ba: Reconcile with ics-mr1-release 
* commit 'd32ee5baa057992431263907ec5cf8f19b43c043':
 2012-01-05 12:08:48 -08:00
Robert Greenwalt
75e4c00db5 Merge "Filter our v6 address from tethering dns." 2012-01-05 11:39:26 -08:00
Scott Main
b34baf5f6a 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
55ec71116f 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
e2343842c6 Merge "Remove the notion of "active track" from mixer" 2012-01-05 08:20:10 -08:00
The Android Open Source Project
ddf6c13a12 Reconcile with ics-mr1-release 
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
 2012-01-05 07:45:28 -08:00
Glenn Kasten
2adea706d4 Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 2012-01-05 07:38:29 -08:00
Glenn Kasten
99ed22412d 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
Wink Saville
e03e4949c0 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
cebce139c5 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
f66dbb14bb 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
77f0a7535d 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
e9e2f6f78a resolved conflicts for merge of 1a4b9939 to master 
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
 2012-01-04 17:39:12 -08:00
The Android Automerger
31815b4f39 merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:42:23 -08:00
Wink Saville
42fdc6f3e3 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
103a6ff9ce Merge "Enhancement on ICS data stall polling logic" into ics-mr1 2012-01-04 13:53:25 -08:00
Wink Saville
0d69bb8a62 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
4ee6427cc5 Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 2012-01-04 13:50:04 -08:00
Wink Saville
5bdd1e8ccf 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
53cc3c7676 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
624eef24dc Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 2012-01-04 13:47:55 -08:00
Bart Sears
66577b602c 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
2ae141d964 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
11cb4c04a3 Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 2012-01-04 12:58:17 -08:00
Siva Velusamy
3f194e6e3a 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
875bdea8be Merge "gltrace: add start time & duration to each traced call." 2012-01-04 12:48:52 -08:00
Siva Velusamy
9fccbcf891 Merge "gltrace: transport buffering and context management" 2012-01-04 12:47:29 -08:00
Steve Block
a19954ab37 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
11468cd7dd 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
030270348b 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
Siva Velusamy
56ac6ff9bd gltrace: add start time & duration to each traced call. 
Change-Id: Idfec8f715f6000594b6381cbfdee9fdf6d89f484
 2012-01-04 11:38:37 -08:00
Siva Velusamy
93a826f78f 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
Siva Velusamy
59511ad1cb Merge "gltrace: attach contents of the appropriate framebuffer" 2012-01-04 11:18:29 -08:00
John Reck
3b115238cf Merge "Fix Apache stack" 2012-01-04 10:52:35 -08:00
Steve Block
7e2b7472a1 Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE" 2012-01-04 10:13:13 -08:00
Jesse Wilson
a91bc48fbd Merge "Explicitly specify 'milliseconds' as alarm manager's time unit." 2012-01-04 08:22:36 -08:00
Steve Block
45c7256dcb Merge "Fix AppCache when either no path or an invalid path is supplied" 2012-01-04 05:36:57 -08:00
Elliott Hughes
1145adc629 Merge "Fix Music import for Turkish locales." 2012-01-03 18:54:27 -08:00
Christopher Tate
675c98dafb am 91582b86: am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1 
* commit '91582b86d918b80158654671933cf26c96c34747':
  Tweak docs on 'adb logcat'
 2012-01-03 17:44:09 -08:00
Christopher Tate
48d485e150 am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1 
* commit '30ad699c0e246ef3889f691361758235ecb89895':
  Tweak docs on 'adb logcat'
 2012-01-03 17:40:53 -08:00