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

62157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
221096fdd6 am 4c0e0dd2: am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1 
* commit '4c0e0dd29dcce33e7521b11d01d21d9431f3b264':
  Eliminate hw.keyboards system properties.
 2011-11-15 19:43:35 -08:00
Dianne Hackborn
8e56e1f345 am cbcf8259: am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 
* commit 'cbcf8259697d2cb9025657a88e01cbb84be11d70':
  Whoops, need to acquire lock.
 2011-11-15 19:43:32 -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
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
Dianne Hackborn
cdec187a27 Merge "Whoops, need to acquire lock." into ics-mr1 2011-11-15 19:04:11 -08:00
Jean-Michel Trivi
29270da5f7 am 4978c1a5: am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 
* commit '4978c1a5b07782d622ca9e3eedd649a5927d226f':
  Fix 5623252 unlink to death of audio focus client early
 2011-11-15 18:28:39 -08:00
Mathias Agopian
dff37bc674 am bc1b7f04: am c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1 
* commit 'bc1b7f0481f9bfa0e9feff0b43e48f9f171e0c38':
  rework a bit how we manage EGL extensions
 2011-11-15 18:25:30 -08:00
Jim Miller
953b299d36 am 58c6f1b2: am c57bfa4a: Fix 5581164: Add abbreviated localized date strings 
* commit '58c6f1b2e1528cd14bef94ae9c5b922b7751309c':
  Fix 5581164: Add abbreviated localized date strings
 2011-11-15 18:25:12 -08:00
Jim Miller
057d48147a am 8622fb34: am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 
* commit '8622fb34769dc257a319ce8e7dab652312d6c049':
  Fix 5581164: Use abbreviated day in lockscreen
 2011-11-15 18:25:08 -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
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
Steven Ross
f6cf6de27a Merge "No blackscreen when dialog is showing fixes 5511992" 2011-11-15 17:18:39 -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
Glenn Kasten
2c42edf3c0 Merge "Remove obsolete NativeWindow_fromSurfaceTexture" 2011-11-15 15:25:38 -08:00
Tsu Chiang Chuang
6a24bb3ec8 am c558a159: am cce32110: am d5897dc7: fix for build breakage. 
* commit 'c558a15931324f06af23c2c1711b4375e15d45e3':
  fix for build breakage.
 2011-11-15 15:10:00 -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
066d088cce am 390811b8: am b35a21f9: Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1 
* commit '390811b8a4a08703b32d4d36bc6997798b52d341':
  Fix 5602985: Show "Emergency calls only" when device has no SIM.
 2011-11-15 14:59:07 -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
96af5a054d am d3b98329: am d5713179: Merge "Override app requested orientation when docked." into ics-mr1 
* commit 'd3b98329636ad089bb0b14cefa4b49d32e5ec678':
  Override app requested orientation when docked.
 2011-11-15 14:51:08 -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
9864e0d81f am d9070a08: am 5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1 
* commit 'd9070a08807ee119d9d73052cc1ad1f1b29eb13d':
  Improve low memory dropbox reporting.
 2011-11-15 14:44:54 -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
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
Jeff Brown
78137d7799 Merge "Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN." 2011-11-15 13:52:47 -08:00
Jeff Brown
43d9e24853 Merge "POWER key is always a wake key." 2011-11-15 13:39:56 -08:00
Mathias Agopian
1fea891f00 am 556a406c: am 3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 
* commit '556a406cf4dd8a7faa318e0d522d899f8b9da7dc':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
 2011-11-15 13:11:19 -08:00
Mathias Agopian
d6ae2ceedf am a0d32c4d: am 6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1 
* commit 'a0d32c4d094704fd6f4ccd3cba297a7c7d2f38fe':
  fix crash when validating an invalid EGL objects
 2011-11-15 13:11:17 -08:00
Winson Chung
92c2fbd704 am 9ebb030a: am e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1 
* commit '9ebb030ad9eeb94bdf9e15b7a3f55d9792dda96b':
  Defer adding large icon until when we compose the final notification. (Bug 5566846)
 2011-11-15 13:11:14 -08:00
Danielle Millett
d296b16762 am 8b6b92ea: (-s ours) am 49000016: am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0 
* commit '8b6b92ea5e257cd9d5799b74f64e7e1cc1ca3ddc':
  DO NOT MERGE cherry picking from MR0 cl 148223
 2011-11-15 13:11:08 -08:00
Eric Fischer
0988cddae5 am 66adcedb: (-s ours) am 3524831a: am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '66adcedbc635bbce37a849824d0cefceab810535':
  Import revised translations.  DO NOT MERGE
 2011-11-15 13:10:56 -08:00
Tsu Chiang Chuang
8f62946310 am 06e4a400: am b3f2890a: am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0 
* commit '06e4a40017f1af75ec58d9d942ef0c4ddad20fd2':
  Adding mobile microbenchmark tests.
 2011-11-15 13:07:26 -08:00
Gilles Debunne
6ec455211b am 7bc6600e: am 8a440477: Merge "Clean-up in TextView" into ics-mr1 
* commit '7bc6600e60688ea37ee7f18b82cb16677c0f5e74':
  Clean-up in TextView
 2011-11-15 13:07:14 -08:00
John Reck
a952f8abfd am 6a622c56: am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1 
* commit '6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec':
  Call onScrollChanged when scrolling layers
 2011-11-15 13:07:11 -08:00
Hong Teng
cc6c20f532 am 716747f7: am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 
* commit '716747f7cb29b45e41c2870f12d39095f4ed80c8':
  Fix for issue  5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
 2011-11-15 13:07:07 -08:00
Daniel Sandler
0e02e42140 am 50fb8a29: am ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1 
* commit '50fb8a29f00e4414ef4961c4d2d6afca9ddf1659':
  Bring back the 'more notifications' icon.
 2011-11-15 13:06:59 -08:00
Jean-Michel Trivi
eb80b31b55 am 87597d9c: am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1 
* commit '87597d9ce00691f05703f728c17548df2bbc9cc2':
  Fix 5615747 Don't leak remote control client death handlers
 2011-11-15 13:06:57 -08:00