Commit Graph

2623 Commits

Author SHA1 Message Date
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
Android (Google) Code Review
a08895f6be am cf29e116: Merge change 6867 into donut
Merge commit 'cf29e116129f38309c18ba14b9893b079a712289'

* commit 'cf29e116129f38309c18ba14b9893b079a712289':
  CLOSE_SYSTEM_DIALOGS can't be protected.
2009-07-12 21:56:02 -07:00
Android (Google) Code Review
fc11572a39 am f6c96839: Merge change 6850 into donut
Merge commit 'f6c968395f9c78552763e8f2994a57cf5c6bc0c0'

* commit 'f6c968395f9c78552763e8f2994a57cf5c6bc0c0':
  Extra parameters for sendBurstDtmf.
2009-07-12 21:55:54 -07:00
Mathias Agopian
724af29314 Merge commit 'e4bd6e7e' into manualmerge 2009-07-12 21:49:18 -07:00
Android (Google) Code Review
b2cfccd3b3 Merge change 6890
* changes:
  CDMA: Add Network ID and System ID to CdmaCellLocation.
2009-07-12 11:38:41 -07:00
Android (Google) Code Review
e343c24b20 am 086bd7fe: Merge change 6846 into donut
Merge commit '086bd7fed122f636e210b03eb114051a489f347b'

* commit '086bd7fed122f636e210b03eb114051a489f347b':
  Avoid memcpy's by using GetPrimitiveArrayCritical.
2009-07-12 06:06:54 -07:00
Android (Google) Code Review
a4b456430c am 1c9fb40c: Merge change 6845 into donut
Merge commit '1c9fb40cb6dbfeee58c41a43852c5b94a1b83613'

* commit '1c9fb40cb6dbfeee58c41a43852c5b94a1b83613':
  Use MeasureSpec.getWidth instead of default display in lock pattern widget.
2009-07-12 06:06:49 -07:00
Android (Google) Code Review
1316f368f5 am 2d791055: Merge change 6820 into donut
Merge commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7'

* commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7':
  Fixed NPE bugs in Uri. Fixes internal issue #1724719.
2009-07-12 06:06:31 -07:00
Android (Google) Code Review
b6ce346bcb am 7cd43797: Merge change 6806 into donut
Merge commit '7cd43797ae41406792f70a5623bb6d207e575526'

* commit '7cd43797ae41406792f70a5623bb6d207e575526':
  Add CLDR data files for Norway and Croatia.
2009-07-12 06:06:25 -07:00
Satish Sampath
e5ed5f24a2 am b1665f2e: Fix regression in handling the \'Go\' button
Merge commit 'b1665f2e15439f693b1ef75cb1c07593f99edde7'

* commit 'b1665f2e15439f693b1ef75cb1c07593f99edde7':
  Fix regression in handling the 'Go' button
2009-07-12 06:06:21 -07:00
Android (Google) Code Review
6be1cf285e am a11fe86d: Merge change 6813 into donut
Merge commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93'

* commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93':
  Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.
2009-07-12 06:06:08 -07:00
Android (Google) Code Review
344a58db23 am 59d299ce: Merge change 6789 into donut
Merge commit '59d299ce8d66f6f3091fca33d3741c0b24d678f6'

* commit '59d299ce8d66f6f3091fca33d3741c0b24d678f6':
  Add support in TextToSpeech for an audio stream type param and utterance
2009-07-12 06:06:03 -07:00
Android (Google) Code Review
675e4d3db9 Merge change 6867 into donut
* changes:
  CLOSE_SYSTEM_DIALOGS can't be protected.
2009-07-10 17:38:29 -07:00
Android (Google) Code Review
5861d72a5c Merge change 6850 into donut
* changes:
  Extra parameters for sendBurstDtmf.
2009-07-10 17:11:01 -07:00
Android (Google) Code Review
8f87f20aa4 Merge change 6862 into donut
* changes:
  fix [1967226] Donut orientation animation (dimming and blur) is slower than Cupcake
