Hung-ying Tyan
dbd8e0c32a
Merge "Do not hold wifi lock when SIP is also available over mobile network."
2011-07-03 20:01:55 -07:00
Hung-ying Tyan
8292a42dad
Merge "Do not keep alive for re-established call."
2011-07-03 19:53:35 -07:00
Chia-chi Yeh
a20e76abb1
Merge "Add CleanSpec.mk for change If98e456e779f8e97f562d99c57d909b1f5d9db55."
2011-07-03 17:09:41 -07:00
Chia-chi Yeh
63ddfd9e19
VPN: remove the old VpnService.
...
Now VPN is (kind of) integrated into ConnectivityService.
Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55
2011-07-02 20:21:09 -07:00
Chia-chi Yeh
4c868b23b7
Merge "VPN: export legacy VPN in IConnectivityManager."
2011-07-02 17:28:45 -07:00
Chia-chi Yeh
938e00a4a9
Merge "Promote ip-up-vpn into the framework."
2011-07-02 16:54:37 -07:00
Chia-chi Yeh
7c1771c05f
Merge "VPN: merge JNI methods."
2011-07-02 16:37:25 -07:00
Chia-chi Yeh
53f1b567a8
Merge "VPN: give legacy VPN a fake package name."
2011-07-02 03:19:48 -07:00
Jeff Brown
2baa5a1735
Merge "Drop obsolete touch screen hacks."
2011-07-01 19:25:46 -07:00
Jeff Brown
35a8602302
Merge "Workaround apps that make assumptions about pointer ids."
2011-07-01 19:17:21 -07:00
Dianne Hackborn
ea5361f6d9
Merge "Don't crash when the load average service is started."
2011-07-01 19:09:03 -07:00
Jeff Brown
2e0b543c09
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
975749c55e
Merge "When removing a task, also kill its processes."
2011-07-01 17:13:40 -07:00
Fabrice Di Meglio
69df051a8b
Merge "Fix default TextView textDirection heuristic"
2011-07-01 15:35:52 -07:00
Brian Carlstrom
d9c0cc2fe7
Merge "Build cert chain in KeyChain.getCertificateChain"
2011-07-01 15:31:30 -07:00
Glenn Kasten
530035abca
Merge "Bug 4571308 Provide correct video frame timestamps"
2011-07-01 15:02:33 -07:00
Jake Hamby
05432c6df4
Merge "Fix IllegalStateException when A2DP connects before boot completes."
2011-07-01 14:47:50 -07:00
Andreas Huber
0947307a58
Merge "Charge network traffic to the uid of the process using the MediaPlayer."
2011-07-01 14:28:10 -07:00
Andreas Huber
610ca70888
Merge "Ignore all flush-complete notifications with port == OMX_ALL"
2011-07-01 14:27:37 -07:00
Amith Yamasani
f6f17b66c3
Merge "Restore some lost space in the SearchView text field in Search Dialog."
2011-07-01 14:20:24 -07:00
Fabrice Di Meglio
579fdd0906
Merge "Add charCount heuristic to TextView textDirection"
2011-07-01 14:15:08 -07:00
James Dong
b3ee1178f3
Merge "Add extended metadata buffer support by defining different types of metadata buffers"
2011-07-01 14:03:45 -07:00
Brian Carlstrom
64db2ebe38
Merge "Revert "Add keychain user with special keystore access permissions""
2011-07-01 13:43:37 -07:00
David Brown
277950e699
Merge "Remove explicit toUpperCase after CountryDetector is fixed to return uppercase region code."
2011-07-01 13:19:37 -07:00
Debashish Chatterjee
2462b4f56f
Merge "Cleanup VoicemailContract."
2011-07-01 13:08:45 -07:00
Mike Lockwood
ce360f991f
Merge "UsbDeviceManager: Reset sys.usb.config if it is "none" at boot"
2011-07-01 12:01:15 -07:00
Mike Lockwood
114a4ddd0d
Merge "UsbService: Use Slog instead of Log, and disable some logging"
2011-07-01 12:00:50 -07:00
Mike Lockwood
2047a8fbbc
Merge "USB: Update strings for USB connected notifications"
2011-07-01 12:00:20 -07:00
Philip Milne
fa98470a7b
Merge "Support for maximum values in layout GridLayout."
2011-07-01 11:31:46 -07:00
Winson Chung
e84bd74f0c
Merge "Binding Pwr+VolDown to take screenshot."
2011-07-01 10:48:07 -07:00
Amith Yamasani
bf9a9e0384
Merge "Reduce some padding in the search dialog to get more text space."
2011-07-01 10:30:00 -07:00
Alex Sakhartchouk
7d9903c1d9
Merge "Adding some debug modes to the rs benchmark app."
2011-07-01 10:04:22 -07:00
Teng-Hui Zhu
9b2403c5ef
Merge "Release the media player when exiting the full screen"
2011-07-01 10:02:27 -07:00
Andreas Huber
8ec15260bb
Merge "Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec."
2011-07-01 09:48:05 -07:00
Kazuhiro Ondo
45cbfee346
am c0c07d4f: am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting
...
* commit 'c0c07d4ff689a6050ef368933b9c53283a01520a':
DataConnection was cleaned up too early if it's already disconnecting
2011-07-01 09:21:22 -07:00
Edwin Wong
9ae9aedf59
Merge "Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video.""
2011-07-01 08:52:28 -07:00
James Dong
55bfb8900c
Merge "Return ERROR_END_OF_STREAM when the input source reaches eos"
2011-07-01 08:35:25 -07:00
Kristian Monsen
119fdece20
Merge changes I7e8401a4,I412ddf36
...
* changes:
Merge Chromium at r11.0.696.0: New autofill strings
Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
2011-07-01 08:04:11 -07:00
Robert Greenwalt
b5574340ee
am 672c468c: am a2267451: Don\'t ever report a null ServiceState
...
* commit '672c468c453ea0b5195f42150d6772ac33d1f7e3':
Don't ever report a null ServiceState
2011-07-01 07:56:38 -07:00
Conley Owens
dc3d5b6777
am e0009bb0: am 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
...
* commit 'e0009bb0b700dcfeba3ff77f8c33113499674432':
Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
2011-07-01 07:56:15 -07:00
Jeff Brown
f2278d304e
Merge "Query input device for initial slot index."
2011-07-01 03:11:20 -07:00
Chia-chi Yeh
8ad8749b81
Merge "VPN: refactor a little bit for the upcoming integration of legacy VPN."
2011-06-30 23:27:53 -07:00
Jeff Sharkey
7fb210728e
Merge "Migrate bandwidth control to NMS, omit history."
2011-06-30 23:09:51 -07:00
Chia-chi Yeh
73af810c7c
Merge "VPN: correct the netmask for IPv4."
2011-06-30 23:02:29 -07:00
Brian Carlstrom
e0cd5dc3dc
Revert "Add keychain user with special keystore access permissions"
...
This reverts commit 8c2a1a90a81f04573bfa578eab32f5fd4a30eafb.
Conflicts:
cmds/keystore/keystore.c
Bug:4970237
Change-Id: I626023d695becfada47e5f319b18e0889b766563
2011-06-30 22:59:13 -07:00
Dan Morrill
5affe048ba
Merge "Add a global-search column for last access."
2011-06-30 22:37:45 -07:00
Hung-ying Tyan
082b29d1c2
Merge "Synchronize SipWakeupTimer.onReceive()"
2011-06-30 20:28:58 -07:00
Adam Powell
f6a62dc323
Merge "Add API to report the presence of a permanent menu key on the device."
2011-06-30 20:23:52 -07:00
Jeff Hamilton
60c64e2730
Merge "Improve Tag.toString()."
2011-06-30 18:38:35 -07:00
Pannag Sanketi
19e0a8bfe9
Merge "Minor fix in SurfaceTexture"
2011-06-30 18:38:18 -07:00