54198 Commits

Author SHA1 Message Date
Chia-chi Yeh
34e7813e96 VPN: minor refinement.
Change-Id: I2b59cbe8554b6c6f8da48c465252489394f32653
2011-07-03 03:07:07 -07:00
Chia-chi Yeh
44e27b5c74 VPN: remove the old VpnService.
Now VPN is (kind of) integrated into ConnectivityService.

Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55
2011-07-02 20:21:09 -07:00
Mike Lockwood
c50bff8528 UsbService: USB connected notification now redirects to USB screen in Settings
Change-Id: I2dc6d1294da53acfa7589ba5b693ec671695cd21
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-02 22:07:35 -04:00
Mike Lockwood
3ac588b09a Revert "USB connected notification and temporary USB options dialog"
This reverts commit 5787a2d5b4e5bd60087eb7fbb13c97c7d0ba113e.

Change-Id: Ia5f097ffaa3798a42f71d005cffd5007556882d5
2011-07-02 22:07:25 -04:00
Chia-chi Yeh
0c6bb2737e Merge "VPN: export legacy VPN in IConnectivityManager." 2011-07-02 17:28:45 -07:00
Chia-chi Yeh
77fd485c2f VPN: export legacy VPN in IConnectivityManager.
Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1
2011-07-02 17:15:00 -07:00
Chia-chi Yeh
31c10a9587 Merge "Promote ip-up-vpn into the framework." 2011-07-02 16:54:37 -07:00
Chia-chi Yeh
6278d5ef05 Promote ip-up-vpn into the framework.
pppd needs it, and racoon will also use it soon.

Change-Id: I7fc40a709f7d44f75cd3683ab77d90cbc29cd765
2011-07-02 16:41:59 -07:00
Chia-chi Yeh
8bc003e2f6 Merge "VPN: merge JNI methods." 2011-07-02 16:37:25 -07:00
Chia-chi Yeh
3281034c1c VPN: merge JNI methods.
Legacy VPN needs to change routes by itself.

Change-Id: I4cf6639f2b00225810f49704ae05797fc70921d9
2011-07-02 16:16:03 -07:00
Chia-chi Yeh
d6315c0ebb Merge "VPN: give legacy VPN a fake package name." 2011-07-02 03:19:48 -07:00
Chia-chi Yeh
e9107901ae VPN: give legacy VPN a fake package name.
And add more comments.

Change-Id: I0cbc495fcb2c8dd105e16a841619b3b9bd227eae
2011-07-02 01:48:50 -07:00
Svetoslav Ganov
51ac0e94a8 Adding a ShareView and ActionProvider for menus.
1. Adding a widget for sharing contenet with other applications.
   The widget orders the share targets based on previous shares.
   It displays the share target list as either a popup anchored to
   itslef or as a dialog.

2. Added a ShareDataModel that will back widgets or other classes
   that are interested in share targets for a given intent ordered
   according to share history. This class is backing the ShareView

3. Added ActionProvider mechanism for the MenuItems. The action
   provider of a menu creates the action view as well as performs
   a default action if the menu item is on the overflow menu and
   is triggered but none of the menu callback has handled that.

bug:4590827

Change-Id: Iaa4add2df2538b8c6c7edbeaf2880486d4fd75c5
2011-07-01 23:35:26 -07:00
Jeff Brown
b4c5fbff77 Merge "Drop obsolete touch screen hacks." 2011-07-01 19:25:46 -07:00
Jeff Brown
a4d1bc5172 Drop obsolete touch screen hacks.
Change-Id: I47354c37ee2cc2b36340eb709bb5043b3ba78ed9
2011-07-01 19:23:40 -07:00
Jeff Brown
230a1ffcb0 Merge "Workaround apps that make assumptions about pointer ids." 2011-07-01 19:17:21 -07:00
Dianne Hackborn
f58e09e5ac Merge "Don't crash when the load average service is started." 2011-07-01 19:09:03 -07:00
Jeff Brown
6894a2947e Workaround apps that make assumptions about pointer ids.
Modified the touch input mapper to assign pointer ids sequentially
starting from 0 instead of using the tracking id or slot index
supplied by the driver.  Applications should not depend on this
ordering but some do.  (sigh)

Bug: 4980884
Change-Id: I0dfeb3ac27c57a7102a13c960c760e2a02eb7669
2011-07-01 19:08:15 -07:00
Dianne Hackborn
2ed9946441 Don't crash when the load average service is started.
Change-Id: Ie40f549d50942793c940f8728ce9c392c25f4c60
2011-07-01 19:02:52 -07:00
Dianne Hackborn
63acea6ad4 Merge "When removing a task, also kill its processes." 2011-07-01 17:13:40 -07:00
Dianne Hackborn
8894cc5ed4 When removing a task, also kill its processes.
Change-Id: I5945fef21ad6f028e71e36d3cb55d35e0b6401a6
2011-07-01 17:12:04 -07:00
Mathias Agopian
0c63ef5091 don't kill surfaceflinger when system process dies
Change-Id: I2d3ed87b590f9ccea3fa4af41d92911de070b315
2011-07-01 17:09:24 -07:00
Gloria Wang
82428a862f - Retrieve is_drm in MediaMetadataRetriever.
- Add one more column in MediaStore to indicate whether a
  media file is drm-protected.
- Remove old DRM code from Ringtone
- Use the new DRM code in RingtoneManager

Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
2011-07-01 16:52:28 -07:00
Mathias Agopian
994e7619a6 fix ScreenshotsOfProtectedBuffersFail
- put the test window at the front most screen position
- use RGBA_8888 which is a mandatory format
- handle devices that don't support the protected usage flags

Bug: 4950464

