54008 Commits

Author SHA1 Message Date
Chia-chi Yeh
383e052472 VPN: fix the build.
Change-Id: Ibeaa067cf95636e09746d16f402c78c99d7cb681
2011-07-01 00:13:25 -07:00
Chia-chi Yeh
5db03df1ff VpnDialogs: prepare for the usages of legacy VPN.
- Use PendingIntent to start activities.
- Handle configs without package names.
- Switch to system UID.

Change-Id: Ia78112a97e3628b603d9e059705e32694ebe142b
2011-07-01 00:10:32 -07:00
Chia-chi Yeh
2e46061cd2 Merge "VPN: refactor a little bit for the upcoming integration of legacy VPN." 2011-06-30 23:27:53 -07:00
Chia-chi Yeh
a4b87b5e98 VPN: refactor a little bit for the upcoming integration of legacy VPN.
Change-Id: I0fe0dffe59d8d9c9a0fdd05e07b07aa6c8da0a80
2011-06-30 23:21:55 -07:00
Jeff Sharkey
072d39e079 Merge "Migrate bandwidth control to NMS, omit history." 2011-06-30 23:09:51 -07:00
Chia-chi Yeh
ac813bda73 Merge "VPN: correct the netmask for IPv4." 2011-06-30 23:02:29 -07:00
Chia-chi Yeh
9c0835fd72 VPN: correct the netmask for IPv4.
Change-Id: Id6e955af129d55120676d0d9cfe75388671aa367
2011-06-30 22:59:18 -07:00
Brian Carlstrom
f4b92ec567 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
5093d3ee99 Merge "Add a global-search column for last access." 2011-06-30 22:37:45 -07:00
Hung-ying Tyan
1d65fcdc00 Merge "Synchronize SipWakeupTimer.onReceive()" 2011-06-30 20:28:58 -07:00
Adam Powell
eefc908921 Merge "Add API to report the presence of a permanent menu key on the device." 2011-06-30 20:23:52 -07:00
Adam Powell
8c47062522 Add API to report the presence of a permanent menu key on the device.
Action bar now uses this to determine whether to show an overflow menu.

Change-Id: Ife4f724d02bbc0d9d86d94740c85299f6dacae91
2011-06-30 19:40:54 -07:00
Jake Hamby
24ca01d262 Fix IllegalStateException when A2DP connects before boot completes.
Under some circumstances, the broadcast intent
BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED can be sent before
the system is ready, triggering an IllegalStateException,
"Cannot broadcast before boot completed" and runtime crash.

Fixed the race condition by adding the
Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT flag
to the broadcast intent. All system receivers of this intent
are registered with registerReceiver() rather than as components in
the manifest, so nothing should change in the event that the A2DP
connection state change is broadcast before boot completion.

Any apps that define a receiver for either
BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED or
BluetoothA2dp.ACTION_PLAYING_STATE_CHANGED in their manifest
will not receive these broadcasts in the case where they are sent
before the system has finished booting. Normally, user applications
should not care about these events anyway and should let the audio
manager take care of audio routing on their behalf.

In the event that an app does care about A2DP state changes, it
should either register for these intents with registerReceiver(),
or it can add an intent filter for ACTION_BOOT_COMPLETED and
test the state of Bluetooth and A2DP at that time. Apps which
care about the state of the Bluetooth adapter should do this also,
because BluetoothAdapter.ACTION_STATE_CHANGED is already being sent
with FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT.

Bug: 4982088
Change-Id: I10e55713f9d07d6dc88b4480b45b1aeb3aaf170b
2011-06-30 19:40:21 -07:00
Amith Yamasani
0b5620907f Reduce some padding in the search dialog to get more text space.
Change-Id: I7a2327fcb511c28dff705332c8b7b2ea26ee97e6
2011-06-30 19:10:42 -07:00
Jeff Hamilton
748d9f2fe4 Merge "Improve Tag.toString()." 2011-06-30 18:38:35 -07:00
Pannag Sanketi
ea458f190b Merge "Minor fix in SurfaceTexture" 2011-06-30 18:38:18 -07:00
Kazuhiro Ondo
ce43bc4858 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
7675faa70d 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
0e0c204391 Merge "Crash observed when attempted to uncheck the Accessibility option." 2011-06-30 18:07:11 -07:00
Brian Carlstrom
77dd02df71 Merge "Add body id to ssl_certificate layout" 2011-06-30 18:06:12 -07:00
Brian Carlstrom
2ddef21f6e Add body id to ssl_certificate layout
Change-Id: I81d6d0a9fb8fd8a97db1c667e2dc245fba584d15
2011-06-30 18:04:26 -07:00
Svetoslav Ganov
ce5ee2dc8d Crash observed when attempted to uncheck the Accessibility option.
1. Accessibility events for change in the window content are sent
   with a delay and code performing the send does not check the
   accessibilitys state before sending the event.

bug:4980754

Change-Id: Ice68037ebab9c5dcd0dece927765585e13959c0c
2011-06-30 18:04:01 -07:00
Kazuhiro Ondo
c0c07d4ff6 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
Alex Sakhartchouk
46bd32ece2 Adding some debug modes to the rs benchmark app.
Change-Id: I6b957d93e0233ed268403dcdb14f4cf4cff29804
2011-06-30 17:59:55 -07:00
Kazuhiro Ondo
012b86d429 DataConnection was cleaned up too early if it's already disconnecting
Fix one logic failure introduced in patch for bug 4901019.

