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

66183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
970b91220c am 18798131: Merge "Additional logging information for Card Application Toolkit/SIM Toolkit" 
* commit '18798131c611301a38e194deac91ff35278da9cc':
  Additional logging information for Card Application Toolkit/SIM Toolkit
 2012-01-20 15:59:45 -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
c91a61fc53 am 96d58cf7: am cdc1ea03: am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 
* commit '96d58cf758c83f426f52259696ead4d6d9358072':
  cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
 2012-01-20 15:56:55 -08:00
The Android Open Source Project
84df91f3be am 9ace027a: am 5d0c713a: Reconcile with ics-mr1-release 
* commit '9ace027a27f98380f69920d8ede4a6a70eff5946':
 2012-01-20 15:56:52 -08:00
Robert Ly
9236f89c44 am a551feef: am ab8f1ba0: am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 
* commit 'a551feefa57ea28146a2493778815f5402eb6e58':
  docs: wifi direct
 2012-01-20 15:56:44 -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
Jim Miller
f86d65cbea am d3fe9abf: am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 
* commit 'd3fe9abfb9a6a21a18abde6a98dceb423c04ebef':
  Fix 5863053: Add method to lock screen immediately.
 2012-01-20 15:51:02 -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
3f6ecda58c am 865534a0: Merge "Fix warning for redundant typedef" 
* commit '865534a0e30982b0e669006509b9590fad129295':
  Fix warning for redundant typedef
 2012-01-20 15:08:00 -08:00
Glenn Kasten
865534a0e3 Merge "Fix warning for redundant typedef" 2012-01-20 15:06:01 -08:00
Alex Sakhartchouk
daff64dfb7 Merge "Refactoring out some params code." into graphics-dev 2012-01-20 15:05:22 -08:00
Alex Sakhartchouk
3c5ebd1e8d Refactoring out some params code. 
Change-Id: Ie4268faeefd6858057c242bea98aceb3800cef75
 2012-01-20 15:02:00 -08:00
Glenn Kasten
7857deede5 am 0a204ed0: Use audio_format_t consistently, continued 
* commit '0a204ed0f58a9baaac5630864cd75495486c6cbe':
  Use audio_format_t consistently, continued
 2012-01-20 14:52:03 -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
6b25576348 am 2772143e: Merge "Stop using shared DUN APN when tethering stops." 
* commit '2772143eff6a69ae7182e0c2628809d8dbd8d355':
  Stop using shared DUN APN when tethering stops.
 2012-01-20 14:37:24 -08:00
Robert Greenwalt
2772143eff Merge "Stop using shared DUN APN when tethering stops." 2012-01-20 14:35:41 -08:00
Eino-Ville Talvala
80dcd183c9 am 59734cb7: Merge "Add ANativeWindow timestamp support to camera service." 
* commit '59734cb7cae326d0c1f06de59ad1768cacaf7a6d':
  Add ANativeWindow timestamp support to camera service.
 2012-01-20 14:35:16 -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
6f2279e2c1 am 67d853b6: Merge "Log netd traffic nicely." 
* commit '67d853b61a2d077d51545c480206b1873c74ea46':
  Log netd traffic nicely.
 2012-01-20 14:27:03 -08:00
Robert Greenwalt
67d853b61a Merge "Log netd traffic nicely." 2012-01-20 14:24:15 -08:00
Alex Sakhartchouk
3e60290d96 Merge "Many optimizations of rendering path. Adding ability to split up per shader and per object updates. Added cubemaps as scenegraph objects." into graphics-dev 2012-01-20 14:22:48 -08:00
Alex Sakhartchouk
4fd35d8f49 Many optimizations of rendering path. 
Adding ability to split up per shader and per object updates.
Added cubemaps as scenegraph objects.

Change-Id: I7877658c35ad1407444e1e092c7634b46d745691
 2012-01-20 14:16:50 -08:00
Jeff Brown
ab42f56f4c am 1bf599a0: Merge "Initialize SQLite as part of the android runtime." 
* commit '1bf599a01e7ad720150d8cc12416ba67bebd74c9':
  Initialize SQLite as part of the android runtime.
 2012-01-20 14:14:22 -08:00
Gilles Debunne
5748a9cd22 am 2f9510ca: Merge "Touch moves cursor in text refactored" 
* commit '2f9510ca50b0fd2925bc7e349f76136ed403a386':
  Touch moves cursor in text refactored
 2012-01-20 14:14:19 -08:00
Andreas Huber
1bc608c12d am e8bb6fef: Merge "Starhub RTSP apparently does not establish time on all tracks" 
* commit 'e8bb6fef58dfa94346d8a72c1eb9046d5d1f2da1':
  Starhub RTSP apparently does not establish time on all tracks
 2012-01-20 14:14:15 -08:00
Glenn Kasten
f001ff5f7a am c79e4139: Merge "Fix typos in string constants" 
* commit 'c79e413911d48ebf14621304655029f6cd2c7959':
  Fix typos in string constants
 2012-01-20 14:14:07 -08:00
Glenn Kasten
536035dac5 am 15f51cce: Merge "Remove dead file include/media/thread_init.h" 
* commit '15f51ccee1fb4aaf9296998e68156903f0657098':
  Remove dead file include/media/thread_init.h
 2012-01-20 14:14:04 -08:00
Glenn Kasten
d375394752 am ea46649a: Merge "Remove redundant get()" 
* commit 'ea46649a1cce7447ece812e60168f2bb3db47122':
  Remove redundant get()
 2012-01-20 14:14:02 -08:00
Glenn Kasten
b4ae95519a am 5ecff094: Merge "Move memcpy_to_i16_from_u8 to audio_utils" 
* commit '5ecff094f4df499f997bc9406c6e1a76a899aa12':
  Move memcpy_to_i16_from_u8 to audio_utils
 2012-01-20 14:13:41 -08:00
Jeff Brown
1bf599a01e Merge "Initialize SQLite as part of the android runtime." 2012-01-20 14:07:59 -08:00
Gilles Debunne
822b8f0cfa Double tap to select enabled on suggestions 
Using a runnable to schedule the action, interrupted by any other
touch event, enabling a catch of a double tap to trigger text selection
instead.

Change-Id: I21f8b9fdfad0036d6970f5dbfe6d72dd3eff35a1
 2012-01-20 14:07:19 -08:00
Daniel Sandler
e3b86f2137 New out-of-service RSSI. 
This creates (well, restores, since we had this until
Honeycomb) a user-visible state for "no service" that is
distinguishable from "very very weak service" (less than one
bar).

Bug: 5775939
Change-Id: Idd08b1a9411d5d94e4d7a97fa7f3ffd92b8113a6
 2012-01-20 14:06:40 -08:00
Gilles Debunne
2f9510ca50 Merge "Touch moves cursor in text refactored" 2012-01-20 14:06:19 -08:00
Andreas Huber
e8bb6fef58 Merge "Starhub RTSP apparently does not establish time on all tracks" 2012-01-20 13:43:39 -08:00
Andreas Huber
475334f7bd Starhub RTSP apparently does not establish time on all tracks 
i.e. the "SR" RTCP packet is sent for only one of the two tracks.

fake timestamps if that's the case, previously we'd only fake timestamps
if we didn't receive _any_ "SR" packets.

Change-Id: Id63d4940d453ba6c04c62e02ab9a0ad843936bc1
related-to-bug: 5669027
 2012-01-20 13:30:03 -08:00