Android (Google) Code Review
af9a275a33
am 9181bc9a: Merge change 7079 into donut
...
Merge commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5'
* commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5':
Cleanup of unused enums
2009-07-14 10:50:49 -07:00
Android (Google) Code Review
1a312a647e
am df01d6b5: Merge change 7064 into donut
...
Merge commit 'df01d6b50b4502f12947bf4c6cc733a4a467f682'
* commit 'df01d6b50b4502f12947bf4c6cc733a4a467f682':
Implementing utterance ID callbacks for silence and pre-recorded files
2009-07-14 10:50:32 -07:00
Android (Google) Code Review
9c7cafb382
Merge change 6817
...
* changes:
Fix a problem in VideoView that would cause it to not start playing after prepare.
2009-07-14 10:45:55 -07:00
Android (Google) Code Review
3ca44e2d99
Merge change 7079 into donut
...
* changes:
Cleanup of unused enums
2009-07-14 10:41:14 -07:00
Bjorn Bringert
cfe3a29082
am c1d82e68: Use activity icon when search suggestion icon is missing
...
Merge commit 'c1d82e68eb4aae1b575e82b08e71a87670cc1532'
* commit 'c1d82e68eb4aae1b575e82b08e71a87670cc1532':
Use activity icon when search suggestion icon is missing
2009-07-14 10:21:47 -07:00
Android (Google) Code Review
00066db313
am 3a27b29e: Merge change 7069 into donut
...
Merge commit '3a27b29e41777e58fbcdca440a00676915ebea4f'
* commit '3a27b29e41777e58fbcdca440a00676915ebea4f':
Make VPN connect even when DNS is not present and other fixes.
2009-07-14 10:21:37 -07:00
Android (Google) Code Review
9cf0c475dc
am 8af55ca4: Merge change 7008 into donut
...
Merge commit '8af55ca4dd7eeb098b5c2e69bc7a9171c893269a'
* commit '8af55ca4dd7eeb098b5c2e69bc7a9171c893269a':
Adding Utterance ID to the TtsService.
2009-07-14 10:21:16 -07:00
Android (Google) Code Review
5f4f96e389
am 3139297f: Merge change 7035 into donut
...
Merge commit '3139297f1eda3e34d17a2b182ae5d791da837542'
* commit '3139297f1eda3e34d17a2b182ae5d791da837542':
Fixes #1972593 . Updates AppSecurityPermissions styles in Theme.Light
2009-07-14 10:21:09 -07:00
Android (Google) Code Review
9e1d98a564
Merge change 7064 into donut
...
* changes:
Implementing utterance ID callbacks for silence and pre-recorded files (both generating and playing).
2009-07-14 09:18:46 -07:00
Mathias Agopian
2d939020a4
another attempt to fix the sim
2009-07-14 02:08:27 -07:00
Android (Google) Code Review
f69c364726
Merge change 7069 into donut
...
* changes:
Make VPN connect even when DNS is not present and other fixes.
2009-07-14 01:53:56 -07:00
Hung-ying Tyan
af8dc57ddb
Make VPN connect even when DNS is not present and other fixes.
...
* Changes:
+ As title.
+ Add two new states to VpnState: UNKNOWN and UNUSABLE.
+ Add more debug messages when stopping a service and when DNS being
overridden.
2009-07-14 16:29:22 +08:00
Mathias Agopian
d606003a66
first attempt to fix the sim
2009-07-13 22:58:25 -07:00
Android (Google) Code Review
b8eccd8660
Merge change 6898
...
* changes:
implement Mutex and Condition with pthread instead of calling futex directly.
2009-07-13 21:27:38 -07:00
Android (Google) Code Review
004f16a575
Merge change 7043
...
* changes:
fix [1964315] crash in the surface.cpp while browsing
2009-07-13 18:34:46 -07:00
Mathias Agopian
1499859693
fix [1964315] crash in the surface.cpp while browsing
2009-07-13 18:29:59 -07:00
Android (Google) Code Review
b29d573a26
Merge change 7008 into donut
...
* changes:
Adding Utterance ID to the TtsService.
2009-07-13 18:25:01 -07:00
Android (Google) Code Review
62fae6bed8
Merge change 7035 into donut
...
* changes:
Fixes #1972593 . Updates AppSecurityPermissions styles in Theme.Light
2009-07-13 17:52:59 -07:00
Android (Google) Code Review
179bc7a9f4
Merge change 6812
...
* changes:
Implemented the tracking of the metadata updates.
2009-07-13 16:37:55 -07:00
Android (Google) Code Review
6f700bdb43
Merge change 6787
...
* changes:
AbstractSyncableContentProvider must only call onAccountsChanged with GAIA accounts
2009-07-13 16:35:58 -07:00
Android (Google) Code Review
c1a1309d9f
am c353268c: Merge change 6968 into donut
...
Merge commit 'c353268c20a8ea425ac9f1e328684855cfc805e0'
* commit 'c353268c20a8ea425ac9f1e328684855cfc805e0':
Import new translations
2009-07-13 16:32:17 -07:00
Android (Google) Code Review
ad311a473c
Merge change 6968 into donut
...
* changes:
Import new translations
2009-07-13 16:30:16 -07:00
Android (Google) Code Review
a4b2bec963
Merge change 7007
...
* changes:
Update name getCdmaMIN to getCdmaMin
2009-07-13 16:24:55 -07:00
Android (Google) Code Review
e924e55161
am 35eea54a: (-s ours) Merge change 6935 into donut
...
Merge commit '35eea54a405cfeb88e48fed4bfa59687351c49a0'
* commit '35eea54a405cfeb88e48fed4bfa59687351c49a0':
DO NOT MERGE: backporting from master:
2009-07-13 15:47:23 -07:00
Android (Google) Code Review
20df288bd7
Merge change 6935 into donut
...
* changes:
DO NOT MERGE: backporting from master:
2009-07-13 15:44:57 -07:00
Android (Google) Code Review
ce33d96ec7
Merge change 6963
...
* changes:
Block incoming SMS in CDMA Emergency Callback Mode
2009-07-13 15:26:22 -07:00
Android (Google) Code Review
827b3ef2dc
Merge change 6960
...
* changes:
Don't NPE if a restore session is requested for an invalid transport
2009-07-13 15:18:51 -07:00
Mathias Agopian
ec0f1f6720
implement Mutex and Condition with pthread instead of calling futex directly.
...
internally pthread uses futex. the implementation consists of simple inlines
there are no implementation files anymore.
2009-07-13 15:14:23 -07:00
Android (Google) Code Review
98b34b3fff
Merge change 6569
...
* changes:
modify Gservices setting for push messaging registration url.
2009-07-13 14:30:41 -07:00
Android (Google) Code Review
7097d971f6
Merge change 6934
...
* changes:
Add Get-CDMASubscription in EVENT_RUIM_READY.
2009-07-13 14:27:25 -07:00
Android (Google) Code Review
0c584188b1
am 334b861e: Merge change 6925 into donut
...
Merge commit '334b861e3339bc7189372f790d0c0e2043d160a3'
* commit '334b861e3339bc7189372f790d0c0e2043d160a3':
Propagate optional audio stream type to the creation of the audio resources
2009-07-13 13:37:56 -07:00
Android (Google) Code Review
09d8837883
Merge change 6925 into donut
...
* changes:
Propagate optional audio stream type to the creation of the audio resources to enable the playback of TTS content on various stream types.
2009-07-13 13:36:37 -07:00
jsh
1138722660
am aa459370: Update javadoc for TelephonyManager.getNetwork* for CDMA.
...
Merge commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f'
* commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f':
Update javadoc for TelephonyManager.getNetwork* for CDMA.
2009-07-13 13:32:34 -07:00
Suchi Amalapurapu
c4646ee911
am ea5c0444: When apps switch between system and data partition the code and resource paths should also be updated based on which version is being picked up. update the code and resource paths when a path change is detected
...
Merge commit 'ea5c044412f6853d686e93b8bef07f4729b6ad26'
* commit 'ea5c044412f6853d686e93b8bef07f4729b6ad26':
When apps switch between system and data partition the code and
2009-07-13 11:20:29 -07:00
Dave Sparks
fb68f9800f
am c4ca4206: Fix build
...
Merge commit 'c4ca420625183a8efa619e06287b47f3d2e72283'
* commit 'c4ca420625183a8efa619e06287b47f3d2e72283':
Fix build
2009-07-13 09:45:19 -07:00
Android (Google) Code Review
b1dd10e2cd
am 6cdc4f9c: Merge change 6880 into donut
...
Merge commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3'
* commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3':
Fixing TTS breakage.
2009-07-13 09:27:44 -07:00
Android (Google) Code Review
6b97757964
Merge change 6880 into donut
...
* changes:
Fixing TTS breakage.
2009-07-13 09:25:20 -07:00
Joe Onorato
736d5a6a13
am 186b3eae: Make the backup manager do nothing when backup is turned off.
...
Merge commit '186b3eaedd058baa9dfbfe17a3c3fc2b5fa44e3e'
* commit '186b3eaedd058baa9dfbfe17a3c3fc2b5fa44e3e':
Make the backup manager do nothing when backup is turned off.
2009-07-13 09:14:52 -07:00
Android (Google) Code Review
0f973f3cb5
am 5c04841e: Merge change 6912 into donut
...
Merge commit '5c04841ee36ba93c9a8998e7668320d74adc3d22'
* commit '5c04841ee36ba93c9a8998e7668320d74adc3d22':
JavaDoc for SearchableInfo.getActivityMetaData()
2009-07-13 09:06:16 -07:00
Android (Google) Code Review
d64a81d1e7
am 8ceba810: Merge change 6871 into donut
...
Merge commit '8ceba810d5a5831544790e18ed05eeed7e2fa994'
* commit '8ceba810d5a5831544790e18ed05eeed7e2fa994':
Use SetByteArrayRegion to minimize copy overhead and JNI calls.
2009-07-13 09:06:12 -07:00
Android (Google) Code Review
c604a21e31
Merge change 6918
...
* changes:
Make the backup manager do nothing when backup is turned off.
2009-07-13 09:04:50 -07:00
Android (Google) Code Review
bea64399e1
Merge change 6912 into donut
...
* changes:
JavaDoc for SearchableInfo.getActivityMetaData()
2009-07-13 09:04:25 -07:00
Android (Google) Code Review
77a484b197
Merge change 6871 into donut
...
* changes:
Use SetByteArrayRegion to minimize copy overhead and JNI calls.
2009-07-13 09:04:01 -07:00
Android (Google) Code Review
a70d85edb5
am 506dd3fc: Merge change 6907 into donut
...
Merge commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf'
* commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf':
Initialize searchmanager on demand
2009-07-13 06:13:06 -07:00
Android (Google) Code Review
484686b302
Merge change 6907 into donut
...
* changes:
Initialize searchmanager on demand
2009-07-13 06:11:08 -07:00
Hung-ying Tyan
1a6f8b169e
am c22ce6a7: Remove host IP from related VPN classes.
...
Merge commit 'c22ce6a738bbd757c71f8778defb015ea81ab33c'
* commit 'c22ce6a738bbd757c71f8778defb015ea81ab33c':
Remove host IP from related VPN classes.
2009-07-13 04:35:29 -07:00
Android (Google) Code Review
df46163cfe
am 575eb928: Merge change 6883 into donut
...
Merge commit '575eb92885c150ccbfa257c9a6fdcb19a04baf0c'
* commit '575eb92885c150ccbfa257c9a6fdcb19a04baf0c':
Add error code in vpn connectivity broadcast.
2009-07-12 23:43:21 -07:00
Android (Google) Code Review
10e850975c
Merge change 6883 into donut
...
* changes:
Add error code in vpn connectivity broadcast.
2009-07-12 23:40:46 -07:00
Hung-ying Tyan
ec0fc87a0a
Add error code in vpn connectivity broadcast.
...
* Changes
+ Add VpnConnectingError.java.
+ Broadcast the error returned by daemons.
+ Add error codes to VpnManager.java.
+ Add error code to VpnManager.broadcastConnectivity().
Patch Set 4:
+ Replace VPN_UP with VPN_STATUS in response to ip-up-vpn changes.
+ Make VpnServiceBinder a foreground service so that it won't be
interrupted by the system.
Patch Set 5:
+ Remove the support of returning 0 from daemon and restart socket in
AndroidServiceProxy.
2009-07-13 13:11:36 +08:00
Mitsuru Oshima
c3771f9f42
am ba3ba579: * Use cached resources for widgets
...
Merge commit 'ba3ba57921dedaaef669719c0359c0caf60e008b'
* commit 'ba3ba57921dedaaef669719c0359c0caf60e008b':
* Use cached resources for widgets
2009-07-12 21:56:30 -07:00