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

64894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
699ed80038 Merge "Add cut and paste to ContentEditable." 2012-01-23 07:30:26 -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
02d37b9731 resolved conflicts for merge of 892d11f4 to master 
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
 2012-01-20 18:42:07 -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
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
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
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
152e17367e am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'db2b39300a8f763cf2d0c9808deb86db87d5492c':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-20 16:35:20 -08:00
Jean-Baptiste Queru
d4e936bf93 am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit 'dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-20 16:32:45 -08:00
Jim Miller
f65b53132b Fix 5797764: Increase lock screen's thread priority 
This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND
to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that
might stall lock screen when the screen turns on.

Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
 2012-01-20 16:31:05 -08:00
Jean-Baptiste Queru
20a34b52ca am a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit 'a1e873975704814416ee4d5023bf0740ec195ec0':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-20 16:30:21 -08:00
Jean-Baptiste Queru
62a89549b7 am d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc 
* commit 'd6b5584b67f8a2f3d8ea20d748652673d5761e33':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
 2012-01-20 16:28:04 -08:00
Jean-Baptiste Queru
da535e7cf8 am fd266b36: (-s ours) am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 
* commit 'fd266b36826aa6dd8cd3fa00c159a094423899fb':
  Rename (IF_)LOG() to (IF_)ALOG()
 2012-01-20 16:25:45 -08:00
Justin Ho
d1e83e4da8 am abc90a7b: (-s ours) am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 
* commit 'abc90a7b48b058379a50a426bd0d2769ac7229b6':
  DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"
 2012-01-20 16:23:03 -08:00
Jeff Brown
8bef9cb6b7 Merge "Delete dead code." 2012-01-20 16:20:24 -08:00
Jeff Brown
bd4c9f1302 Delete dead code. 
This API has never been used or exposed, time for it to go away.

Change-Id: Ie199ed0731d0a620d6608b2adbea1083f87276cd
 2012-01-20 16:18:46 -08:00
The Android Automerger
dafa237fb9 merge in ics-mr1-release history after reset to ics-mr1 2012-01-20 16:12:47 -08:00
Wink Saville
18798131c6 Merge "Additional logging information for Card Application Toolkit/SIM Toolkit" 2012-01-20 15:56:56 -08:00
Robert Ly
96d58cf758 am cdc1ea03: am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 
* commit 'cdc1ea03130763963fe6c179ed1f5ec14d6c7750':
  cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
 2012-01-20 15:52:32 -08:00
The Android Open Source Project
9ace027a27 am 5d0c713a: Reconcile with ics-mr1-release 
* commit '5d0c713a87e9fd3cc7a775092aef9fc1194c7440':
 2012-01-20 15:52:27 -08:00
Robert Ly
a551feefa5 am ab8f1ba0: am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 
* commit 'ab8f1ba0ec9d66db2f653b08f4caa24a27b3a996':
  docs: wifi direct
 2012-01-20 15:52:07 -08:00
Wink Saville
ea7527eca9 Additional logging information for Card Application Toolkit/SIM Toolkit 
Add an optional explanation field and toString to ResultException
Add toString to CommandDetails.
Add add a few more log statements on error paths.

Bug: 5852715
Change-Id: I8594178002a67798aa3fb38ce1ee15c1a41f1854
 2012-01-20 15:49:36 -08:00
Jim Miller
d3fe9abfb9 am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 
* commit 'ab9601cdbb95ae94088750eff9a926a572c1a4d6':
  Fix 5863053: Add method to lock screen immediately.
 2012-01-20 15:48:21 -08:00
Jim Miller
b1c7785c11 am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1 
* commit 'eaa11a723150f1ea79446d7ba4bf77eb47b73337':
  Fix 5797764: Increase lock screen's thread priority
 2012-01-20 15:26:42 -08:00
Jim Miller
eaa11a7231 Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1 2012-01-20 15:24:20 -08:00
Glenn Kasten
865534a0e3 Merge "Fix warning for redundant typedef" 2012-01-20 15:06:01 -08:00
Justin Ho
e46f869629 am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 
* commit 'b09f6f96e3583da320b69486869bc98fd463735e':
  Update WiMAX assets to match new style Bug: 5724605
 2012-01-20 14:50:30 -08:00
Justin Ho
b09f6f96e3 Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 2012-01-20 14:48:51 -08:00
Justin Ho
f87da6e846 Update WiMAX assets to match new style 
Bug: 5724605

Change-Id: Iab24c3e5aad3af38d5ba3a5a8f383c79270bdea3
 2012-01-20 14:47:26 -08:00
Andy McFadden
2f36229db8 Use Map.Entry, not HashMap.Entry 
Map.Entry is the defined return value from entrySet().  HashMap.Entry
shouldn't be used directly.

Change-Id: Ia21598c6a73fe7eb22179ce114095f779c903084
 2012-01-20 14:43:38 -08:00
Jim Miller
6d6a70a337 Fix 5797764: Increase lock screen's thread priority 
This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND
to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that
might stall lock screen when the screen turns on.

Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
 2012-01-20 14:41:55 -08:00
Glenn Kasten
0a204ed0f5 Use audio_format_t consistently, continued 
Was int or uint32_t.

When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.

Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.

Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
 2012-01-20 14:41:34 -08:00
Daniel Sandler
aaa7b7728f am 639ed754: Hide mobile RSSI on devices without mobile data. 
* commit '639ed754bba866d2a47ef7ca58e56806b546b149':
  Hide mobile RSSI on devices without mobile data.
 2012-01-20 14:40:26 -08:00
Daniel Sandler
639ed754bb Hide mobile RSSI on devices without mobile data. 
Also fixes some minor layout glitches along that row of
icons (Bluetooth vertical alignment & spacing, battery text
width, inter-icon padding).

Bug: 5895226
Change-Id: I303c2899bf21ddb7e28914d8fb36efd7090ac5e2
 2012-01-20 14:37:54 -08:00
Robert Greenwalt
2772143eff Merge "Stop using shared DUN APN when tethering stops." 2012-01-20 14:35:41 -08:00
Justin Ho
ffb0c0b3ca am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1 
* commit '70e21c927afeff05d8f26e9df2f36785ca19fdfd':
  New out-of-service RSSI.
 2012-01-20 14:35:09 -08:00
Justin Ho
70e21c927a Merge "New out-of-service RSSI." into ics-mr1 2012-01-20 14:33:07 -08:00
Eino-Ville Talvala
59734cb7ca Merge "Add ANativeWindow timestamp support to camera service." 2012-01-20 14:32:22 -08:00
Robert Greenwalt
67d853b61a Merge "Log netd traffic nicely." 2012-01-20 14:24:15 -08:00
Jeff Brown
1bf599a01e Merge "Initialize SQLite as part of the android runtime." 2012-01-20 14:07:59 -08:00