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

61484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
a962ef2993 am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 
* commit '4c593010dddc6d2972bab87b30bd1b11987a09e1':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
 2011-11-16 09:48:26 -08:00
Fred Chung
d592714d9a am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1 
* commit '15fe377c7cb57c4d758edcfc1d1e53bcf5a0a8bc':
  Bluetooth HDP sample.
 2011-11-16 09:48:20 -08:00
The Android Open Source Project
4dce941ece am 816e68e2: No-op merge from ics-mr0 
* commit '816e68e2fddd56c34f864dc5647801117a51720b':
 2011-11-16 09:48:16 -08:00
Alex Sakhartchouk
4c593010dd Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 2011-11-16 09:40:11 -08:00
Fred Chung
15fe377c7c Merge "Bluetooth HDP sample." into ics-mr1 2011-11-16 09:31:54 -08:00
The Android Open Source Project
816e68e2fd No-op merge from ics-mr0 
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
 2011-11-16 09:28:00 -08:00
The Android Open Source Project
d28bb28e08 Reconcile with ics-factoryrom-2-release 
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
 2011-11-16 08:55:43 -08:00
The Android Open Source Project
c172688d5e am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit 'c7403258528a08ab74f7c29277d0c34ba6edc53d':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-11-16 07:38:11 -08:00
The Android Open Source Project
c740325852 Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
 2011-11-16 07:33:59 -08:00
Jake Hamby
0f2dec5033 am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 
* commit 'bd7836846c1e5d3610ba6c26686674d429a4316c':
  Fix 3GPP SMS send failure for 7-bit national language tables.
 2011-11-15 20:19:34 -08:00
Bill Gruber
df1aba0a9d am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 
* commit 'c7b354810e9caebe1d4c79d8a2e756f3c194e68f':
  IAB Doc Fix: Error in code snippet Bug 5221766
 2011-11-15 20:19:33 -08:00
Adrian Ludwig
7456cf0a12 am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 
* commit 'cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
  Adding new "Security Best Practices" to the html docs.
 2011-11-15 20:19:30 -08:00
James Dong
4e72e2bfc2 am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 
* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
  Document that release() should be called with onPause() and onStop() for media objects
 2011-11-15 20:16:47 -08:00
Jake Hamby
bd7836846c am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 
* commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
  Fix 3GPP SMS send failure for 7-bit national language tables.
 2011-11-15 20:16:12 -08:00
Bill Gruber
c7b354810e am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 
* commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
  IAB Doc Fix: Error in code snippet Bug 5221766
 2011-11-15 20:16:02 -08:00
Adrian Ludwig
cbc96549c9 am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 
* commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816':
  Adding new "Security Best Practices" to the html docs.
 2011-11-15 20:15:57 -08:00
James Dong
4fdc36e6d6 Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 2011-11-15 20:13:03 -08:00
Adam Powell
868933e0e4 am 45f05c95: Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 
* commit '45f05c9580739ffe2d665cec50efb0bb57d757ba':
  Fix bug 5623642 - Status bar background incompatible with some legacy apps
 2011-11-15 19:54:04 -08:00
Adam Powell
45f05c9580 Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 2011-11-15 19:51:56 -08:00
Jeff Brown
4c0e0dd29d am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1 
* commit '3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef':
  Eliminate hw.keyboards system properties.
 2011-11-15 19:19:04 -08:00
Jeff Brown
3e7497b4ec Merge "Eliminate hw.keyboards system properties." into ics-mr1 2011-11-15 19:17:09 -08:00
The Android Automerger
dd701b84aa merge in ics-mr0-release history after reset to ics-mr0 2011-11-15 19:08:44 -08:00
Dianne Hackborn
cbcf825969 am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 
* commit 'cdec187a27b2acc34cd4df26b836b83362527d6a':
  Whoops, need to acquire lock.
 2011-11-15 19:06:20 -08:00
Adam Powell
29ea525d18 Fix bug 5623642 - Status bar background incompatible with some legacy apps 
Give some background protection to custom layouts in legacy notifications.

Pre-HC it was extremely common for apps to hardcode text colors in
layouts. Since this can lead to black text on a dark background in
HC/ICS, give these older apps that target SDK < 11 a light gray
background.

Change-Id: Iab3dea4beb9172b2f9a5cae53991cf952d0c8cde
 2011-11-15 19:04:33 -08:00
Dianne Hackborn
cdec187a27 Merge "Whoops, need to acquire lock." into ics-mr1 2011-11-15 19:04:11 -08:00
Jean-Michel Trivi
4978c1a5b0 am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 
* commit '0ddb0143895b816d4ff5c174b346390e07f26556':
  Fix 5623252 unlink to death of audio focus client early
 2011-11-15 18:21:44 -08:00
Jean-Michel Trivi
0ddb014389 Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 2011-11-15 18:19:34 -08:00
Mathias Agopian
bc1b7f0481 am c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1 
* commit 'c0fa2a3bce40d52c0f1cccd87f8b0816a6faa6a7':
  rework a bit how we manage EGL extensions
 2011-11-15 18:15:18 -08:00
Mathias Agopian
c0fa2a3bce Merge "rework a bit how we manage EGL extensions" into ics-mr1 2011-11-15 18:12:00 -08:00
James Dong
89ca6983eb Document that release() should be called with onPause() and onStop() for media objects 
Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e
related-to-bug: 5616833
 2011-11-15 18:08:06 -08:00
