29 Commits

Author SHA1 Message Date
The Android Open Source Project
caee1703fe Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:25 -07:00
Robert Greenwalt
8696e0156c AI 143902: am: CL 143900 am: CL 143898 Attempt to set the device Locale (if not already set) at phone
init based on the phone's reported carrier ID.
  Uses a core system resource string-array to contain the mapping
  of carrier ID -> default locale.  This should be set per project in
  an overlay.
  Original author: rgreenwalt
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143902
2009-03-31 18:02:21 -07:00
John Wang
e91bc680b7 AI 143331: am: CL 143181 am: CL 142924 Support DCM specific MMI network service.
IExtendedNetworkService has 4 MMI service interface used by PhoneUtils to put DCM related nw service.
  void setMmiString(String number);
  CharSequence getMmiRunningText();
  CharSequence getUserMessage(CharSequence text);
  void clearMmiString();
  And the service is bind via "com.android.ussd.IExtendedNetworkService".
  Original author: johnwang
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143331
2009-03-27 18:24:06 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake'
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
2009-03-27 15:38:40 -07:00
John Wang
2fe6fe1f5f Automated import from //branches/cupcake/...@142924,142924 2009-03-26 09:27:16 -07:00
John Huang
9f4be9572d Automated import from //branches/master/...@142338,142338 2009-03-24 22:39:08 -07:00
John Huang
46e6878c4b Automated import from //branches/cupcake/...@142334,142334 2009-03-24 19:26:17 -07:00
John Huang
fe3492dde0 Automated import from //branches/master/...@140758,140758 2009-03-24 18:26:28 -07:00
John Wang
71b7797c26 Automated import from //branches/master/...@140575,140575 2009-03-24 17:59:06 -07:00
The Android Open Source Project
c2ad241504 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:54 -07:00
The Android Open Source Project
105925376f auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
2a73de7b21 Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
The Android Open Source Project
ba87e3e6c9 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:22 -07:00
The Android Open Source Project
4df2423a94 auto import from //depot/cupcake/@136594 2009-03-05 14:34:35 -08:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856 auto import from //depot/cupcake/@132589 2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a auto import from //depot/cupcake/@137055 2009-03-02 22:54:33 -08:00
The Android Open Source Project
15ab3eae2e auto import from //branches/cupcake/...@132569 2009-02-20 07:38:31 -08:00
The Android Open Source Project
3001a03543 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:31 -08:00
The Android Open Source Project
d24b8183b9 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00
The Android Open Source Project
94cbba0933 Merge branch 'cupcake' 2009-01-22 00:16:08 -08:00
The Android Open Source Project
f1e484acb5 auto import from //branches/cupcake/...@127436 2009-01-22 00:13:42 -08:00
android-build SharedAccount
0fda766e53 Merge branch 'cupcake' 2009-01-15 16:16:01 -08:00
The Android Open Source Project
9266c558bf auto import from //branches/cupcake/...@126645 2009-01-15 16:12:10 -08:00
Jaikumar Ganesh
562bb3db4f telephony: Return NOT_SUPPORTED for RIL_REQUEST_GET_NEIGHBORING_CELL_IDS.
Currently, RIL_REQUEST_GET_NEIGHBORING_CELL_IDS causes the RIL to crash,
due to backward compatibility issues.
This fix is a temporary hack to make the API return REQUEST_NOT_SUPPORTED
Command Exception till the compatibility issues are fixed.
2009-01-14 18:37:35 -08:00
The Android Open Source Project
b798689749 auto import from //branches/cupcake/...@125939 2009-01-09 17:51:23 -08:00
The Android Open Source Project
f013e1afd1 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
The Android Open Source Project
54b6cfa9a9 Initial Contribution 2008-10-21 07:00:00 -07:00