Change-Id: I0005fb667cfe094e5978816e2924b294c5ef817e
2011-07-01 15:41:32 -07:00
Fabrice Di Meglio
f03712bf54 Merge "Fix default TextView textDirection heuristic" 2011-07-01 15:35:52 -07:00
Brian Carlstrom
82376c8267 Merge "Build cert chain in KeyChain.getCertificateChain" 2011-07-01 15:31:30 -07:00
Glenn Kasten
03f9435273 Merge "Bug 4571308 Provide correct video frame timestamps" 2011-07-01 15:02:33 -07:00
Mathias Agopian
eec0f7ebac return an error code with gralloc buffer allocation failures
Change-Id: I471e5d37ea7a42fc8a0f93446ee3b4229da37807
2011-07-01 14:53:49 -07:00
Jake Hamby
02cc72c100 Merge "Fix IllegalStateException when A2DP connects before boot completes." 2011-07-01 14:47:50 -07:00
Fabrice Di Meglio
0b28c757ad Fix default TextView textDirection heuristic
- use "first strong" instead of "locale"
- optimize "any rtl" heuristic too
- fix a few wording issues too

Change-Id: I239a11a49a7a6a6d45165f593c96e8b6b84f0661
2011-07-01 14:44:29 -07:00
Brian Carlstrom
db93b78385 Build cert chain in KeyChain.getCertificateChain
Bug: 4970298
Change-Id: Id91391233528edc2a4da5ebe92ec85d381f170de
2011-07-01 14:41:56 -07:00
Gilles Debunne
171c60e81f XmlDocumentProvider moved to the XmlAdapter sample code
Bug 4477831

Related to CL https://android-git.corp.google.com/g/#change,112514

Change-Id: Ib63a0bf5d2a868433748dec1a45576ca2fa18045
2011-07-01 14:30:13 -07:00
Andreas Huber
dfba1773c9 Merge "Charge network traffic to the uid of the process using the MediaPlayer." 2011-07-01 14:28:10 -07:00
Andreas Huber
e02dd02bb8 Merge "Ignore all flush-complete notifications with port == OMX_ALL" 2011-07-01 14:27:37 -07:00
Amith Yamasani
b5760ade49 Merge "Restore some lost space in the SearchView text field in Search Dialog." 2011-07-01 14:20:24 -07:00
Fabrice Di Meglio
0e591ab277 Merge "Add charCount heuristic to TextView textDirection" 2011-07-01 14:15:08 -07:00
Fabrice Di Meglio
8f5026562f Add charCount heuristic to TextView textDirection
- threshold set to 60% (using a constant)
- fix also one issue during layout direction resolution (parent could be null so delay resolution
up to when parent is no more null)

Change-Id: I65f24a297aac6bc0d5d482ee31b55db0b201e5bf
2011-07-01 14:08:19 -07:00
James Dong
5725d40460 Merge "Add extended metadata buffer support by defining different types of metadata buffers" 2011-07-01 14:03:45 -07:00
Amith Yamasani
a40d7ec7ef Restore some lost space in the SearchView text field in Search Dialog.
A defunct invisible drawable was taking up some pixels in the Search Dialog's text field.
Disabled the drawable until the spinner functionality is revived.

Change-Id: Icfcc51d7b1215e54f9e291d0051e8b42c208a725
2011-07-01 13:50:04 -07:00
Brian Carlstrom
f91040e2df Merge "Revert "Add keychain user with special keystore access permissions"" 2011-07-01 13:43:37 -07:00
Justin Ho
21738b9430 Updated Action Bar up affordance and menu button, refresh of ic_menu from designer tree
Adding all xhdpi versions of these assets as well.

Change-Id: Ic2e4738f3fa6105c5182a396b6fa75d386f40402
2011-07-01 13:27:16 -07:00
David Brown
23b444a2e4 Merge "Remove explicit toUpperCase after CountryDetector is fixed to return uppercase region code." 2011-07-01 13:19:37 -07:00
Andreas Huber
603d739b5a Charge network traffic to the uid of the process using the MediaPlayer.
Change-Id: I2bcb54b8232afd3fc7ee16289f37c7a7b3f23067
related-to-bug: 4517282
2011-07-01 13:18:43 -07:00
Andreas Huber
919a7ae9b4 Ignore all flush-complete notifications with port == OMX_ALL
Use of this notification is not consistent across
implementations. We'll drop this notification and rely
on flush-complete notifications on the individual port
indices instead.

Change-Id: I76c0dfdcfc92a7c9acf57abf3027d2638d77efca
2011-07-01 13:13:02 -07:00
Debashish Chatterjee
6bb0705d60 Merge "Cleanup VoicemailContract." 2011-07-01 13:08:45 -07:00
Mike Lockwood
eb26c934a1 Merge "UsbDeviceManager: Reset sys.usb.config if it is "none" at boot" 2011-07-01 12:01:15 -07:00
Mike Lockwood
efc8345369 Merge "UsbService: Use Slog instead of Log, and disable some logging" 2011-07-01 12:00:50 -07:00
Mike Lockwood
54965341b1 Merge "USB: Update strings for USB connected notifications" 2011-07-01 12:00:20 -07:00
Mike Lockwood
de296f6448 UsbDeviceManager: Reset sys.usb.config if it is "none" at boot
This will allow us to recover if we crash while changing USB configurations

Change-Id: I22ba9a1ff0a8bcbfd4a0f18af0c95a3b66b99060
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-01 14:55:23 -04:00
Mike Lockwood
fdc0c2984d UsbService: Use Slog instead of Log, and disable some logging
Change-Id: I094ab99919055848a9fa76363eae6d0df51de9fd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-01 14:55:23 -04:00