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

62906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
45470559cd am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '12b7da69957ef894ce5134989e38479c64308ea1':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:28:30 -08:00
Jean-Baptiste Queru
db2b39300a am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'f3f650db96d40014a0203393c585c368b0dd7a9a':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-19 17:28:26 -08:00
Jean-Baptiste Queru
dde686e2bd am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit '08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-19 17:28:22 -08:00
Jean-Baptiste Queru
a1e8739757 am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit '7ae84204c14b4abff70fcc19c3c33de2591df34b':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-19 17:28:18 -08:00
Jean-Baptiste Queru
12b7da6995 am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:26:12 -08:00
Jean-Baptiste Queru
f3f650db96 am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-19 17:26:08 -08:00
Jean-Baptiste Queru
08d3c6e5ba am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-19 17:26:03 -08:00
Jean-Baptiste Queru
7ae84204c1 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-19 17:25:58 -08:00
Jean-Baptiste Queru
d6b5584b67 am 97aa8ee8: Merge ee4618bc 
* commit '97aa8ee81198234aedffceaf71ad216b96323393':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
 2012-01-19 17:20:58 -08:00
Jean-Baptiste Queru
97aa8ee811 Merge ee4618bc 
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
 2012-01-19 17:18:25 -08:00
Jean-Baptiste Queru
fd266b3682 am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 
* commit '36b48c30adf7236b00eccf87f3b5691359526540':
  Rename (IF_)LOG() to (IF_)ALOG()
 2012-01-19 17:02:27 -08:00
Jean-Baptiste Queru
36b48c30ad am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 
* commit 'c318bbb05e02a0080e129623ec8029d31be0d60e':
  Rename (IF_)LOG() to (IF_)ALOG()
 2012-01-19 16:59:41 -08:00
Justin Ho
abc90a7b48 am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 
* commit '820b45c0a21980a43532b9fb9823f8aa08c64a15':
  DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"
 2012-01-19 15:44:53 -08:00
Justin Ho
820b45c0a2 Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 2012-01-19 15:43:19 -08:00
Justin Ho
170997a519 DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited" 
This reverts commit 01b02a734d2988c22b00f5df6346ad03d8bf52b6.

Change-Id: I848c01fc44eb9a51ead1116b2647ed838ec1825f
 2012-01-19 15:41:33 -08:00
Jean-Baptiste Queru
6df477be18 Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 2012-01-19 14:47:22 -08:00
Jean-Baptiste Queru
a826f9e2c4 Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 2012-01-19 14:47:09 -08:00
Jean-Baptiste Queru
4f367f3387 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 2012-01-19 14:46:54 -08:00
Jean-Baptiste Queru
ba7f0d2a03 Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 2012-01-19 14:46:40 -08:00
Jean-Baptiste Queru
ee4618bc4d Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)" 2012-01-19 14:46:24 -08:00
Steve Block
c6aacce371 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
 2012-01-19 14:45:03 -08:00
Steve Block
a51f0e707f Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) 
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
 2012-01-19 14:44:59 -08:00
Steve Block
933e856150 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) 
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
 2012-01-19 14:44:56 -08:00
Steve Block
1afd5bab4e Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) 
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
 2012-01-19 14:44:50 -08:00
Steve Block
06ade6ae1b Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) 
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
 2012-01-19 14:44:31 -08:00
Jean-Baptiste Queru
c318bbb05e Merge "Rename (IF_)LOG() to (IF_)ALOG()" 2012-01-19 14:41:57 -08:00
Robert Ly
cdc1ea0313 am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 
* commit '4e552533ea049970b54c1cdba5afb7d13496c3c1':
  cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
 2012-01-19 13:32:51 -08:00
Robert Ly
4e552533ea resolved conflicts for merge of b078d942 to ics-mr1 
Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
 2012-01-19 13:25:07 -08:00
The Android Open Source Project
5d0c713a87 Reconcile with ics-mr1-release 
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
 2012-01-19 13:06:50 -08:00
