OSDN Git Service
The Android Open Source Project [Wed, 27 Jul 2011 17:42:40 +0000 (10:42 -0700)]
Reconcile with gingerbread-mr4-release
Change-Id: Ib13d4ae0889290a35357da01bf3acf140b89bd23
Bill Gruber [Wed, 27 Jul 2011 17:29:57 +0000 (10:29 -0700)]
Merge "Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b115536facf099f IAB docs: fixes and updates"
Bill Gruber [Wed, 27 Jul 2011 17:29:47 +0000 (10:29 -0700)]
Merge "Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244f2f07 sdk doc change: updated intro to developing and removed reference to G1 Bug:
4483863"
Robert Ly [Wed, 27 Jul 2011 17:27:59 +0000 (10:27 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51"
Robert Ly [Wed, 27 Jul 2011 17:27:53 +0000 (10:27 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4"
Robert Ly [Wed, 27 Jul 2011 17:27:46 +0000 (10:27 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b"
Robert Ly [Wed, 27 Jul 2011 17:27:39 +0000 (10:27 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989"
Robert Ly [Wed, 27 Jul 2011 17:27:31 +0000 (10:27 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: Iab11fd9bf007d2e2dcfd7b26a6b8539ed35cf60e"
Robert Greenwalt [Wed, 27 Jul 2011 17:17:26 +0000 (10:17 -0700)]
Merge "resolved conflicts for merge of
af75fdb1 to master"
Iliyan Malchev [Wed, 27 Jul 2011 07:58:25 +0000 (00:58 -0700)]
libstagefright: add destroyOMXPlugin and use C linkage for symbols
Add a destroyOMXPlugin() to complemenet createOMXPlugin(). Since the latter is
an opaque call into a library, it is not safe to assume that the object thus
returned may be destroyed by calling delete. This patch will call
destroyOMXPlugin() in libstagefrighthw.so, if the symbol is defined there.
Otherwise, it will default to a delete as before.
Also, prefer C linkage for the symbol names. Using mangled C++ symbols is not
very safe and makes it hard to grep for those symbols through the code. We
attempt to locate createOMXPlugin as a C symbol then try it as a mangled C++
one. We only use C linkage for destroyOMXPlugin since this symbol is new.
Change-Id: Ied23c910486856a0f18056df049c871234797c5c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Tue, 26 Jul 2011 22:56:44 +0000 (15:56 -0700)]
libcameraservice: call put_parameters on camera HAL
Change-Id: I492d1034ade50f9e157141debaa9783a90a04a91
Signed-off-by: Iliyan Malchev <malchev@google.com>
Robert Greenwalt [Wed, 27 Jul 2011 17:00:36 +0000 (10:00 -0700)]
resolved conflicts for merge of
af75fdb1 to master
Change-Id: Ib7f3521b0af6df9346cf940d69f2988b1c87e129
Bill Gruber [Thu, 14 Jul 2011 22:03:42 +0000 (15:03 -0700)]
Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244f2f07
sdk doc change: updated intro to developing and removed reference to G1
Bug:
4483863
Change-Id: Ic8d342145ed909ee5592e93a3055887e478a5688
Alex Sakhartchouk [Wed, 27 Jul 2011 16:50:35 +0000 (09:50 -0700)]
Merge "Add getName to renderscript base object"
Bill Gruber [Wed, 29 Jun 2011 17:17:19 +0000 (10:17 -0700)]
Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b115536facf099f
IAB docs: fixes and updates
Change-Id: I0a9d782a83ca16b27c3e90f7bfc19bb9bca5e908
Eric Laurent [Wed, 27 Jul 2011 16:48:47 +0000 (09:48 -0700)]
Merge "AudioFlinger: fix crash when deleting pre process."
Jeff Sharkey [Wed, 27 Jul 2011 16:41:39 +0000 (09:41 -0700)]
Merge "Avoid sync when UID network is disconnected."
Gilles Debunne [Wed, 27 Jul 2011 16:31:02 +0000 (09:31 -0700)]
Merge "Bug
4987014: a tap outside dismisses the text suggestion popup"
Robert Greenwalt [Wed, 27 Jul 2011 16:27:00 +0000 (09:27 -0700)]
resolved conflicts for merge of
41394a36 to honeycomb-plus-aosp
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
Eric Laurent [Wed, 27 Jul 2011 16:02:47 +0000 (09:02 -0700)]
Merge "Fix issue
4604090: notification sound interrupted."
Eric Laurent [Wed, 27 Jul 2011 15:56:08 +0000 (08:56 -0700)]
Merge "AudioRecord: Fix getInput()"
Narayan Kamath [Wed, 27 Jul 2011 15:15:48 +0000 (08:15 -0700)]
Merge "Reduce the priority of the TTS thread."
Daniel Sandler [Wed, 27 Jul 2011 13:17:33 +0000 (06:17 -0700)]
Merge "Smaller, darker notification icons."
Kristian Monsen [Wed, 27 Jul 2011 12:33:33 +0000 (05:33 -0700)]
Merge "Fix for bug
5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests"
Narayan Kamath [Wed, 27 Jul 2011 12:22:09 +0000 (13:22 +0100)]
Reduce the priority of the TTS thread.
It's at a very high priority currently - and will trump
foreground processes (and UI threads) which it shouldnt.
bug:
5076001
Change-Id: I0d71c2941950782491ae31526a47ea6f97c38ffb
Daniel Sandler [Wed, 27 Jul 2011 04:09:40 +0000 (00:09 -0400)]
Smaller, darker notification icons.
(Still need to attempt to mipmap them but this will do for
now.)
Bug:
4691635
Change-Id: I8793d6a453fcbe0c2ce30b6349e4e5ef3f1a6e56
Eric Laurent [Wed, 27 Jul 2011 03:54:46 +0000 (20:54 -0700)]
AudioFlinger: fix crash when deleting pre process.
If a pre processing effect is detroyed while enabled and capture is active,
there was a possibility that the effect engine is released by the framework
while still processed by the audio HAL.
The fix consists in not releasing the engine in EffectModule::removeHandle()
but just flag the effect as being detroyed to avoid further calls to functions
on the engine effect interface.
The effect interface is then removed from the audio HAL safely in
EffectChain::removeEffect_l() while holding the EffectChain mutex.
Change-Id: I71fab30d9145062af8644f545a1f1d4d3e7e7f02
Romain Guy [Wed, 27 Jul 2011 03:36:38 +0000 (20:36 -0700)]
Merge "Improve layers debugging"
Romain Guy [Wed, 27 Jul 2011 03:35:55 +0000 (20:35 -0700)]
Improve layers debugging
Change-Id: Ia4950dd5f0e0a224ecb69c581d33aa4f32260a7c
Eric Laurent [Wed, 27 Jul 2011 03:32:28 +0000 (20:32 -0700)]
AudioRecord: Fix getInput()
AudioRecord::getInput() was issuing a query to get a new input stream from
audio policy service instead of returning the cached input stream in AudioRecord.
Change-Id: Ice324b7c60bc0898149023797bcb56a72091b9d3
Svetoslav Ganov [Wed, 27 Jul 2011 03:09:44 +0000 (20:09 -0700)]
Merge "Updated the layout for the activity chooser view."
Svetoslav Ganov [Wed, 27 Jul 2011 03:09:15 +0000 (20:09 -0700)]
Merge "findViewWithText inconsistent with other findView* methods and AccessibilityNodeInfo not respecting root namespace."
Adam Powell [Wed, 27 Jul 2011 02:59:42 +0000 (19:59 -0700)]
Merge "Fix bug
5051894 - drags/flings at the beginning/end of ListViews are often dropped"
Chih-Chung Chang [Wed, 27 Jul 2011 02:07:35 +0000 (19:07 -0700)]
Merge "Add dependencies for the YV12 color converter change."
Romain Guy [Wed, 27 Jul 2011 01:59:03 +0000 (18:59 -0700)]
Merge "Make sure we have a current EGL context when invoking EGL Bug #
5081795"
Romain Guy [Wed, 27 Jul 2011 01:57:28 +0000 (18:57 -0700)]
Make sure we have a current EGL context when invoking EGL
Bug #
5081795
Change-Id: Iee3382d362a71c1e6c5c498b319bf7f7bcf5a2f0
Adam Powell [Tue, 26 Jul 2011 02:07:06 +0000 (19:07 -0700)]
Fix bug
5051894 - drags/flings at the beginning/end of ListViews are
often dropped
Fix some weirdness in transitioning between overscroll states.
Change-Id: Ie0c2ba75cc60c340e654df58dee675ed1426edb9
Svetoslav Ganov [Tue, 26 Jul 2011 04:54:55 +0000 (21:54 -0700)]
Updated the layout for the activity chooser view.
1. Updated the laoout to size the buttons properly.
Change-Id: I58f9beeca23af8b0471cf7f7ae9ca717223221aa
John Michelau [Wed, 27 Jul 2011 01:36:55 +0000 (18:36 -0700)]
am
fada80df: am
ac74551b: Disable name lookups for dumpstate calls to "iptables -L"
* commit '
fada80df08dd0b608eeb9737af413f8df1eb5252':
Wink Saville [Wed, 27 Jul 2011 01:36:41 +0000 (18:36 -0700)]
Chih-Chung Chang [Tue, 26 Jul 2011 04:14:28 +0000 (12:14 +0800)]
Add dependencies for the YV12 color converter change.
Bug:
5061733
Change-Id: Id8227a4f634285323c37498604fe080d986bfb09
Svetoslav Ganov [Wed, 27 Jul 2011 01:09:37 +0000 (18:09 -0700)]
findViewWithText inconsistent with other findView* methods and AccessibilityNodeInfo not respecting root namespace.
1. Find viewsWithText does not respect if the current view group is a root name
space and keeps its traversal. This is inconsistent with the other findView*
methods. Also only visible views are returned witch is inconsistent with the other
findView* methods.
2. AccessibilityNodeInfo reports children it the source is root namespace. This is
not correct since thi flag denotes the beginning of a logically separate view
hierarchy.
bug:
5082601
Change-Id: I9c7ca51f284d04728828d5e656112257c9a2c6e2
Jeff Sharkey [Wed, 13 Jul 2011 17:44:07 +0000 (10:44 -0700)]
Avoid sync when UID network is disconnected.
During maybeStartNextSyncLocked(), check the network connectivity for
the target UID, and skip when disconnected.
Bug:
4519115
Change-Id: I8adee8e04521cb878624b19e557d01869f984c4c
Jim Miller [Wed, 27 Jul 2011 00:03:49 +0000 (17:03 -0700)]
Merge "Fix
5044158: Turn off debugging in MultiWaveView."
Jim Miller [Tue, 26 Jul 2011 23:53:17 +0000 (16:53 -0700)]
Fix
5044158: Turn off debugging in MultiWaveView.
Change-Id: I501e4dbdfff9dc6fbe4ab92f6b15652814480642
Mike Lockwood [Tue, 26 Jul 2011 23:42:43 +0000 (16:42 -0700)]
Merge "GlobalScreenshot: Set image file size in media database when taking screenshots"
Jaikumar Ganesh [Tue, 26 Jul 2011 23:33:19 +0000 (16:33 -0700)]
Merge "Add ability to turn BT on / off on a per application basis."
Justin Ho [Tue, 26 Jul 2011 23:09:20 +0000 (16:09 -0700)]
Merge "Updated btns"
Pannag Sanketi [Tue, 26 Jul 2011 22:57:17 +0000 (15:57 -0700)]
Merge "Fixing up Mediarecorder for MFF"
Wu-cheng Li [Tue, 26 Jul 2011 22:49:30 +0000 (15:49 -0700)]
Merge "Add camera face detection API."
Robert Greenwalt [Tue, 26 Jul 2011 22:26:02 +0000 (15:26 -0700)]
resolved conflicts for merge of
41394a36 to honeycomb-plus-aosp
Change-Id: If4dc99c558dc45c9a7ff8d3ea5be69578b4ee793
Jaikumar Ganesh [Fri, 22 Jul 2011 01:13:38 +0000 (18:13 -0700)]
Add ability to turn BT on / off on a per application basis.
This changes adds an API for system applications
to enable bluetooth without all the side effects like
auto connection to headsets etc.
Also some tweaks to the adapter state machine
Change-Id: Ib9f22d548a26d72334b300101c8eb0d80f08a4bb
Justin Ho [Tue, 26 Jul 2011 21:29:52 +0000 (14:29 -0700)]
Updated btns
Bug:
5076695
Change-Id: I9086830e19543adab8fdc86667e72fce60585201
Wu-cheng Li [Thu, 21 Jul 2011 18:37:11 +0000 (02:37 +0800)]
Add camera face detection API.
API are still hidden.
bug:
4460717
Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
Jason Sams [Tue, 26 Jul 2011 21:20:27 +0000 (14:20 -0700)]
Merge "Unhide new RS apis."
Alex Sakhartchouk [Tue, 26 Jul 2011 21:13:32 +0000 (14:13 -0700)]
Add getName to renderscript base object
Change-Id: Ia28f88d2c9d679692778641548fdac08c1041d02
Robert Ly [Tue, 12 Jul 2011 17:58:02 +0000 (10:58 -0700)]
cherrypick from hc-mr2 Change-Id: Iab11fd9bf007d2e2dcfd7b26a6b8539ed35cf60e
Change-Id: I15aaa631796673a9e552497b2ae6d5f1d17cb6d6
Robert Ly [Mon, 18 Jul 2011 17:26:49 +0000 (10:26 -0700)]
cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989
Change-Id: Ibaa0c4bd277dbab1bc01861ebd2af16b3adf521e
Robert Ly [Tue, 19 Jul 2011 21:27:15 +0000 (14:27 -0700)]
cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b
Change-Id: I37fb07126676737d16294e64ac974c0da39a3b05
Jason Sams [Tue, 26 Jul 2011 21:09:22 +0000 (14:09 -0700)]
Merge "Cleanup sample code."
Robert Ly [Mon, 18 Jul 2011 22:30:42 +0000 (15:30 -0700)]
cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4
Change-Id: I19ed647790ed4781762f09897ec76a4348059fb2
Robert Ly [Mon, 18 Jul 2011 19:51:47 +0000 (12:51 -0700)]
cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51
Change-Id: I1b027de2c5e5cf370f19d7b64807135b1d0413da
Jason Sams [Tue, 26 Jul 2011 21:07:19 +0000 (14:07 -0700)]
Unhide new RS apis.
Change-Id: I83505156bd8a0ffabf0da3aef937693eaee9d9cd
Mike Lockwood [Tue, 26 Jul 2011 17:55:16 +0000 (13:55 -0400)]
GlobalScreenshot: Set image file size in media database when taking screenshots
Otherwise the value would be left at zero since we are inserting
the database record before writing the file
Bug:
5064246
Change-Id: I54be6ff14a7f170994aaf586aaddb06c5b746e89
Signed-off-by: Mike Lockwood <lockwood@android.com>
Flavio Lerda [Tue, 26 Jul 2011 20:31:49 +0000 (13:31 -0700)]
Merge "Add IS_READ field to CallLog and VoicemailContract."
Robert Greenwalt [Tue, 26 Jul 2011 20:21:09 +0000 (13:21 -0700)]
Merge "Use dns proxy a bit." into honeycomb-LTE
Eric Fischer [Tue, 26 Jul 2011 20:12:58 +0000 (13:12 -0700)]
Merge "Import revised translations."
Flavio Lerda [Tue, 26 Jul 2011 12:22:28 +0000 (13:22 +0100)]
Add IS_READ field to CallLog and VoicemailContract.
We had initially decided to merge the NEW field (from the call log) and
IS_READ field (from the voicemail contract) into the single NEW field
already present in the call log.
However, it turned out that the meaning of the two fields is slightly
different: NEW means the items has just been inserted (and the user is
not aware of it) while IS_READ represents whether the user has read this
specific message (or heard, in case of voicemails).
This change makes the IS_READ field public, as well as deletes the NEW
field from the voicemail contract, since it is no longer needed there.
The NEW field in the voicemail contract (in fact the entire voicemail
contract) has never been released (this feature is new in ICS).
Bug:
5036195
Change-Id: I740c51c1a8e6d2460050eaab9943fb38b1565058
Mathias Agopian [Tue, 26 Jul 2011 19:08:07 +0000 (12:08 -0700)]
Merge "remove dead code and member variables."
Daniel Sandler [Tue, 26 Jul 2011 17:34:28 +0000 (10:34 -0700)]
Merge "New phone statusbar handle."
Daniel Sandler [Tue, 26 Jul 2011 17:34:21 +0000 (10:34 -0700)]
Merge "New stacked RSSI icons."
Daniel Sandler [Tue, 26 Jul 2011 17:21:24 +0000 (10:21 -0700)]
Merge "Play the low-battery sound only at certain discharge events."
Daniel Sandler [Tue, 26 Jul 2011 17:13:04 +0000 (10:13 -0700)]
Merge "Update large icon in changed status bar notifications."
Mike Lockwood [Tue, 26 Jul 2011 17:10:28 +0000 (10:10 -0700)]
Merge "MediaScanner: Fix problem with duplicate directory entries in the database"
Daniel Sandler [Tue, 26 Jul 2011 17:06:49 +0000 (13:06 -0400)]
Play the low-battery sound only at certain discharge events.
That is, only play it when the device is running on battery
and the remaining charge level descends into a new
low-battery regime:
* when the device hits the first threshold, for example 15%
(the dialog is first shown at this time)
* when the device hits the second threshold, e.g. 4% (the
dialog will be redisplayed if necessary)
* when the device has been charging but AC power is removed,
returning the device to a low-battery regime (the dialog
will be redisplayed if necessary)
The sound will no longer be replayed as the battery level
descends within these regimes (say, 4% --> 3%).
Bug:
4981280
Change-Id: I049d60f39ae556241a23f8664e61be3d70d937e5
Jean-Michel Trivi [Tue, 26 Jul 2011 16:27:53 +0000 (09:27 -0700)]
Merge "Fix bug
4319552 Java to native channel mask translation"
Makoto Onuki [Tue, 26 Jul 2011 16:24:06 +0000 (09:24 -0700)]
Merge "Add new contacts intent action for the "invite" feature"
Mike Lockwood [Tue, 26 Jul 2011 14:57:42 +0000 (10:57 -0400)]
MediaScanner: Fix problem with duplicate directory entries in the database
Bug:
5078643
Change-Id: I8804ff5bbd729f57be7ff0b17a4b134cafe78c18
Signed-off-by: Mike Lockwood <lockwood@android.com>
Daniel Sandler [Fri, 22 Jul 2011 20:23:09 +0000 (16:23 -0400)]
New stacked RSSI icons.
The signal strength, network type & flow indicator, and
battery have all been moved out of the policy and into the
status bar implementation itself, mirroring the change on
tablets. This means that they no longer use status bar icon
slots but instead are bespoke layouts and views.
GPS has also been removed and will return as a notification
(again, as was done in the Honeycomb tablet UI).
Bug:
4691638
Change-Id: I60df4871209b64209bfc5b3bf398651cc2e77b24
John Michelau [Tue, 26 Jul 2011 05:26:38 +0000 (22:26 -0700)]
am
ac74551b: Disable name lookups for dumpstate calls to "iptables -L"
* commit '
ac74551bb42eb2d6775d994357481113375574e7':
Disable name lookups for dumpstate calls to "iptables -L"
John Michelau [Tue, 26 Jul 2011 01:42:50 +0000 (20:42 -0500)]
Disable name lookups for dumpstate calls to "iptables -L"
The name lookups are not helpful enough to warrant the large delays
they can cause.
Change-Id: I8710e76b15b7cf060b7f4f89128ea3249fcdbd0d
Mathias Agopian [Tue, 26 Jul 2011 02:56:08 +0000 (19:56 -0700)]
remove dead code and member variables.
also fix some comments and improve debugging logs.
Change-Id: I83e55309f306332b59e1ec46104c4a7fffbf3c97
Mathias Agopian [Tue, 26 Jul 2011 02:51:31 +0000 (19:51 -0700)]
Merge "fix a typo that prevented preserveRects() to work properly"
Gilles Debunne [Tue, 26 Jul 2011 01:56:09 +0000 (18:56 -0700)]
Bug
4987014: a tap outside dismisses the text suggestion popup
Change-Id: I61f5a3c981770393aa861c88d989c653ea00a067
Eric Laurent [Fri, 22 Jul 2011 16:04:31 +0000 (09:04 -0700)]
Fix issue
4604090: notification sound interrupted.
The problem is that the audio HAL fails to acquire the wake lock when playing the notification.
This is because of a change that removed the mediaserver process form the system group for honeycomb.
The fix consists in requesting the wake lock from PowerManagerService when AudioFlinger mixer
wakes up.
A consequence of this change is that audio HALs or pcm drivers do not have to hold wake locks
anymore as in the past.
Change-Id: I4fb3cc84816c9c408ab7fec75886baf801e1ecb5
Chih-Chung Chang [Tue, 26 Jul 2011 01:36:57 +0000 (18:36 -0700)]
Merge "Add filename and line number in the debug messages."
Daniel Sandler [Fri, 22 Jul 2011 20:23:36 +0000 (16:23 -0400)]
New phone statusbar handle.
Bug:
4691638
Change-Id: I317d76bc093b56b639bf1d937fe6fb8dcbff109e
Kenny Root [Tue, 26 Jul 2011 01:26:59 +0000 (18:26 -0700)]
Merge "Throw NullPointerException on args to Time#compare"
satok [Tue, 26 Jul 2011 01:02:46 +0000 (18:02 -0700)]
Merge "[step9] Add logging code for text services"
satok [Mon, 25 Jul 2011 23:02:45 +0000 (08:02 +0900)]
[step9] Add logging code for text services
Change-Id: I4dae847951848cca85bcb73f47c509ce23327334
Pannag Sanketi [Tue, 26 Jul 2011 00:20:50 +0000 (17:20 -0700)]
Fixing up Mediarecorder for MFF
For using the MediaRecorder in MFF (Mobile Filter Framework),
getMediaRecorder method in mediarecorder jni was earlier changed to
a non static method. Changed it back to a static method.
Also, added a new source type to MediaRecorder.VideoSource for recording
GRalloc buffers.
Change-Id: I031fad45c12b0ac9602d9e451d4767e95a86234d
Eric Fischer [Tue, 26 Jul 2011 00:36:41 +0000 (17:36 -0700)]
Import revised translations.
Change-Id: Ia9c97db0cd31b9d3163318b4193a328a614a7098
Dianne Hackborn [Tue, 26 Jul 2011 00:28:51 +0000 (17:28 -0700)]
Merge "Fix issue #
5063010: Loaders don't seem to be properly..."
Daniel Sandler [Tue, 26 Jul 2011 00:27:39 +0000 (20:27 -0400)]
Update large icon in changed status bar notifications.
Reapply fix from change I6bb72c0b to phones.
Bug:
5071157
Change-Id: I9da5ee6cf72b148e5fef4de6e1c9328ccb4b28b8
Robert Greenwalt [Tue, 26 Jul 2011 00:25:30 +0000 (17:25 -0700)]
am
8ba16551: Merge "Fix build." into honeycomb-plus-aosp
* commit '
8ba16551bc11379e7c1b1815612909e2515d0cb2':
Fix build.
Dianne Hackborn [Tue, 26 Jul 2011 00:25:09 +0000 (17:25 -0700)]
am
1b20abd3: am
20bf46af: am
b0878223: am
6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '
1b20abd30c2757132b7a2d319ae73f420b864ed4':
frameworks/base: Cap the number of toasts that a package can post.
Dianne Hackborn [Tue, 26 Jul 2011 00:25:00 +0000 (17:25 -0700)]
am
6d21aee8: am
9ce1ecdf: am
1a2fcea1: am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
6d21aee882215e8a17408f6ae1fbfba5cf8e440f':
frameworks/base: unlink death notifications of Vibrate requests
Xavier Ducrohet [Tue, 26 Jul 2011 00:24:56 +0000 (17:24 -0700)]
am
ed07215e: am
55775e5f: am
e70b2b8f: am
9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit '
ed07215e482cae1ffedbba707284821b3afc310f':
Layoutlib_create flag -p: don't change all accesses to public.
Kenny Root [Tue, 26 Jul 2011 00:24:52 +0000 (17:24 -0700)]
am
64ed1059: am
e612c881: am
4f3a8db6: am
3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '
64ed105957098a900d58e7c2598e060cb37755ce':
Continue idmap generation even if name lookup fails.
Winson Chung [Tue, 26 Jul 2011 00:20:19 +0000 (17:20 -0700)]
Merge "Using the filename as the media title for screenshots and changing filename format."