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

61589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
7919bfb123 Merge "Don't show the submit button when it isn't enabled." into ics-mr1 2011-11-07 10:57:17 -08:00
Brian Colonna
6233fbe5da Fix 5514230: preventing null window token from occurring 
Sometimes the lockscreen view is recreated even though it has already
been created (and therefore Face Unlock is already running).  One
example of this is when the lockscreen momentarily displays in
landscape mode and then corrects itself into portrait mode.

When lockscreen recreates itself, it removes the view and then later
re-adds the view.  During that time the window token is null and may
be passed to Face Unlock when it tries to restart.  The reason this
doesn't happen *every* time the view is recreated is because the
onServiceConnected() callback starts Face Unlock, and usually it
runs after the view is re-added, but sometimes it runs before the view
is re-added, resulting in this bug.

An earlier fix put null-token checking inside of the Face Unlock
service, which prevented crashing but Face Unlock was still unable
to run.  This fix makes the null token case not happen so Face Unlock
can run every time.  It accomplishes this by simply not restarting
Face Unlock until the view has been re-added.

This fix also replaces checking two flags everywhere to see if
Face Unlock is being used and instead uses a single function call.

Change-Id: Ib46f25f2a58ab2e70470337861c25ee81a858873
 2011-11-07 13:53:31 -05:00
Jamie Gennis
9cf8b6eadb EGL: use an in-memory the blob cache 
This change makes the makes the stub EGL_ANDROID_blob_cache callbacks
actually use a BlobCache object.

Bug: 5474671
Change-Id: I5cbaae2dea3aad2fe306c9f57029c3f215a0863a
 2011-11-07 10:48:42 -08:00
Winson Chung
48dd388045 am 19c86cac: Merge "Fixing screenshot border asset." into ics-mr1 
* commit '19c86cacb2f0ba04cc93084ba474662afb17d88f':
  Fixing screenshot border asset.
 2011-11-07 18:24:01 +00:00
Winson Chung
19c86cacb2 Merge "Fixing screenshot border asset." into ics-mr1 2011-11-07 10:20:37 -08:00
Daniel Sandler
4f631bbf97 am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1 
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
 2011-11-07 18:15:30 +00:00
Daniel Sandler
010bb273a5 Merge changes I0da0f04f,I93197665 into ics-mr1 
* changes:
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
 2011-11-07 10:11:52 -08:00
Alex Sakhartchouk
9829cceca1 Merge "Properly passing an unused variable through." 2011-11-07 09:53:28 -08:00
The Android Open Source Project
01b35d7b1c Reconcile with ics-mr1-release 
Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
 2011-11-07 08:30:54 -08:00
The Android Open Source Project
8258c52b82 am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit '064975c27cbca412e682fa152ce00af14027ab4f':
  Fix a leak in Parcel::writeBlob.
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
 2011-11-07 16:28:26 +00:00
The Android Open Source Project
064975c27c Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
 2011-11-07 08:22:56 -08:00
Narayan Kamath
6c07a20285 Fix a bug in the network TTS api. 
bug:5284966
Change-Id: I460bd12c27671ed42681fd4ccad567c08cb8f70f
 2011-11-07 16:19:02 +00:00
Dianne Hackborn
973f8f20c4 am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0 
* commit '6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
  Print out memory info when we get into a low memory situation.
 2011-11-07 15:51:38 +00:00
Mathias Agopian
9e079d8fa0 am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1 
* commit '3f24589edd860618ccf65d6653b002d13810e78b':
  workaround to set the WM refresh rate to 48 Hz for tuna devices only
 2011-11-07 15:51:33 +00:00
Jeff Brown
bd79a9c9f3 am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob. 
* commit '88061d6b38cfb4bf374039846b753a3b21ac61e1':
  Fix a leak in Parcel::writeBlob.
 2011-11-07 15:51:31 +00:00
Steve Block
2abb2abea0 Merge changes If1bdd547,Ie43c16ae,I62b45f8b,I32b7fdc0 
* changes:
  Add tests for the fields of objects in the WebView's Java Bridge.
  Adds a set of basic test for WebView's Java Bridge
  Add tests for returning values from WebView's Java Bridge
  Adds a new test for type coercion in WebView's Java Bridge
 2011-11-07 07:37:53 -08:00
Steve Block
2dc592a4ae Add tests for the fields of objects in the WebView's Java Bridge. 
Bug: 5140673
Change-Id: If1bdd547c09d37bbf6d649f15388352ee76f4887
 2011-11-07 15:34:30 +00:00
Steve Block
f7e26448c3 Adds a set of basic test for WebView's Java Bridge 
Bug: 5140673
Change-Id: Ie43c16aeca9c5982b4ea64e3b54ec1a33c5f7241
 2011-11-07 15:00:43 +00:00
Steve Block
d100cdbcc8 Add tests for returning values from WebView's Java Bridge 
Bug: 5140673
Change-Id: I62b45f8b35be3ce9c76766e39e8867c028f94ac1
 2011-11-07 15:00:39 +00:00
Steve Block
2d803903af Adds a new test for type coercion in WebView's Java Bridge 
This change adds a new directory of tests for the WebView, WebViewTests.

It also provides the first in a set of tests to test WebView's Java Bridge.
Once this set of tests is complete, the Java Bridge test in
packages/apps/Browser will be removed.

Bug: 5140673
Change-Id: I32b7fdc0ac5d2231e6b96ff232d336ad2c0fcaab
 2011-11-07 14:54:51 +00:00
Chih-Chung Chang
b1224ff1c4 Fix 5509346: Resize the thumbnails if it's too large. 
Change-Id: I805f37f22cc745cfbc788f594da704e7e634f122
 2011-11-07 20:34:37 +08:00
Shaopeng Jia
21aff6bd90 Adding two tests to ensure formatNumber is working correctly with 
Polish numbers, both valid and invalid.

Change-Id: I5f3bfc34cd5b88526853c0da0aa299a77e8f1901
 2011-11-07 11:30:14 +01:00
The Android Automerger
5951f7af86 merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:46:10 -08:00
The Android Automerger
ceb6cdf063 merge in ics-mr0-release history after reset to ics-mr0 2011-11-06 06:28:19 -08:00
Romain Guy
9039e43ab1 am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1 
* commit '2ccc47b89868d4f39683e0e2bd057ce95d7d1217':
  Memory optimizations for libhwui Bug #5566149
 2011-11-05 19:33:49 +00:00
Robert Greenwalt
08d153fb8e am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
  Start using IP tool for advanced routing.
 2011-11-05 19:33:46 +00:00
Jamie Gennis
aaa0336f88 am 2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1 
* commit '2ab7ec90e4a6f21bee7cbfebbd751d32d4cf9e03':
  EGL: Add stubs for EGL_ANDROID_blob_cache
 2011-11-05 19:33:42 +00:00
Dianne Hackborn
941733e7d1 am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0 
* commit '960177ae394a466d765a2dc171e136f9fdea06b6':
  DO NOT MERGE.  Integrate: Include showmap output in bug report.
 2011-11-05 19:33:39 +00:00
Dave Burke
4fa8f7f4ac am a3af4c94: am 3ee47188: Frame rate to 48 fps 
* commit 'a3af4c94dfbf3336004a38011f6453bfcd7fd638':
  Frame rate to 48 fps
 2011-11-05 19:33:33 +00:00
Mathias Agopian
5f43c96a71 am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1 
* commit '515c6b44d57b829792267594a355cd2831582197':
  fix an issue where SensorService could request an invalid sensor delay
 2011-11-05 19:33:18 +00:00
Irfan Sheriff
a4e1014d36 am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1 
* commit '45a04db3f95755829b24043d30d7da7182b4f33b':
  Avoid quick shutdown after a  driver start
 2011-11-05 19:33:16 +00:00
