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

17656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
2d41cb9433 fix [2324665] texture leak in surfaceflinger when using camera 2010-01-21 16:29:34 -08:00
Dianne Hackborn
4141d035c7 Don't crash when there is no admin. 2010-01-21 16:29:00 -08:00
Mathias Agopian
a1a1798599 fix a texture leak introduced recently. 
create the texture name once and for all for a given BufferSource
and make sure to recreate it when we're forced to delete the texture.
 2010-01-21 16:27:30 -08:00
Doug Zongker
37f3ddb60b Merge "relocate GoogleLoginService" 2010-01-21 16:10:58 -08:00
Kenny Root
3a19833750 Multiple asset adding in one shot for AssetManager 
Add a hidden convenience method to allow adding multiple assets
to an AssetManager at once.

Change-Id: I56753a85904a2c8e9a405cba2ea3cb85ec40e1cc
 2010-01-21 16:09:40 -08:00
Yu Shan Emily Lau
47f1d4d509 am b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair 
Merge commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp

* commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f':
  Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
 2010-01-21 15:14:36 -08:00
Eric Fischer
ad0e536355 am 50adb167: Pull in "emergency calls only" translations. 
Merge commit '50adb167534889421dc0d7cfc7d3bf663c03f01c' into eclair-plus-aosp

* commit '50adb167534889421dc0d7cfc7d3bf663c03f01c':
  Pull in "emergency calls only" translations.
 2010-01-21 15:14:30 -08:00
Yu Shan Emily Lau
b1780474e6 Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair 2010-01-21 15:07:51 -08:00
Wink Saville
051ab62334 Merge "Fix build, GsmServiceStateTracker was using old EventLog API." 2010-01-21 15:00:12 -08:00
Jim Miller
11b019d07f Fix 2385283: Use device-specific salt when generating hashes for lock passwords. 2010-01-21 14:53:22 -08:00
Doug Zongker
0a2fb2174e relocate GoogleLoginService 
Change-Id: I79f4ff658ab136adcc54c432db76f34d2de5f6ac
 2010-01-21 14:36:17 -08:00
Grace Kloba
1b810a5706 am 88196464: (-s ours) am 4d69ac66: Merge "DO NOT MERGE" into eclair 
Merge commit '88196464e91dd533f2dd28a02f55b7e4801eead0'

* commit '88196464e91dd533f2dd28a02f55b7e4801eead0':
  DO NOT MERGE
 2010-01-21 14:32:01 -08:00
Grace Kloba
15e26dca2b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2010-01-21 14:31:45 -08:00
Grace Kloba
ee20cbf30a am c8cab725: (-s ours) am d1019a99: Merge "DO NOT MERGE" into eclair 
Merge commit 'c8cab72521781091e87049861c4b25fb19197ea4'

* commit 'c8cab72521781091e87049861c4b25fb19197ea4':
  DO NOT MERGE
 2010-01-21 14:31:33 -08:00
Xavier Ducrohet
18d21ef83e am 20cc5570: am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair 
Merge commit '20cc55703348827fbd80ff0410777a537f01e10e'

* commit '20cc55703348827fbd80ff0410777a537f01e10e':
  ADT/Layoutlib: improved gradient drawing for perf.
 2010-01-21 14:31:11 -08:00
Dianne Hackborn
df83afaf29 More device policy manager / admin work. 
Update API with some new features, re-arrange how you check for valid
passwords, and start hooking up the back-end implementation.
 2010-01-21 14:30:57 -08:00
Xavier Ducrohet
beb0993c6a am 38fa9eee: am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that. 
Merge commit '38fa9eee9324b2355f28372e80dba12c1d7cc105'

* commit '38fa9eee9324b2355f28372e80dba12c1d7cc105':
  ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
 2010-01-21 14:30:48 -08:00
Xavier Ducrohet
900399f3e8 am 895c92a4: am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair 
Merge commit '895c92a44b8bcf0aec7066c061293cafe12a76c2'

* commit '895c92a44b8bcf0aec7066c061293cafe12a76c2':
  ADT/Layoutlib: always use custom gradient (java) Paint.
 2010-01-21 14:30:17 -08:00
Roman Nurik
eca7f02f52 am b8c564d0: am 6a739ea8: Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair 
Merge commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef'

* commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef':
  Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
 2010-01-21 14:29:26 -08:00
Xavier Ducrohet
7fa53aa5df am 31ef2e77: am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair 
Merge commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1'

* commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1':
  ADT/Layout: support for 3+ color in linear gradients
 2010-01-21 14:29:02 -08:00
Wink Saville
ac376f4854 Fix build, GsmServiceStateTracker was using old EventLog API. 
Change-Id: Ib202d0ebbbb11c0ccad40445426c0c3704eb30b5
 2010-01-21 14:15:05 -08:00
John Wang
97fdd0aba9 am 7f70998d: Merge "Add Emergency Calls Only String." into eclair 
Merge commit '7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp

* commit '7f70998dec6d7db850373b7e75677ecf72904878':
  Add Emergency Calls Only String.
 2010-01-21 14:06:35 -08:00
Eric Fischer
50adb16753 Pull in "emergency calls only" translations. 2010-01-21 13:52:09 -08:00
John Wang
7f70998dec Merge "Add Emergency Calls Only String." into eclair 2010-01-21 13:38:32 -08:00
Leon Scroggins
04ce08f34e Merge "Create a common method for updating the title of a download from the filename." 2010-01-21 13:29:32 -08:00
Leon Scroggins
fe79ef44fe Create a common method for updating the title of a download from the filename. 
This method will be used by the DownloadProvider and the BrowserDownloadPage.
 2010-01-21 16:19:41 -05:00
