drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,627 Commits 1 Branch 0 Tags
Commit Graph

4627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Huang
1c5e4034e4 modify Gservices setting for push messaging registration url. 2009-07-13 13:37:57 -07:00
jsh
45becf90a8 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
jsh
aa4593706e Update javadoc for TelephonyManager.getNetwork* for CDMA. 
These are unreliable for CDMA, so note it in the javadoc. Also update
for the corresponding TelephonyProperties.
 2009-07-13 12:54:45 -07:00
Suchi Amalapurapu
9ba6998b0b 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
Suchi Amalapurapu
ea5c044412 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
 2009-07-13 10:57:50 -07:00
Dave Sparks
02035132ff am c4ca4206: Fix build 
Merge commit 'c4ca420625183a8efa619e06287b47f3d2e72283'

* commit 'c4ca420625183a8efa619e06287b47f3d2e72283':
  Fix build
 2009-07-13 09:45:19 -07:00
Dave Sparks
c4ca420625 Fix build 2009-07-13 09:42:43 -07:00
Android (Google) Code Review
c8050f8dd7 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
6cdc4f9c00 Merge change 6880 into donut 
* changes:
  Fixing TTS breakage.
 2009-07-13 09:25:20 -07:00
Joe Onorato
b0edcb1229 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
Joe Onorato
186b3eaedd Make the backup manager do nothing when backup is turned off. 2009-07-13 09:08:59 -07:00
Android (Google) Code Review
769ebaaa31 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
e3ea663686 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
3b76d3867f 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
5c04841ee3 Merge change 6912 into donut 
* changes:
  JavaDoc for SearchableInfo.getActivityMetaData()
 2009-07-13 09:04:25 -07:00
Android (Google) Code Review
8ceba810d5 Merge change 6871 into donut 
* changes:
  Use SetByteArrayRegion to minimize copy overhead and JNI calls.
 2009-07-13 09:04:01 -07:00
Joe Onorato
9bcccba6dc Make the backup manager do nothing when backup is turned off. 2009-07-13 09:03:55 -07:00
Bjorn Bringert
13b24b7904 JavaDoc for SearchableInfo.getActivityMetaData() 
See http://b/editIssue?id=1968025
 2009-07-13 15:29:59 +01:00
Android (Google) Code Review
e50f1fa605 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
506dd3fc13 Merge change 6907 into donut 
* changes:
  Initialize searchmanager on demand
 2009-07-13 06:11:08 -07:00
Bjorn Bringert
9bc75cb9c2 Initialize searchmanager on demand 
The initialization of SearchManagerService is delayed, which caused
problems when other services (e.g. GlobalSearch) start up.
This change makes the SearchManagerService components
initialize when they are first needed, or when the server thread
is done with its other processing, whichever comes first.

Fixes http://b/issue?id=1970975
 2009-07-13 13:23:23 +01:00
Hung-ying Tyan
99b490969b 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
Hung-ying Tyan
c22ce6a738 Remove host IP from related VPN classes. 
...since the daemon (racoon) gets the information by itself.
 2009-07-13 19:31:08 +08:00
Android (Google) Code Review
4005648ec7 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
575eb92885 Merge change 6883 into donut 
* changes:
  Add error code in vpn connectivity broadcast.
 2009-07-12 23:40:46 -07:00
Hung-ying Tyan
df1aa3359c 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
a62e3e4d0f 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
602bee5bf2 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
5b93050d48 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
9afcd84fdd Merge commit 'e4bd6e7e' into manualmerge 2009-07-12 21:49:18 -07:00
Android (Google) Code Review
e6f426bbca Merge change 6890 
* changes:
  CDMA: Add Network ID and System ID to CdmaCellLocation.
 2009-07-12 11:38:41 -07:00
Mike Lockwood
a4d2fb5ef6 CDMA: Add Network ID and System ID to CdmaCellLocation. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-07-12 14:33:07 -04:00
Android (Google) Code Review
b4424782f9 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
8a72cd9c7d 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
38a34b2c75 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
5f8e2450eb 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
17596e3adc 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
93153beb3d 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
dcbe8d7055 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
Mitsuru Oshima
ba3ba57921 * Use cached resources for widgets 2009-07-11 21:50:16 -07:00
Charles Chen
630a8de44f Fixing TTS breakage. 2009-07-10 20:58:15 -07:00
Dave Sparks
a95f495f75 Use SetByteArrayRegion to minimize copy overhead and JNI calls. 2009-07-10 18:13:36 -07:00
Android (Google) Code Review
cf29e11612 Merge change 6867 into donut 
* changes:
  CLOSE_SYSTEM_DIALOGS can't be protected.
 2009-07-10 17:38:29 -07:00
Jason Sams
64676f3c21 1st cut of a3d file loader. 2009-07-10 17:32:59 -07:00
Dianne Hackborn
4554f30c83 CLOSE_SYSTEM_DIALOGS can't be protected. 2009-07-10 17:30:50 -07:00
Android (Google) Code Review
f6c968395f Merge change 6850 into donut 
* changes:
  Extra parameters for sendBurstDtmf.
 2009-07-10 17:11:01 -07:00
Android (Google) Code Review
e4bd6e7eb9 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
f31d407ab8 fix [1967226] Donut orientation animation (dimming and blur) is slower than Cupcake 2009-07-10 17:00:00 -07:00
Android (Google) Code Review
086bd7fed1 Merge change 6846 into donut 
* changes:
  Avoid memcpy's by using GetPrimitiveArrayCritical.
 2009-07-10 16:55:24 -07:00
Android (Google) Code Review
48e61cf545 Merge change 6841 
* changes:
  resolved conflicts for merge of 889c2d37 to master
 2009-07-10 16:46:26 -07:00