Narayan Kamath
928f97b186 am eaa17b76: Merge "Add an API for querying / enabling network TTS support." into ics-mr1 
* commit 'eaa17b768fcd2624cb5d46a76ade24ebe7e56957':
  Add an API for querying / enabling network TTS support.
 2011-11-05 19:33:11 +00:00
Chet Haase
2a639347ae resolved conflicts for merge of aa4d2f69 to master 
Change-Id: Iadb63ecf52d8bd2911276fa3db55a43c9c378620
 2011-11-05 12:01:51 -07:00
Dianne Hackborn
3f3e8f0c37 am 55fe6763: Merge "Include showmap output in bug report." into ics-mr1 
* commit '55fe6763d29cb0e899b2541497f4d8bc1bbd14ba':
  Include showmap output in bug report.
 2011-11-05 16:40:10 +00:00
Amith Yamasani
d291558b56 am d69c203c: Merge "Close suggestions cursor when SearchView is detached." into ics-mr1 
* commit 'd69c203cd48c1d0d3be92fb0396656ee8adc1185':
  Close suggestions cursor when SearchView is detached.
 2011-11-05 16:40:07 +00:00
Flavio Lerda
2e428814cc am 8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics-mr1 
* commit '8f7d88cc67e1c89c960b932ceafc60d378aa2ad6':
  Add a query parameter to look-up a SIP address.
 2011-11-05 16:40:01 +00:00
Eric Laurent
3a8f6bedc3 resolved conflicts for merge of 914972be to master 
Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
 2011-11-05 09:32:35 -07:00
Eric Laurent
9162e6b2f9 Merge "resolved conflicts for merge of 79178b8b to master" 2011-11-05 08:56:06 -07:00
Eric Laurent
f434fb50a6 resolved conflicts for merge of 79178b8b to master 
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
 2011-11-05 08:52:20 -07:00
Dianne Hackborn
6581043a44 am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0 
* commit '7311bd4b709750384b058d8e988e2e983c97b3f2':
  Print out memory info when we get into a low memory situation.
 2011-11-05 07:34:03 +00:00
The Android Automerger
b655ee47c5 merge in ics-mr0-release history after reset to ics-mr0 2011-11-05 00:33:21 -07:00
Dianne Hackborn
7311bd4b70 Merge "Print out memory info when we get into a low memory situation." into ics-mr0 2011-11-05 00:31:17 -07:00
Jeff Brown
829a6f208c Fix a leak in Parcel::writeBlob. 
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in.  It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.

Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
 2011-11-04 22:16:39 -07:00
Dianne Hackborn
04d6db380f Print out memory info when we get into a low memory situation. 
Change-Id: I2c8b8847a0f38135d8bf9ff9b7198517c3b0262e
 2011-11-04 20:07:24 -07:00
Jeff Brown
06ab9875c1 Merge "Slight change to the unwinder API." 2011-11-04 20:06:42 -07:00
Mathias Agopian
3f24589edd Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1 2011-11-04 19:57:59 -07:00
Jeff Brown
88061d6b38 am 5462bc63: Fix a leak in Parcel::writeBlob. 
* commit '5462bc6318b4b70e7a58c66994e2bd79f59d9739':
  Fix a leak in Parcel::writeBlob.
 2011-11-05 02:35:57 +00:00
Jeff Brown
5462bc6318 Fix a leak in Parcel::writeBlob. 
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in.  It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.

Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
 2011-11-04 19:26:03 -07:00
Mathias Agopian
222357f33a workaround to set the WM refresh rate to 48 Hz for tuna devices only 
this is TEMPORARY until we can do this properly.

Bug: 5572464
Change-Id: I6537706d636a83a4a50e2900d6b829dd89b6f245
 2011-11-04 18:46:11 -07:00
Glenn Kasten
f330986fa8 Bug 5478024 drop after decode if can't drop before 
Change-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371
 2011-11-04 18:05:35 -07:00