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

65993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy McFadden
3f8a25fc52 am d71b9154: Merge "Don\'t use bootstrap loader directly" 
* commit 'd71b9154daf796a03aebf2d38c60197cf77e0133':
  Don't use bootstrap loader directly
 2012-01-23 12:22:50 -08:00
Andy McFadden
d71b9154da Merge "Don't use bootstrap loader directly" 2012-01-23 12:21:19 -08:00
Bill Gruber
df5e0dd2bd am cf5c78f2: am add87f99: am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1 
* commit 'cf5c78f209a34bae4a049ff2370252be8598d034':
  DevDocs update: Publishing on Market
 2012-01-23 10:44:22 -08:00
The Android Open Source Project
04c699c438 am 8a6b2832: am 961b1df3: Reconcile with ics-mr1-release 
* commit '8a6b2832a954233e74617e1680829c4216ef2737':
  Fix 5797764: Increase lock screen's thread priority
 2012-01-23 10:44:20 -08:00
Bill Gruber
cf5c78f209 am add87f99: am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1 
* commit 'add87f99d9ece26c776abe40297e9a49e08932d9':
  DevDocs update: Publishing on Market
 2012-01-23 10:41:43 -08:00
The Android Open Source Project
8a6b2832a9 am 961b1df3: Reconcile with ics-mr1-release 
* commit '961b1df3fcbf5c441555b69ac52a5aed7f91a94e':
  Fix 5797764: Increase lock screen's thread priority
 2012-01-23 10:41:37 -08:00
Bill Gruber
add87f99d9 am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1 
* commit '5e5b57aef29b33d03965b4dc370cde9a39220adc':
  DevDocs update: Publishing on Market
 2012-01-23 10:23:10 -08:00
Bill Gruber
5e5b57aef2 Merge "DevDocs update: Publishing on Market" into ics-mr1 2012-01-23 10:21:16 -08:00
The Android Open Source Project
961b1df3fc Reconcile with ics-mr1-release 
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
 2012-01-23 10:15:41 -08:00
Andy McFadden
dc7bf5d8bf Don't use bootstrap loader directly 
The VM is allowed to use null to represent the bootstrap class
loader, so attempting to call methods on it is a bad idea.  Use
the system class loader instead.

Change-Id: I9190848945f679d546d5fb30aba10fd27c7e5404
 2012-01-23 09:51:42 -08:00
Andy McFadden
7f2ea934b5 am 30f1312b: Merge "Use Map.Entry, not HashMap.Entry" 
* commit '30f1312b3cb584c14eba60e6809d4eeed5d906bf':
  Use Map.Entry, not HashMap.Entry
 2012-01-23 09:36:02 -08:00
Andy McFadden
30f1312b3c Merge "Use Map.Entry, not HashMap.Entry" 2012-01-23 09:34:17 -08:00
Jim Miller
8021552c6b am 8ffd2ccc: am b1c7785c: am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1 
* commit '8ffd2cccf0f0458b941d2a3c69d30a6ae06fc33b':
  Fix 5797764: Increase lock screen's thread priority
 2012-01-23 09:23:24 -08:00
Justin Ho
19267b1079 am 5691f6a8: am e46f8696: am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 
* commit '5691f6a882528a5a2b622eeed335d256d15a7f05':
  Update WiMAX assets to match new style Bug: 5724605
 2012-01-23 09:23:21 -08:00
Daniel Sandler
3c2fcef9ff am e08c3e15: am aaa7b772: am 639ed754: Hide mobile RSSI on devices without mobile data. 
* commit 'e08c3e152085193a3a87fe8373af1149904642b8':
  Hide mobile RSSI on devices without mobile data.
 2012-01-23 09:23:18 -08:00
Justin Ho
acedb0a078 am 9b4b3787: am ffb0c0b3: am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1 
* commit '9b4b378777e00012449d904f342adc3be09437a7':
  New out-of-service RSSI.
 2012-01-23 09:23:15 -08:00
Jim Miller
8ffd2cccf0 am b1c7785c: am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1 
* commit 'b1c7785c1110e171d3dd3deb259b1caeed0b9da6':
  Fix 5797764: Increase lock screen's thread priority
 2012-01-23 09:18:36 -08:00
