54039 Commits

Author SHA1 Message Date
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
Mike Lockwood
d8404d2fdd USB: Update strings for USB connected notifications
We now have different strings depending on the current USB mode.

Change-Id: Icc6392d5700a6fee008b75287d8eb0f06db1d880
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-01 14:55:23 -04:00
Philip Milne
d307878ebc Merge "Support for maximum values in layout GridLayout." 2011-07-01 11:31:46 -07:00
Debashish Chatterjee
f4bf100225 Cleanup VoicemailContract.
Moved constants/methods specific to Voicemails and Status table under
respective classes.

Marked currently used constants as deprecated, which will be deleted
once the apps using it is modified.

Change-Id: I122439c32ac62e9ae83c4c8468f5160a79743335
2011-07-01 19:21:02 +01:00
Philip Milne
48b55244d2 Support for maximum values in layout GridLayout.
A cell's ability to shrink or stretch is now integrated with the
constraints system, which is now supplied with both upper and lower
bounds.

Also:

. Remove package private access (pseudo) annotation
. Remove rowWeight and columnWeight attributes and fields
. Remove code to handle weights

Change-Id: I9e2432101d15466c621f51ae362435051fab5764
2011-07-01 11:08:19 -07:00
Winson Chung
40030c8d4d Merge "Binding Pwr+VolDown to take screenshot." 2011-07-01 10:48:07 -07:00
Winson Chung
9112ec3039 Binding Pwr+VolDown to take screenshot.
Change-Id: I77b018538f6bc870f59df0b5336ba95f4582beec
2011-07-01 10:47:07 -07:00
Amith Yamasani
a4ad22a5de Merge "Reduce some padding in the search dialog to get more text space." 2011-07-01 10:30:00 -07:00
Alex Sakhartchouk
dd79d52e34 Merge "Adding some debug modes to the rs benchmark app." 2011-07-01 10:04:22 -07:00
Teng-Hui Zhu
f17bd97103 Merge "Release the media player when exiting the full screen" 2011-07-01 10:02:27 -07:00
Andreas Huber
091b248538 Merge "Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec." 2011-07-01 09:48:05 -07:00
Andreas Huber
42fb5d64b9 Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec.
Change-Id: Ie03b285265099dbac9b12f3f41d9ad758d0b50ad
2011-07-01 09:28:51 -07:00
Kazuhiro Ondo
647ebb50b1 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
27ac0ac360 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
5367190fdd Merge "Return ERROR_END_OF_STREAM when the input source reaches eos" 2011-07-01 08:35:25 -07:00
Kristian Monsen
5faaadffbf 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
de89a46458 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
08c34c27b6 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 Tinker
73104111d6 Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video."
This reverts commit d63d947d406977c7c307f69369908b4342c98ef3
2011-07-01 07:13:42 -07:00
Steve Block
071970d9d6 Fix WebViewFragment to avoid detroying the WebView too early
We must not call WebView.destroy() until after the WebView has been
removed from the view hierarchy.

Bug: 4974517
Change-Id: I33b3a9d4ec098e2ab50626cb8906da7697ff2a33
2011-07-01 14:10:40 +01:00
Debashish Chatterjee
73f0a3a6bd VoicemailContract API change to add voicemail status table fields.
See design doc:
https://docs.google.com/a/google.com/document/pub?id=1FM2cl7Qqt002m9PahbpxUAJNM8rdH1b08IHePi-qaDA

Change-Id: Ib471f50d32ed77eed45a4e0857e3053be8a6582d
2011-07-01 14:08:06 +01:00
Shaopeng Jia
bc2e82d454 Remove explicit toUpperCase after CountryDetector is fixed to return
uppercase region code.

Change-Id: I111d5792b67eb0e16a7278a731097f305cb9a059
2011-07-01 15:04:50 +02:00
Hung-ying Tyan
8ba4566c01 Do not keep alive for re-established call.
Only need to keep alive for caller in a newly established call.

Change-Id: I36f9d9499c806c8701e3b78555de399b00593be8
2011-07-01 20:26:48 +08:00
Hung-ying Tyan
f89654dd28 Do not hold wifi lock when SIP is also available over mobile network.
Bug: 3111564
Change-Id: Ifc76e5c378d620e40ce4adf6ffa20807e9750fdb
2011-07-01 19:25:46 +08:00
Jeff Brown
cec7ab8e85 Merge "Query input device for initial slot index." 2011-07-01 03:11:20 -07:00
Jeff Brown
2717eff2ac Query input device for initial slot index.
This fixes a problem where touches can get stuck because the
driver and the framework have different ideas of what the
initial slot index is.  The framework assumed it was slot 0
but it could in principle be any slot, such as slot 1.  When
that happened, the framework would start tracking the first
touch as slot 0, but it might never receive an "up" for that slot.

Change-Id: Idaffc4534b275d66b9d4360987b28dc2d0f63218
2011-07-01 02:59:26 -07:00
Chia-chi Yeh
41d1685a22 VPN: integrate legacy VPN.
Change-Id: I00e77664354c05e0edfcd5fb2e3da2ca434ed521
2011-07-01 02:12:06 -07:00
Chia-chi Yeh
8909b10175 VPN: Use List<String> instead for dnsServers and searchDomains.
Change-Id: I5d72c182ad47f59121a04b68ec6c2d164e2d00a8
2011-07-01 01:14:19 -07:00
Chia-chi Yeh
1f7746b39b VPN: rename service(s) to daemon(s) to reduce confusion.
Change-Id: I9739e63c8e41e8b63d024dc4f17283c76bb4ff97
2011-07-01 00:29:06 -07:00
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