Fred Quintana
44037e6c41 initialize sync adapters that get installed while the system is running 
bug http://b/issue?id=2360782
 2010-01-21 13:14:49 -08:00
John Wang
88a195b58a am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair 
Merge commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af'

* commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af':
  Add Event log for RAT switch.
 2010-01-21 12:47:13 -08:00
John Wang
f936745f5a Add Emergency Calls Only String. 
Prepare strings for bug 2352094.

The string is the same as the settings.R.string.radioInfo_service_emergency,
so use the same msgid and translations.
 2010-01-21 12:46:01 -08:00
Yu Shan Emily Lau
f465dc0367 Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player. 2010-01-21 12:38:02 -08:00
Wei Huang
29bc7270ec am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair 
Merge commit '495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp

* commit '495bae67ff7df4a11325a4cc1d8af288f82128fe':
  fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
 2010-01-21 12:28:08 -08:00
Wei Huang
495bae67ff Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair 2010-01-21 12:21:11 -08:00
Wei Huang
22149f3d4e fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget. 
- ContactHeaderWidget has cascading async queries, which weren't cancelled if a new query for a different phone number is started.
If the new query fails to find a corresponding contact, the old async queries from the previous number could end up setting the
contact name and photo to the wrong contact.

I tested this by calling

  ContactHeaderWidget.bindFromPhoneNumber(number1);
  ContactHeaderWidget.bindFromPhoneNumber(number2);

where number1 has a corresponding contact in the databse, and number2 doesn't. At the end of these 2 calls, the ContactHeaderWidget
would display the contact info for number1.

- also found a bug in AsyncQueryHandler.cancelOperation(), which doesn't reliably cancel the previous query. In ContactHeaderWidget's
case, we really depend on the cancelling to work. So work around this bug by resetting mAsyncQueryHandler when we need to do a
new lookup/query. When the old query result is passed back in the callback, discard the result if the QueryHandler is not the same
as mAsyncQueryHandler.

Change-Id: Ice79e77f787af03400e080cbd58162a91838181f
 2010-01-21 12:06:43 -08:00
Derek Sollenberger
f5831d4303 Removing unused parameter from NP_Initialize. 2010-01-21 15:06:19 -05:00
Justin Mattson
ef340357ce NEW_API: Declare an ACTION_SEARCH_SETTINGS constant in android.provider.Settings so that apps can cause this system setting group to be opened directly. 
The Settings app already responds to this action it just was not exposed in the platform API.
 2010-01-21 11:40:58 -08:00
Amith Yamasani
2fa6b52c2b Merge "Workaround for a database update callback that claims that the data doesn't exist." 2010-01-21 11:22:01 -08:00
The Android Open Source Project
176a88ff14 merge from open-source master 2010-01-21 11:21:25 -08:00
Ying Wang
6efe03b19e am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair 
Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp

* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
  Find layout classes in all "layout-*" dirs.
 2010-01-21 11:12:29 -08:00
Ying Wang
6f9e2c648c Merge "Find layout classes in all "layout-*" dirs." into eclair 2010-01-21 11:07:14 -08:00
Andreas Huber
48da344cf0 Merge "Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup." 2010-01-21 10:44:54 -08:00
Andreas Huber
84a93a5674 Merge "Special-case .wmv and .wma metadata retrieval and playback to use PV if available." 2010-01-21 10:44:47 -08:00
Andreas Huber
2cb5c9c633 Special-case .wmv and .wma metadata retrieval and playback to use PV if available. 
related-to-bug: 2381874
 2010-01-21 10:31:05 -08:00
Vasu Nori
589eb9c5e1 Merge "caching PRAGMA sql statements caused cts-tests failures." 2010-01-21 10:29:22 -08:00
Andreas Huber
a3f4384ce8 Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup. 
related-to-bug: 2355922
 2010-01-21 10:28:45 -08:00
Robert Greenwalt
1f2f23bd16 am 9fdf82e0: Merge "Try to switch to another default net on connection failure." into eclair 
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp

* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
  Try to switch to another default net on connection failure.
 2010-01-21 10:05:13 -08:00
Amith Yamasani
58bb107f2a Workaround for a database update callback that claims that the data doesn't exist. 
It's probably some intermediate state when updating the volumes that's causing
the row to be missing.
 2010-01-21 09:58:01 -08:00
Robert Greenwalt
9fdf82e080 Merge "Try to switch to another default net on connection failure." into eclair 2010-01-21 09:57:46 -08:00
Derek Sollenberger
72666bac20 am 1f7747ad: am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode. 
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883'

* commit '1f7747adb6a79317f4bd52fb78b3c567dd203883':
  Resize the WebView when the soft-keyboard appears in landscape mode.
 2010-01-21 08:39:15 -08:00
Derek Sollenberger
1f7747adb6 am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode. 
Merge commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1' into eclair-mr2-plus-aosp

* commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1':
  Resize the WebView when the soft-keyboard appears in landscape mode.
 2010-01-21 08:29:33 -08:00
Mike Lockwood
80ffe5d2fe Merge "Implement Notification.DEFAULT_LIGHTS flag." 2010-01-21 08:18:15 -08:00