summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 "Notify policy listeners about metered ifaces."Jeff Sharkey2011-06-177-76/+151
|\
| * Notify policy listeners about metered ifaces.Jeff Sharkey2011-06-177-76/+151
| | | | | | | | | | | | | | | | | | | | Currently, kernel definition of metered networks is applied at the interface level. This change maintain list of those metered ifaces and notifies policy listeners, like ConnectivityService. (This gives us a consistent picture of when a network would be blocked.) Bug: 4601393 Change-Id: I277d5ca96ab967a1c1c3f1da8f9587557cd6d74c
* | Merge "Update pattern unlock and assets to match new UX design spec."Jim Miller2011-06-1772-614/+523
|\ \
| * | Update pattern unlock and assets to match new UX design spec.Jim Miller2011-06-1772-614/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug with LockPatternView measurement. Clean up forgotPassword/emergencyCall button code. Lots of layout tweaks. Now uses new GridLayout for many of them. New assets. Updated after review. Change-Id: I52d4ce65c6b6c644ac60eb55bb8eaff8bfeb1071
* | | Merge "Add string resource for CD installer image path"Mike Lockwood2011-06-171-0/+6
|\ \ \
| * | | Add string resource for CD installer image pathMike Lockwood2011-06-171-0/+6
| | | | | | | | | | | | | | | | Change-Id: I50eb2d0213f0547e88e9a20ab926726e781b0c0b
* | | | Merge "VPN: avoid leaking file descriptors."Chia-chi Yeh2011-06-172-3/+13
|\ \ \ \
| * | | | VPN: avoid leaking file descriptors.Chia-chi Yeh2011-06-172-3/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: If70f5af3529d79bddb9d72675cf6eb038ff3ff70
* | | | | Merge "Fix bug 4689431 - PopupMenus too narrow on phones"Adam Powell2011-06-171-2/+4
|\ \ \ \ \
| * | | | | Fix bug 4689431 - PopupMenus too narrow on phonesAdam Powell2011-06-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I624b46d17c1d964fd6cb04abf96333c7a8474d75
* | | | | | Merge "Invisible views can't start animations"Chet Haase2011-06-171-1/+5
|\ \ \ \ \ \
| * | | | | | Invisible views can't start animationsChet Haase2011-06-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The invalidation logic was broken for invisible views, causing a problem when an animation was set to start on an invisible view (to fade it in), but the view would not propagate the invalidation event that would trigger the start of the animation rendering. Fix: reset the DRAWN flag when a view becomes invisible to allow the invalidation logic to work as intended. Change-Id: Ibf49c6e8b39506a92a6e5f45cb8a12626ae4f931
* | | | | | | Merge "Use system property to control whether we will enable B frame support ↵James Dong2011-06-171-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | in MPEG4Writer"
| * | | | | | | Use system property to control whether we will enable B frame support in ↵James Dong2011-06-171-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Writer o This is to work around a bug in crespo's video encoder output timestamp related-to-bug: 4600191,4724339 Change-Id: I485c1e044bd2f604b318692efd6433345cfc6487
* | | | | | | | Merge "Fix rendering issue with paths when the stroke width is 0"Romain Guy2011-06-174-7/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix rendering issue with paths when the stroke width is 0Romain Guy2011-06-174-7/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d8ac23dc69e9e17df4ef6b5195186b5207e2524
* | | | | | | | | Merge "Pass width/height specs in the standard way when measuring children."Philip Milne2011-06-172-44/+37
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Pass width/height specs in the standard way when measuring children.Philip Milne2011-06-172-44/+37
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I127b206cb677f8a09990b6852c98023d6c97112d
* | | | | | | | Merge "VpnDialogs: migrate to VpnConfig."Chia-chi Yeh2011-06-171-41/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | VpnDialogs: migrate to VpnConfig.Chia-chi Yeh2011-06-171-41/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also hide the configure button when configureActivity is not set. Change-Id: Ic8eeec89970bb67d42397754d1f54a2744183eed
* | | | | | | | | Merge "Fix typo in docs link"RoboErik2011-06-171-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typo in docs linkRoboErik2011-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I411d250629b828d07dd7adbdb20da71f0c4722f2
* | | | | | | | | | Merge "Make debuggable="true" imply CheckJNI."Elliott Hughes2011-06-171-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make debuggable="true" imply CheckJNI.Elliott Hughes2011-06-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help third-party developers debug their apps. Tested by adding logging to dalvik and launching a debuggable app. Change-Id: Icec66825709e399e238b4ff00f2bc596485a3a60
* | | | | | | | | | | Merge "Implement remaining infrastructure for user disabling apps."Dianne Hackborn2011-06-177-2/+55
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement remaining infrastructure for user disabling apps.Dianne Hackborn2011-06-177-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8135eb0e27ec36f8f159eb7b6397add7acd0299
* | | | | | | | | | | | Merge "Add docs for Calendars table"RoboErik2011-06-171-13/+106
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Add docs for Calendars tableRoboErik2011-06-171-13/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e445f730a4330f7c570efadb3051d28ca050402
* | | | | | | | | | | | Merge "VPN: move VpnDialogs related methods into VpnConfig."Chia-chi Yeh2011-06-172-27/+56
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | VPN: move VpnDialogs related methods into VpnConfig.Chia-chi Yeh2011-06-172-27/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This might not be the best place for the glue code, but it is known that choosing VpnBuilder will introduce a dependency cycle of VpnBuilder, ConnectivityService, and the Vpn class. Change-Id: I3f03617d1fe1a0b8fb3705c23265676fff51a75c
* | | | | | | | | | | | Merge "Remove HanziToPinin.java"Daisuke Miyakawa2011-06-172-569/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove HanziToPinin.javaDaisuke Miyakawa2011-06-162-569/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those files are moved to ContactsProvider package. Must be after If786dd286dab47ca1b2ccab38c5fa43ae390c0f7 Bug: 4645142 Change-Id: I774426347e8331fc1c203d5d8e6887e83baffc9f
* | | | | | | | | | | | Merge "Bug 4726236 - NPE at dispatchRestoreInstanceState"Adam Powell2011-06-171-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug 4726236 - NPE at dispatchRestoreInstanceStateAdam Powell2011-06-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib7eba6ead85fa4daa8046bbc2d4d3fcc1d4223c3
* | | | | | | | | | | | | Merge "Inform the InputMethodManager that a focused view has been attached."Amith Yamasani2011-06-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Inform the InputMethodManager that a focused view has been attached.Amith Yamasani2011-06-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables new fragments or views that have a focused EditText to register the view with the input method framework as the served view. Change-Id: I260439223b56626f2e57bd778bbe5194ed44e361
* | | | | | | | | | | | | Merge "Fix regression in audio effect factory"Eric Laurent2011-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix regression in audio effect factoryEric Laurent2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0fb66c2 introduced a bug in EffectCreate() that prevents detection of problems reported by the engine library upon effect creation. Change-Id: I5bd2d42505ac29ab4a5768fd7f0c2ced135cf3e3
* | | | | | | | | | | | | Merge "Create theme attributes for small and large listPreferredItemHeight. ↵Adam Powell2011-06-178-7/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change default holo dialog list items to use them."
| * | | | | | | | | | | | | Create theme attributes for small and largeAdam Powell2011-06-178-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | listPreferredItemHeight. Change default holo dialog list items to use them. Tweak dialog button bar style. Change-Id: I9bf14621aea44b8b7d60c290ecea86e6284ccdaa
* | | | | | | | | | | | | | Merge "POSITVE -> POSITIVE typo fix"Stephen Hines2011-06-174-15/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | POSITVE -> POSITIVE typo fixStephen Hines2011-06-164-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib26eb35fad0c93543f69f6c200820f04c435c2af
* | | | | | | | | | | | | | | Merge "Add isCompatible() to RS Element."Stephen Hines2011-06-172-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add isCompatible() to RS Element.Stephen Hines2011-06-172-2/+30
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=4203264 Change-Id: Id68aead685f6cbc71c2fbe461cb38382e0563f43
* | | | | | | | | | | | | | Merge "Fix permissions check in IccSmsInterfaceManager.sendText()"David Brown2011-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix permissions check in IccSmsInterfaceManager.sendText()David Brown2011-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In android.internal.telephony.IccSmsInterfaceManager, we currently use enforceCallingPermission() rather than enforceCallingOrSelfPermission() to enforce the SEND_SMS permission. The difference is that enforceCallingPermission() will ALWAYS throw a SecurityException if you're not handling an IPC, i.e. if the request is from the same process as the telephony framework. In other words, the current code prevents the phone app from ever using SmsManager.sendTextMessage() :-( This change fixes IccSmsInterfaceManager.sendText() to use enforceCallingOrSelfPermission(), and I confirmed I can now send SMSes from the phone app. NOTE there are a bunch of other uses of enforceCallingPermission() in the telephony framework (all SMS-related) that we probably want to fix too, although I'm fixing just this one for now since it's blocking a hi-pri phone UI feature. I opened bug 4686733 to cover the rest of the cleanup, though. Bug: 4686733 Change-Id: Iaffcf62c54493fa4961fb20894c974697f26e3a7
* | | | | | | | | | | | | | Merge "Add API for auto-complete ranking improvement."Daisuke Miyakawa2011-06-172-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add API for auto-complete ranking improvement.Daisuke Miyakawa2011-06-152-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - primary account (3510087) - per-method ranking (4371572) Primary account enables to ContactsProvider to prioritize email addresses associated with the account. Per-method ranking enables ContactsProvider to get feedback from applications about usage per method instead of that per person. Both should be available for unbundled applications. Bug: 3510087 Bug: 4371572 Change-Id: Icb01415317a7dbb6538804181b06bd973af6205c
* | | | | | | | | | | | | | | Merge "Make textZoom public"John Reck2011-06-172-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \