summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90Scott Main2011-06-201-3/+3
| | | | | | docs: fix typos Change-Id: I1e821f9455ee9fcb01d345226f3b606621fdcd8e
* Merge "Stop the holo tabs from sqeezing in to each other."Dianne Hackborn2011-06-201-4/+6
|\
| * Stop the holo tabs from sqeezing in to each other.Dianne Hackborn2011-06-201-4/+6
| | | | | | | | Change-Id: I8925daf5c7c21e65f17cc6bc308b1b867047e745
* | Merge "First cut at RSTextureView."Jason Sams2011-06-206-7/+227
|\ \
| * | First cut at RSTextureView.Jason Sams2011-06-206-7/+227
| | | | | | | | | | | | Change-Id: I920950f33079b6bb7e48bb8970201ab9737bb021
* | | Merge "Fix bug 4738084 - Padding calculation regression"Adam Powell2011-06-201-11/+0
|\ \ \
| * | | Fix bug 4738084 - Padding calculation regressionAdam Powell2011-06-201-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | Make sure user padding values aren't clobbered during construction. Change-Id: I90d1610e0bf50ccb10f058fb2b6c6d8ff34eec3b
* | | | Merge "Fixed MonkeyRunner documentation"Bill Napier2011-06-201-1/+1
|\ \ \ \
| * | | | Fixed MonkeyRunner documentationMichael Wright2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MonkeyRunner's documentation previously had an out of date enum value in the sample code. This has been updated. Change-Id: If725815ee578aab8cd59ef17706ea8de7973d4c1
* | | | | Merge "Tethering: Use UsbManager to enable/disable RNDIS"Mike Lockwood2011-06-203-105/+57
|\ \ \ \ \
| * | | | | Tethering: Use UsbManager to enable/disable RNDISMike Lockwood2011-06-193-105/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete RNDIS support from NetworkManagementService This change fixes USB tethering, which broke after the new USB gadget driver changes went in. Change-Id: Idd987fb2c39c40e81ebc92e6d8dae9fe77ed4ddc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | Merge "OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and ↵Andreas Huber2011-06-201-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | more guarding in getMetaData()."
| * | | | | | OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more ↵Dongwon Kang2011-06-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guarding in getMetaData(). BUG:4689872 Change-Id: I483bf230b5571a8d1815b954dce2c52e9a5f1f37
* | | | | | | Merge "Output Proguard options for also overlay layouts."Ying Wang2011-06-201-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Output Proguard options for also overlay layouts.Ying Wang2011-06-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7bfac476247bd7b532510e295cb1a3e61e9af88b
* | | | | | | | Merge "Import revised translations."Eric Fischer2011-06-2099-2658/+5166
|\ \ \ \ \ \ \ \
| * | | | | | | | Import revised translations.Eric Fischer2011-06-2099-2658/+5166
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie30d36d7416f687f2d84b0bdf6547cda96446f37
* | | | | | | | Merge "SurfaceTexture: fix a NULL ptr dereference."Jamie Gennis2011-06-202-9/+37
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | SurfaceTexture: fix a NULL ptr dereference.Jamie Gennis2011-06-202-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a NULL check when searching the slot list in SurfaceTextureClient for the slot corresponding to a buffer being queued or canceled. Bug: 4645023 Change-Id: I806cbc1e34da118ea33a83c4f25ce8193ba1c3ad
* | | | | | | | Merge "When a recording session is stopped, no outstanding input video ↵James Dong2011-06-201-6/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | frames exist for the output buffers returned from OMX component to SF."
| * | | | | | | | When a recording session is stopped, no outstanding input video frames exist ↵James Dong2011-06-201-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the output buffers returned from OMX component to SF. When this happens, default value of 0 will be used for the "decoding" time for these output buffers. These buffers do not contain valid media data anyway. related-to-bug: 4725803 Change-Id: I0eaf248bb2ac022ff072eaffd0ed3f21171f824e
* | | | | | | | | Merge "Match legacy theme colors with gingerbread"Adam Powell2011-06-201-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Match legacy theme colors with gingerbreadAdam Powell2011-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57904c0271953fc55d08a8a51be3dfc9ee02e416
* | | | | | | | | Merge "Add map center resources for new locales."Eric Fischer2011-06-206-0/+192
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add map center resources for new locales.Eric Fischer2011-06-206-0/+192
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I892bc8262eb31ea9671e54f84ce91281b9e3c762
* | | | | | | | | Merge "Add support for more vector types to RS."Stephen Hines2011-06-204-1/+244
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add support for more vector types to RS.Stephen Hines2011-06-014-1/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1bc34ef6670b6b5de3c1b6b3b3325637b8c7b43
* | | | | | | | | | Merge "SurfaceTexture: attach to Dalvik when needed."Jamie Gennis2011-06-201-5/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SurfaceTexture: attach to Dalvik when needed.Jamie Gennis2011-06-171-5/+27
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a bug in the SurfaceTexture JNI where a thread that the Dalvik VM was not aware of calls the onFrameAvailable callback. When this happens the callback needs to first attach the thread to the VM before attempting to post the onFrameAvailable event for Java code to handle. Change-Id: I6a5470c32611ea6f38e9167779450f50635cabd3
* | | | | | | | | | Merge "Add View paddingStart and paddingEnd"Fabrice Di Meglio2011-06-207-20/+390
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add View paddingStart and paddingEndFabrice Di Meglio2011-06-207-20/+390
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use a lazy padding resolution (because layout direction is lazyly resolved too) - cache resolved layout direction as getResolvedLayoutDirection() will be more called - enable resetting layout direction cache if needed - update unit tests Change-Id: I30ce19e3100cc137f84e60163b60e1577ff61819
* | | | | | | | | | | Merge "Parser for uri records"Nick Pelly2011-06-201-0/+22
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Parser for uri recordsBen Dodson2011-06-171-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b71ba7938aa83a1c6344e3da72a9495bc1e9a16
* | | | | | | | | | | Merge "Ensure measuredWidth > getSuggestedMinimumWidth(), same for height."Philip Milne2011-06-201-11/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ensure measuredWidth > getSuggestedMinimumWidth(), same for height.Philip Milne2011-06-201-11/+12
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f2dc2e874d8aacf961e98fe41139ada7a992449
* | | | | | | | | | | Fix bug 4729242 - Crash while launching browser app.Adam Powell2011-06-201-23/+35
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id049bcc53943b0cbe17e9f345af67adc2b10bdef
* | | | | | | | | | Merge "Remove unneeded #include <sys/resource.h>"Glenn Kasten2011-06-208-8/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unneeded #include <sys/resource.h>Glenn Kasten2011-06-158-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested in code review for previous change. Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
* | | | | | | | | | | Merge "Teach NetworkIdentity about roaming."Jeff Sharkey2011-06-193-10/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Teach NetworkIdentity about roaming.Jeff Sharkey2011-06-193-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And correctly upgrade NetworkIdentitySet written to disk, assuming that old values aren't roaming. Bug: 4724762 Change-Id: Ic25897ebbaf43be2390174d8e5fd08386bc8a345
* | | | | | | | | | | | Merge "Persist "tagged" network stats along with UIDs."Jeff Sharkey2011-06-195-104/+348
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Persist "tagged" network stats along with UIDs.Jeff Sharkey2011-06-195-104/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now stores tags other than TAG_NONE (0x0), which are useful for app debugging. Combine UID and tag together into single long key, and expose tag data through AIDL when requested. Change NMS to track TAG_NONE as total UID traffic, matching the kernel definition. Added TAG_MAX_HISTORY to control how long tag-granularity statistics are stored; overall UID usage is still kept for UID_MAX_HISTORY. Fix bug to trim NetworkStatsHistory outside normal polling loops to catch non-active networks and UIDs. Test to verify UID and tag packing, and to verify that UID traffic on two networks are combined to match MOBILE_ALL template. Change-Id: If0e039416d9e7f63b1a39e04cddfb1133b5a78ee
* | | | | | | | | | | Merge "Handle removed UIDs in network stats and policy."Jeff Sharkey2011-06-197-31/+294
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Handle removed UIDs in network stats and policy.Jeff Sharkey2011-06-197-31/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When UID_REMOVED, clean up any existing UID network policy so it doesn't linger for future apps. Also move any NetworkStatsHistory to special UID_REMOVED tracking bucket. Tests for new removal code. Also test detailed UID stats, including network changes to verify template matching logic. Bug: 4584212 Change-Id: I9faadf6b6f3830eb45d86c7f1980a27cdbcdb11e
* | | | | | | | | | | Merge "Read "qtaguid" network stats, refactor templates."Jeff Sharkey2011-06-1819-576/+858
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Read "qtaguid" network stats, refactor templates.Jeff Sharkey2011-06-1819-576/+858
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach NMS to read qtaguid stats from kernel, but fall back to older stats when kernel doesn't support. Add "tags" to NetworkStats entries to support qtaguid. To work around double-reporting bug, subtract tagged stats from TAG_NONE entry. Flesh out stronger NetworkTemplate. All NetworkStatsService requests now require a template, and moved matching logic into template. Record UID stats keyed on complete NetworkIdentitySet definition, similar to how interface stats are stored. Since previous UID stats didn't have iface breakdown, discard during file format upgrade. Change-Id: I0447b5e7d205d73d28e71c889c568e536e91b8e4
* | | | | | | | | | Merge "Holo dialog formatting"Adam Powell2011-06-171-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Holo dialog formattingAdam Powell2011-06-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6819871df9456130ec75516f8713af92c0e51750
* | | | | | | | | | | Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands"Mike Lockwood2011-06-172-28/+70
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MTP: Fix some problems with GetObjectHandles and GetNumObjects commandsMike Lockwood2011-06-172-28/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These calls did not correctly handle some variants of the arguments, which showed up when running in PTP mode. Change-Id: Iedbaefebfa39111c8bcaee7c6cc3820a65d6c98f Signed-off-by: Mike Lockwood <lockwood@android.com>
generated by cgit v1.1 at 2025-01-27 14:09:40 +0000