Commit Graph

36396 Commits

Author SHA1 Message Date
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
Kazuhiro Ondo
e0b3a8bb38 am 0562efd1: am f3f9967e: Make sure to update data availability in call setup capable triggers.
* commit '0562efd1ea970ded01b1b47bbce790a269a60c45':
  Make sure to update data availability in call setup capable triggers.
2011-06-30 18:23:42 -07:00
Robert Greenwalt
d6430eb97d am 8745caaf: am dbcc57c6: Fix dependencyMet issues regarding hipri APN.
* commit '8745caaf25e9f2d50125a793b7d02fc4522ba4ba':
  Fix dependencyMet issues regarding hipri APN.
2011-06-30 18:23:34 -07:00
Svetoslav Ganov
0593b91291 Merge "Crash observed when attempted to uncheck the Accessibility option." 2011-06-30 18:07:11 -07:00
Brian Carlstrom
269f4182ae Merge "Add body id to ssl_certificate layout" 2011-06-30 18:06:12 -07:00
Kazuhiro Ondo
d15f60005d am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting
* commit '012b86d4294182497c4c72a318e0f4cbe5075a44':
  DataConnection was cleaned up too early if it's already disconnecting
2011-06-30 18:00:06 -07:00
Svetoslav Ganov
b9a2ce7626 Merge "Fix crash at boot." 2011-06-30 17:18:47 -07:00
Andreas Huber
091ab30729 Merge "Seeking/duration in HLS content is based on the individual segments' duration" 2011-06-30 16:58:41 -07:00
Mathias Agopian
5cd338365f Merge "fix screen on/off animation, which was flipped" 2011-06-30 16:25:25 -07:00
Mathias Agopian
2dbf9fffb2 fix screen on/off animation, which was flipped
Bug: 4673549
Change-Id: Ia9766754687b89c1ee24b2dbe918c11290ebe038
2011-06-30 16:23:39 -07:00
Jim Miller
ea030363d3 Merge "Fix 4691563: Polish MultiWaveView experience in LockScreen and InCall screen Better activation experience: - Hold off on switching out targets until current animation has finished. - Hide unselected targets when a target is selected. Code simplification: - Use explicit callback objects to handle animation updates instead of having MWV implement the interface. - More compact chevron-loading code. - Don't use animations for properties that need to change immediately." 2011-06-30 15:56:47 -07:00
Pannag Sanketi
292a31a4c2 Minor fix in SurfaceTexture
Change-Id: Ic859715becf3e6d5107bd8beb8c577034d00ec52
2011-06-30 15:41:19 -07:00
Robert Greenwalt
65e55863d5 am a2267451: Don\'t ever report a null ServiceState
* commit 'a2267451ddf91cc330f4c283e86811e38328915b':
  Don't ever report a null ServiceState
2011-06-30 14:50:32 -07:00
Svetoslav Ganov
eaf33439b6 Merge "Updating accessibility documentation." 2011-06-30 14:19:02 -07:00
Adam Powell
4d97e260de Merge "Fix some issues with the action bar and action modes." 2011-06-30 14:06:33 -07:00
Dianne Hackborn
a6d2c2dbb7 Merge "Fix issue #4902856: Don't let apps register non-explicit PendingIntents" 2011-06-30 13:57:27 -07:00
Shimeng (Simon) Wang
5e5d232ecb Merge "Keep initial zoom overview for non-standard load." 2011-06-30 13:55:10 -07:00
RoboErik
1f40d19013 Merge "API updates to respond to comments" 2011-06-30 13:30:15 -07:00