Justin Ho
5691f6a882 am e46f8696: am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 
* commit 'e46f869629ef27afb149c771e69dbbefe1135f33':
  Update WiMAX assets to match new style Bug: 5724605
 2012-01-23 09:18:30 -08:00
Daniel Sandler
e08c3e1520 am aaa7b772: am 639ed754: Hide mobile RSSI on devices without mobile data. 
* commit 'aaa7b7728f3ced062273b54e1fc3b9d7d815bdcd':
  Hide mobile RSSI on devices without mobile data.
 2012-01-23 09:18:24 -08:00
Justin Ho
9b4b378777 am ffb0c0b3: am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1 
* commit 'ffb0c0b3ca2f8693a354aad17e21f1419d9f0379':
  New out-of-service RSSI.
 2012-01-23 09:18:20 -08:00
George Mount
c77af3bc8e am 699ed800: Merge "Add cut and paste to ContentEditable." 
* commit '699ed8003877e14c72944461e5143e807e183558':
  Add cut and paste to ContentEditable.
 2012-01-23 07:32:27 -08:00
George Mount
699ed80038 Merge "Add cut and paste to ContentEditable." 2012-01-23 07:30:26 -08:00
Michael Jurka
7c83a34d9e am 5a89672f: Merge "Remove fastInvalidate and setFast* methods" 
* commit '5a89672f3ef0781f0c28e63ee774970340dbb4dd':
  Remove fastInvalidate and setFast* methods
 2012-01-23 07:28:07 -08:00
Michael Jurka
e9bcd1a007 am 5274d6f1: Merge "Improve rapid-fire presses on system bar" 
* commit '5274d6f115e8c3fda053a0fd4b4009ab15790191':
  Improve rapid-fire presses on system bar
 2012-01-23 07:25:47 -08:00
Michael Jurka
5a89672f3e Merge "Remove fastInvalidate and setFast* methods" 2012-01-23 07:24:32 -08:00
Michael Jurka
5274d6f115 Merge "Improve rapid-fire presses on system bar" 2012-01-23 07:23:56 -08:00
Dianne Hackborn
5204f263ce am 02d37b97: resolved conflicts for merge of 892d11f4 to master 
* commit '02d37b9731eaf5d79f9eb395576e030934c37f3b':
  Fix issue #5823276 again: home repaints after full-screen app is exited
 2012-01-20 18:48:25 -08:00
Dianne Hackborn
02d37b9731 resolved conflicts for merge of 892d11f4 to master 
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
 2012-01-20 18:42:07 -08:00
Christopher Tate
962847912d am 65f87ec7: Merge "Fix shared-storage full backup" 
* commit '65f87ec733955455b66ea704e85709189b1cea80':
  Fix shared-storage full backup
 2012-01-20 18:01:10 -08:00
Christopher Tate
65f87ec733 Merge "Fix shared-storage full backup" 2012-01-20 17:59:06 -08:00
Christopher Tate
73d7369e0f Fix shared-storage full backup 
The special shared-storage step was mistakenly writing its data directly
to the USB output pipe rather than to the proper stacked data handling
chain that applies compression and encryption.  Fix this by getting rid
of the custom handling of the shared-storage data, instead folding it
into the normal data handling flow [with a small amount of additional
management because e.g. it doesn't need a "manifest" pseudofile in the
archive stream].

Fixes bug 5897791

Change-Id: I3995b07963334d2f8cce49b247c87d3d3ff93bed
 2012-01-20 17:41:41 -08:00
Glenn Kasten
79f39722b4 am 0f73d75d: Merge "Remove AudioFlinger dependencies on client" 
* commit '0f73d75da069e8af200092c0c6a8487108fdcbfb':
  Remove AudioFlinger dependencies on client
 2012-01-20 17:19:13 -08:00
Glenn Kasten
0f73d75da0 Merge "Remove AudioFlinger dependencies on client" 2012-01-20 17:16:36 -08:00
Glenn Kasten
34f9f8bb83 Remove AudioFlinger dependencies on client 
Change-Id: Ibb591e41a3ca5d7015e2b66b98b8fef5f415fb37
 2012-01-20 17:12:59 -08:00