Robert Ly
b078d94291 cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16 
Change-Id: I8bd2ba1f0a4f284c52cfd6de817744264d2c50de
 2012-01-19 12:36:06 -08:00
Robert Ly
ab8f1ba0ec am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 
* commit '12310ee801553e63091ce3bda6f07a5be31a473c':
  docs: wifi direct
 2012-01-19 10:43:45 -08:00
Robert Ly
12310ee801 am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 
* commit '9575a1ab5d033248284d59b2a2ae6eda80f79762':
  docs: wifi direct
 2012-01-19 10:41:28 -08:00
Robert Ly
9575a1ab5d Merge "docs: wifi direct" into ics-mr0 2012-01-19 10:38:51 -08:00
The Android Automerger
0e9d65f780 merge in ics-mr1-release history after reset to ics-mr1 2012-01-18 21:17:55 -08:00
Robert Ly
12a1de04ff docs: wifi direct 
Change-Id: I462a90feec29350db6bedea16e03bdd785fa60bb
 2012-01-18 18:38:24 -08:00
Jim Miller
ab9601cdbb am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 
* commit '230a709285abc5dfd92f05d91a8997d52a59d3c7':
  Fix 5863053: Add method to lock screen immediately.
 2012-01-18 16:46:12 -08:00
Jim Miller
230a709285 Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 2012-01-18 16:44:52 -08:00
Eric Laurent
05683c8596 am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 
* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
  AudioFlinger: mix track only when really ready (2)
 2012-01-18 16:08:06 -08:00
Wink Saville
7b6231a44e am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 
* commit 'aba798510129327a046d57844381382fb1faa3ba':
  Use new preferredAPN URI avoiding onApnChanged() call with self-change
 2012-01-18 16:05:43 -08:00
Eric Laurent
db2e716359 Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 2012-01-18 16:05:31 -08:00
Wink Saville
aba7985101 Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 2012-01-18 16:03:24 -08:00
Adam Powell
a6a0d134eb am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 
* commit '04f3848986efda8cf006f575d2e4990f120a1bc8':
  Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
 2012-01-18 14:49:30 -08:00
Adam Powell
04f3848986 Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 2012-01-18 14:47:20 -08:00
Robert Ly
c891c6eff7 am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1 
* commit '013dbcf0783f55efbb75e6c2794478c27d172c8c':
  docs: adding rs api docs
 2012-01-18 13:19:52 -08:00
Robert Ly
43fda84e91 am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 
* commit '6ad9ea7deb669eca68c58f001c935255c3294cfe':
  update overview page for rs api docs to open iframe links in parent
 2012-01-18 13:19:50 -08:00
Robert Ly
013dbcf078 Merge "docs: adding rs api docs" into ics-mr1 2012-01-18 13:18:11 -08:00
Robert Ly
6ad9ea7deb Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 2012-01-18 13:17:51 -08:00
Joe Fernandez
58f9c3da34 am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 
* commit 'dd41d360eac45ceae92963ed3f100f1c39dd5db2':
  docs: Android API 15 SDK r2 Release Notes
 2012-01-18 12:35:30 -08:00
Joe Fernandez
dd41d360ea Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 2012-01-18 12:33:45 -08:00
Eric Laurent
71c4496a97 AudioFlinger: mix track only when really ready (2) 
This problem due to the way audio buffers are mixed when
low power mode is active was addressed by commits 19ddf0eb
and 8a04fe03 but only partially. As a matter of fact, when more
than one audio track is playing, the problem is still present.
This is most noticeable when playing music with screen off
and a notification or navigation instruction is played: in this case,
the music or notification is likely to skip.

The fix consists in declaring the mixer ready if all active tracks
are ready. Previous behavior was to declare ready if at least one track was
ready. To avoid that one application failing to fill the track buffer blocks other
tracks indefinitely, this condition is respected only if the mixer was ready
in the previous round.

Issue 5799167.

Change-Id: Iabd4ca08d3d45f563d9824c8a03c2c68a43ae179
 2012-01-18 12:27:38 -08:00