ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
2,612 Commits 2 Branches 0 Tags 54 MiB
1a6f8b169e
Commit Graph

2612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean-Michel Trivi
6d269be7f3 am d48ca22b: Use the TTS queue constants in the TTS service as defined in the TextToSpeech class. 
Merge commit 'd48ca22b9fcea38b112aedb4126f3d030594af47'

* commit 'd48ca22b9fcea38b112aedb4126f3d030594af47':
  Use the TTS queue constants in the TTS service as defined in the
 2009-07-10 11:20:27 -07:00
Android (Google) Code Review
9470c78ba9 Merge change 6783 
* changes:
  turn restore back in in eclair
 2009-07-10 11:05:45 -07:00
Android (Google) Code Review
f4f368fd0a Merge change 6735 
* changes:
  WifiService: Remove hidden AP counting logic for active/passive scanning mode.
 2009-07-10 10:59:45 -07:00
Android (Google) Code Review
733422dbec am 38645ee6: (-s ours) Merge change 6759 into donut 
Merge commit '38645ee6d61368f59b2d83256f2612bdaa38ff49'

* commit '38645ee6d61368f59b2d83256f2612bdaa38ff49':
  Do not merge
 2009-07-10 09:59:01 -07:00
Android (Google) Code Review
a81d4d80d6 Merge change 6764 
* changes:
  Undo the changes accidentally merged from Donut
 2009-07-10 09:57:57 -07:00
Android (Google) Code Review
e0cfa503c3 am d2cad295: Merge change 6734 into donut 
Merge commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71'

* commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71':
  Adding tagging to utterances to track which app said what.
 2009-07-10 09:57:38 -07:00
Android (Google) Code Review
b8232aeb77 Merge change 6759 into donut 
* changes:
  Do not merge
 2009-07-10 09:57:24 -07:00
Android (Google) Code Review
4030d85f86 Merge change 6734 into donut 
* changes:
  Adding tagging to utterances to track which app said what.
 2009-07-10 09:47:37 -07:00
Bjorn Bringert
bb9abf1828 am 0e01ea41: Deprecate DialogInterface methods in SearchManager 
Merge commit '0e01ea41b215941128a4ea8dee454e6b35a4e798'

* commit '0e01ea41b215941128a4ea8dee454e6b35a4e798':
  Deprecate DialogInterface methods in SearchManager
 2009-07-10 00:50:45 -07:00
Android (Google) Code Review
829cb1304b Merge change 6742 
* changes:
  fix [1969200] Uninitialized double passed to Math.sqrt()
 2009-07-09 22:12:36 -07:00
Mathias Agopian
80d7a764fc fix [1969200] Uninitialized double passed to Math.sqrt() 2009-07-09 22:11:57 -07:00