Guang Zhu
1bc2cbfdd4 am 7a640a09: Merge "Revert "Use port 18000 instead of 8000 for layout tests"" 
* commit '7a640a093639c712ed4e37d06cb86c50d88bd376':
  Revert "Use port 18000 instead of 8000 for layout tests"
 2012-01-20 17:09:09 -08:00
Guang Zhu
7a640a0936 Merge "Revert "Use port 18000 instead of 8000 for layout tests"" 2012-01-20 17:06:42 -08:00
Guang Zhu
d467347d73 Revert "Use port 18000 instead of 8000 for layout tests" 
port 8000 is no longer being occupied, plus this approach never worked 100% because some pages have access to port 8000 hard coded in HTML


This reverts commit e2b9d7f2f027907c7dcdbfb9e99297ff799ce482
 2012-01-20 17:06:11 -08:00
Daniel Sandler
5ec46e7267 am e0e10b41: am a64f899f: am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1 
* commit 'e0e10b41c465a74749dcd1d05d8f4b688fcfdc3c':
  Always show appropriate mobile service label.
 2012-01-20 16:40:58 -08:00
Jeff Brown
f8fa132dec am 2af9ecfd: am 1bc82792: (-s ours) am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 
* commit '2af9ecfd1eb25bcb05e1afbf09412d30cbc3fb42':
  Implement a max time bound for rotation.  (DO NOT MERGE)
 2012-01-20 16:40:55 -08:00
Jeff Brown
809ef4eefd am 8552b4a4: am 06a0fb95: (-s ours) am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 
* commit '8552b4a4b7f08aabd0c66ceba91162b6f4997477':
  Fix a few memory leaks in the input dispatcher.  (DO NOT MERGE)
 2012-01-20 16:40:53 -08:00
The Android Open Source Project
69935351c7 am 32f17ee4: am 288cde7f: Reconcile with ics-mr1-release 
* commit '32f17ee4b77adb937a04265201f589f2073af510':
 2012-01-20 16:40:50 -08:00
Jean-Baptiste Queru
525a8ac4ef am ba4ea763: am ee567e08: am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit 'ba4ea763b5284185348c592e421d4451054df909':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-20 16:40:48 -08:00
Jean-Baptiste Queru
09d157a136 am 1e5b88fb: am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '1e5b88fb4fc52d44ededdb6b98fd7b8f7ee0a87d':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-20 16:40:45 -08:00
Daniel Sandler
e0e10b41c4 am a64f899f: am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1 
* commit 'a64f899fa6159a8839a769d3f107f6c502da58c8':
  Always show appropriate mobile service label.
 2012-01-20 16:38:24 -08:00
Jeff Brown
2af9ecfd1e am 1bc82792: (-s ours) am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 
* commit '1bc82792b87c0aee65c53f84a6d7c6b5031a09bc':
  Implement a max time bound for rotation.  (DO NOT MERGE)
 2012-01-20 16:38:10 -08:00
Jeff Brown
8552b4a4b7 am 06a0fb95: (-s ours) am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 
* commit '06a0fb953ff1c544bdbef2618d20ec1ba551eb6e':
  Fix a few memory leaks in the input dispatcher.  (DO NOT MERGE)
 2012-01-20 16:38:07 -08:00
The Android Open Source Project
32f17ee4b7 am 288cde7f: Reconcile with ics-mr1-release 
* commit '288cde7f0a17f47f7071168f442d19f703947cc9':
 2012-01-20 16:38:02 -08:00
Jean-Baptiste Queru
ba4ea763b5 am ee567e08: am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit 'ee567e08d973c0fad214889e8d980f9bfb535b34':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-20 16:37:52 -08:00
Jean-Baptiste Queru
1e5b88fb4f am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '45470559cd4a499fd5d38cf708f0b531dc081fed':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-20 16:37:49 -08:00
Jean-Baptiste Queru
260b780bfa am 152e1736: am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit '152e17367e1913df55d9953afaabfcfa41c33d01':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-20 16:37:13 -08:00