Bug: 4970726
Change-Id: Ifc4071b1cbf0c19fbd8356d7dcc16f9df39d4b54
2011-06-30 17:26:54 -07:00
Svetoslav Ganov
0916350cef Merge "Fix crash at boot." 2011-06-30 17:18:47 -07:00
Dianne Hackborn
2666ff22d6 Fix crash at boot.
Change-Id: If33bfa7decd3409d16ddb1e0da12a6d4fe1394d4
2011-06-30 17:16:41 -07:00
Andreas Huber
16efb101bd Merge "Seeking/duration in HLS content is based on the individual segments' duration" 2011-06-30 16:58:41 -07:00
Andreas Huber
e9a4188119 Seeking/duration in HLS content is based on the individual segments' duration
not target-duration.

Change-Id: I294097daa84c25e4084a6fc4ea80e39a543f3d10
related-to-bug: 4983285
2011-06-30 16:52:33 -07:00
Teng-Hui Zhu
b1c2c1e3c7 Release the media player when exiting the full screen
Once we switch out from full screen mode, the player will be re-created for the
next video, we should release the sources as early as possible.

bug:4332676
Change-Id: I4c26523b3600d3100f81e422979236fca57beb7c
2011-06-30 16:44:47 -07:00
Mathias Agopian
9c902c1aa3 Merge "fix screen on/off animation, which was flipped" 2011-06-30 16:25:25 -07:00
Mathias Agopian
753db22423 fix screen on/off animation, which was flipped
Bug: 4673549
Change-Id: Ia9766754687b89c1ee24b2dbe918c11290ebe038
2011-06-30 16:23:39 -07:00
Jim Miller
d0c18aabac 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
Jeff Sharkey
350083e36b Migrate bandwidth control to NMS, omit history.
Both stats and policy make NMS calls that depend on bandwidth control
being enabled, so move enable/disable into NMS and drop calls when
disabled.  This avoids throwing heavy ISE exceptions when disabled.

Only include recent data when writing NetworkStatsHistory as part of
dumpsys call.  Introduce manual poll event for Settings UI.

Bug: 4982115, 4770435, 4515856
Change-Id: I257820b057af2f0f99c736fb4f61e55b9fdc3e66
2011-06-30 15:47:51 -07:00
Jim Miller
4dfecf55c1 Fix runtime reboot loop.
Change-Id: Ib0614e64e81e376fdbbe7c42a5e4aa8fb9c88ce9
2011-06-30 15:45:35 -07:00
Pannag Sanketi
c9ec69eb6f Minor fix in SurfaceTexture
Change-Id: Ic859715becf3e6d5107bd8beb8c577034d00ec52
2011-06-30 15:41:19 -07:00
Jeff Hamilton
8856c4278d Improve Tag.toString().
Change-Id: Iea254201d04dc45bc94c237aa4a57da096c5f134
2011-06-30 17:35:05 -05:00
Robert Greenwalt
672c468c45 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
Dianne Hackborn
3f75676849 Fix the build.
Change-Id: Ia8064fe32319452565ef7dfe515b2a2fc5bc79c4
2011-06-30 14:46:46 -07:00
Jim Miller
1c8d207201 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.

Other minor timing tweaks.

Change-Id: I328533e8ab7b4c69c7ba51c8c55002765dcbbd46
2011-06-30 14:30:37 -07:00
Svetoslav Ganov
1e75fbd8fe Merge "Updating accessibility documentation." 2011-06-30 14:19:02 -07:00
Svetoslav Ganov
38e8b4e5bc Updating accessibility documentation.
Change-Id: Ice8cf9ac6918b3bfa553776c68d4619fa6559cf8
2011-06-30 14:18:34 -07:00
Adam Powell
43b944f19d Merge "Fix some issues with the action bar and action modes." 2011-06-30 14:06:33 -07:00
Dianne Hackborn
e6b3af24c4 Merge "Fix issue #4902856: Don't let apps register non-explicit PendingIntents" 2011-06-30 13:57:27 -07:00
Adam Powell
f6ce6a9bac Fix some issues with the action bar and action modes.
Fix bug 4976004 - bad title measurement for split action modes

Fix bug 4902960 - action modes leaving a hidden action bar in a bad state

Sync with design for the behavior of various permutations of action
bar configuration + modes.

Change-Id: Id75f6b5911b761fabc5fef2cc2600ce197cf9a92
2011-06-30 13:55:19 -07:00
Shimeng (Simon) Wang
56528a3546 Merge "Keep initial zoom overview for non-standard load." 2011-06-30 13:55:10 -07:00
Shimeng (Simon) Wang
72a1d2e138 Keep initial zoom overview for non-standard load.
In case of non-standard load such as reload, currently the ZoomManager's
onFirstLayout will not be triggered, hence initial zoom overview will not
be set.

This change provides a fix to set initial zoom overview in case of
non-standard load for the new picture after first layout.

issue: 4975315
Change-Id: If2ba3e472f2bb7b6fc4c52024d18a66dc1e41a23
2011-06-30 13:36:53 -07:00
RoboErik
5612b3d125 Merge "API updates to respond to comments" 2011-06-30 13:30:15 -07:00
Fabrice Di Meglio
fe8b06cfb4 Merge "Support control of text alignment." 2011-06-30 13:11:50 -07:00
RoboErik
083cd2dfeb API updates to respond to comments
Change-Id: I58597b722fc0c39da53570a45c859372bf4c3782
2011-06-30 13:09:33 -07:00