2009-07-10 17:10:57 -07:00
Mathias Agopian
5cd5d31d10 fix [1967226] Donut orientation animation (dimming and blur) is slower than Cupcake 2009-07-10 17:00:00 -07:00
Android (Google) Code Review
6ab0e573c0 Merge change 6846 into donut
* changes:
  Avoid memcpy's by using GetPrimitiveArrayCritical.
2009-07-10 16:55:24 -07:00
Android (Google) Code Review
e6ac69fe15 Merge change 6841
* changes:
  resolved conflicts for merge of 889c2d37 to master
2009-07-10 16:46:26 -07:00
Android (Google) Code Review
8e83ff2a8a Merge change 6823
* changes:
  wifi: Keep the WLAN network interface up whenever wifi is enabled.
2009-07-10 16:29:20 -07:00
Android (Google) Code Review
37042c30e9 Merge change 6845 into donut
* changes:
  Use MeasureSpec.getWidth instead of default display in lock pattern widget.
2009-07-10 16:28:03 -07:00
Dianne Hackborn
93e55b499b resolved conflicts for merge of 889c2d37 to master 2009-07-10 16:05:59 -07:00
Android (Google) Code Review
0e6a5c5c7f Merge change 6827
* changes:
  resolved conflicts for merge of ad94a983 to master
2009-07-10 15:17:33 -07:00
Android (Google) Code Review
26b4cbd12d Merge change 6820 into donut
* changes:
  Fixed NPE bugs in Uri. Fixes internal issue #1724719. Modified getQueryParameter() to use the encoded query string. Fixes internal issue #1749094.
2009-07-10 15:12:57 -07:00
Android (Google) Code Review
0918b5016e Merge change 6806 into donut
* changes:
  Add CLDR data files for Norway and Croatia.
2009-07-10 14:42:41 -07:00
Android (Google) Code Review
2be78efbe5 Merge change 6814
* changes:
  Change 107 and 146 from partner repo.
2009-07-10 14:19:58 -07:00
Bob Lee
839a2b73af resolved conflicts for merge of ad94a983 to master 2009-07-10 14:13:37 -07:00
Android (Google) Code Review
1e7931ab9e Merge change 6813 into donut
* changes:
  Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.
2009-07-10 14:12:17 -07:00
Android (Google) Code Review
6c081eb656 Merge change 6789 into donut
* changes:
  Add support in TextToSpeech for an audio stream type param and utterance ID specified as a hashmap param in the synthesis calls. Fix a bug where the cached parameters were not passed to the service when synthesizing to a file.
2009-07-10 13:54:58 -07:00
Android (Google) Code Review
8cceb2e67e Merge change 6766
* changes:
  Don't pass references to temporary objects, and handle the case where we dont have a Surface.
2009-07-10 13:53:35 -07:00
Android (Google) Code Review
25a032b60b Merge change 6805
* changes:
  Changes 203 and 225 from partner repo.
2009-07-10 13:53:17 -07:00
Android (Google) Code Review
4e69b55b3f Merge change 6718 into donut
* changes:
  Fix bug #1873249i: Apps can DoS/brick device
2009-07-10 13:42:51 -07:00
Android (Google) Code Review
a43d929c95 Merge change 6801 into donut
* changes:
  Uri.EMPTY.toString() was returning null due to an initialization order bug. Fixes internal issue #1957015.
2009-07-10 13:40:02 -07:00
Android (Google) Code Review
5692903144 Merge change 6797
* changes:
  rename libsgl/libcorecg to libskia
2009-07-10 12:59:40 -07:00
Mike Reed
e0528ba71b rename libsgl/libcorecg to libskia 2009-07-10 15:33:21 -04:00
Android (Google) Code Review
fac84ff8b3 Merge change 6711
* changes:
  Basic plumbing to retrieve metadata from the native player.
2009-07-10 11:39:29 -07:00