Jeff Brown
1e08fe90df Eliminate hw.keyboards system properties. 
Stop using system properties to publish information about
the key character map path.  Instead, we can retrieve it
on demand by asking the window manager.

It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.

Bug: 5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
 2011-11-15 18:00:10 -08:00
Jean-Michel Trivi
e7edc86853 Fix 5623252 unlink to death of audio focus client early 
When removing an entry in the audio focus stack, don't wait for
 this object's finalizer to unlink to the death of the associated
 client, and unlink right away.
The FocusStackEntry.unlinkToDeath() method is made safe to call
 by catching the exception it can throw inside its body.

Change-Id: Id347a933d72dcb41531adff2854fb00277032cc9
 2011-11-15 17:41:05 -08:00
Jim Miller
58c6f1b2e1 am c57bfa4a: Fix 5581164: Add abbreviated localized date strings 
* commit 'c57bfa4a4bf4c810b5c663df17443463d8192e8f':
  Fix 5581164: Add abbreviated localized date strings
 2011-11-15 16:18:32 -08:00
Dianne Hackborn
7aa6d31240 Whoops, need to acquire lock. 
Also increase time between reports to try to reduce the amount
of redundant spam we get.

Change-Id: Iedd7d743826fffa62ee431073cb7dfb49a00cea0
 2011-11-15 16:12:30 -08:00
Jim Miller
c57bfa4a4b Fix 5581164: Add abbreviated localized date strings 
Change-Id: I041eef02a67980d3b5c2f2fa12eae717c26e35be
 2011-11-15 16:06:37 -08:00
Jim Miller
8622fb3476 am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 
* commit '34a62348be92034a9fb7582e51754224785568dc':
  Fix 5581164: Use abbreviated day in lockscreen
 2011-11-15 15:44:17 -08:00
Jim Miller
34a62348be Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 2011-11-15 15:42:20 -08:00
Tsu Chiang Chuang
c558a15931 am cce32110: am d5897dc7: fix for build breakage. 
* commit 'cce32110e6f42378a76e0eb2495d24b6c8bc8ae7':
  fix for build breakage.
 2011-11-15 15:05:24 -08:00
Tsu Chiang Chuang
cce32110e6 am d5897dc7: fix for build breakage. 
* commit 'd5897dc7985e511c194f839d4b340fed2d63b41c':
  fix for build breakage.
 2011-11-15 15:00:26 -08:00
Jim Miller
390811b8a4 am b35a21f9: Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1 
* commit 'b35a21f987b99cfe90f4c46e0a708703274b8f46':
  Fix 5602985: Show "Emergency calls only" when device has no SIM.
 2011-11-15 14:54:50 -08:00
Jim Miller
b35a21f987 Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1 2011-11-15 14:51:50 -08:00
Jeff Brown
d3b9832963 am d5713179: Merge "Override app requested orientation when docked." into ics-mr1 
* commit 'd5713179a0f68aa47a8cd966abc5324d43414b63':
  Override app requested orientation when docked.
 2011-11-15 14:48:25 -08:00
Jeff Brown
d5713179a0 Merge "Override app requested orientation when docked." into ics-mr1 2011-11-15 14:46:17 -08:00
Dianne Hackborn
d9070a0880 am 5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1 
* commit '5f11d73c918de72368ac5605c50f5fb9ac0457cb':
  Improve low memory dropbox reporting.
 2011-11-15 14:42:11 -08:00
Dianne Hackborn
5f11d73c91 Merge "Improve low memory dropbox reporting." into ics-mr1 2011-11-15 14:39:37 -08:00
Alex Sakhartchouk
38da5086a6 Followup to a bug fix. 
Addtion of synchronized to the methods triggers an API change.
Per council advice, pushing synch block into the function body.

Change-Id: Iaa395d9720bce499259ab750fe97149715e9f271
 2011-11-15 14:21:58 -08:00
Dianne Hackborn
d8c98fee02 Improve low memory dropbox reporting. 
The msg is now constructed to try to bin these reports in
interesting ways.  We'll see.  Also change the tag name from
watchdog to lowmem, since sharkey is kindly taking care of
the back-end to handle this.

Improve how we put processes into low memory states to better
poke things like home and the previous app.

Also clean up some debug output, and add a few new am comment
options for controlling the current debug app.

Change-Id: I562a931a95244a2727bb7a6e1fd80dec259cdae2
 2011-11-15 14:15:58 -08:00
Jeff Brown
dec6cf4f30 Override app requested orientation when docked. 
Applies to docks, lid switch, HDMI and rotation lock.
We always choose a mode that is compatible with the application's
request, so if in a landscape dock, we might override a request
for seascape but we leave requests for portrait alone.

Bug: 5620454
Change-Id: Ib0c4f60f7f9e3aeafaba9c717233a950fccb8af2
 2011-11-15 14:14:02 -08:00
Jake Hamby
7d4046e9b7 Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 2011-11-15 13:34:58 -08:00
Mathias Agopian
556a406cf4 am 3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 
* commit '3aa684ec0d3f70027fa808fb95b096a1613a1ddc':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
 2011-11-15 13:06:08 -08:00