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

586 Commits

Author SHA1 Message Date
Wei Huang
9666bbdf1b am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo 
Merge commit '7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp

* commit '7b88af679a9a3b5737343bb996ef392b76d19e73':
  bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
 2010-04-22 16:35:56 -07:00
Wei Huang
fdf3b26ba7 bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug. 
Change-Id: Ica1df6582533edf8d9a5825dbe510eeab4828309
 2010-04-22 15:13:48 -07:00
John Wang
f77fff4b4e am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 
Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp

* commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb':
  Add ILLEGAL_SIM_OR_ME error code.
 2010-04-21 14:46:06 -07:00
John Wang
7fb4b8455c Add ILLEGAL_SIM_OR_ME error code. 
It is for bug 2571583 to provide better failure information of network operator selection.

Network selection returns ILLEGAL_SIM_OR_ME when the failure is
permanent and no retries needed, such as illegal SIM, ME, HRL config, etc.

Change-Id: Iaf70bef64d3cbf35e4d9915418cbb5b78607f73e
 2010-04-21 11:34:15 -07:00
The Android Open Source Project
f021d12f6f merge from open-source master 
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
 2010-04-21 09:10:43 -07:00
Alex Yakavenka
2aba0ec873 Fix printing order of phone objects creation 2010-04-19 20:28:22 -07:00
Wink Saville
662262ac04 Fix a FATAL ClassCastException in DataConnection.java 
bug: 2583290
Change-Id: I93e0307664427b29942b1ed1e5acbf21e78a605f
 2010-04-09 08:57:31 -07:00
Dan Egnor
5945579e4e Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:45:07 -07:00
Dan Egnor
2b4abcd0c7 Change TrafficStats to a new JNI implementation. 
Also change phone's ConnectionStateTrackers to use it directly,
rather than through the INetStat binder interface.

Bug: 2578938
Change-Id: I8858e2609cbec3be845a0ce5178cb03f67e01b41
 2010-04-07 19:06:29 -07:00
John Wang
56c2d2ff27 Add emergencyOnly indicator in ServiceState. 
For bug 2536842 to show signal strength in Emergency mode.

The STATE_EMERGENCY_ONLY of ServiceState is not in-use.

So add a hide interface to indicate Emergency mode.

Change-Id: I19398ac5e73a722dcaaf744347f961d1fa7513ac
 2010-04-07 16:06:13 -07:00
The Android Open Source Project
02034d3568 merge from open-source master 
Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
 2010-03-22 15:55:38 -07:00
Jake Hamby
633dfb6da6 Fix some typos and logging of calls to CDMA methods. 
Fixed some comment typos and cleaned up logging of unexpected calls to
CDMA-specific methods on a non-CDMA device.

Change-Id: Ia6e5fba765122cbf3186fd9fecca7a3931a76dcc
 2010-03-22 14:41:43 -07:00
Brad Fitzpatrick
2e805b19cd Grammar fixes. 
Change-Id: I77672d2260c26aee146bb6a853137c14e3db1f28
 2010-03-22 10:10:51 -07:00
The Android Open Source Project
1da49e45a8 merge from open-source master 
Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac
 2010-03-19 16:36:32 -07:00
Robert Greenwalt
78b6e89914 Add support for DUN over a cdma connection. 
It uses the data profile paramater when setting up the connection to indicate
it's a tethered connection.  We get different behavior from vzw afterwards, so
it is getting picked up.

bug:2422545
Change-Id: Ic022845088726d723813b82e166d15d7b2945da1
 2010-03-18 17:43:42 -07:00
jsh
8214deb542 Add definitions for WiMAX and iDen network types. 
b/2509185

Change-Id: Icf07ce857874e200712218713edbdbb47e646297
 2010-03-15 15:31:08 -07:00
Wink Saville
e04c0275d7 Merge "Fix data error handling." 2010-03-12 16:51:21 -08:00
Wink Saville
abeff9479f Fix data error handling. 
In change I5776324a I made DataConnection.reset asynchronous.
That was a mistake as callers to cleanUpConnection assumed
it was synchronous. Added DataConnection.resetSynchronously
as a fix, someday the trackers will become asynchronous and
this won't be necessary.

Change-Id: I4669901e5c47a712212bb388c35fbb9f9ff603a7
 2010-03-12 15:31:56 -08:00
Wink Saville
7261128801 Merge "Make sure that pause dialing works even when screen is off." 2010-03-12 09:35:43 -08:00
Wink Saville
82c0845978 Make sure that pause dialing works even when screen is off. 
bug: 2200086
Change-Id: Ib8c73ce4bca293811ba681c558c37322125c511f
 2010-03-12 09:32:58 -08:00
Wink Saville
cea764088d Add Copyright assignement. 
bug: 2510419
Change-Id: I78355d89e7a9362f918a03c6fc5457209ea4490a
 2010-03-12 09:04:48 -08:00
Kenny Root
15a4d2ffd0 Add correct copyright headers to multiple files 
Format for the list of changes shows the origin commit reference followed
by the file name.

33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java
33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java
133776-p9 core/java/android/app/IntentService.java
127013-p9 core/java/android/appwidget/AppWidgetHost.java
27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java
60765-p9 core/java/android/content/SyncResult.java
43920-p9 core/java/android/content/pm/ActivityInfo.java
43920-p9 core/java/android/content/pm/ApplicationInfo.java
43920-p9 core/java/android/content/pm/InstrumentationInfo.java
43920-p9 core/java/android/content/pm/PackageInfo.java
44103-p9 core/java/android/content/pm/PackageItemInfo.java
68960-p9 core/java/android/content/pm/PackageStats.java
43920-p9 core/java/android/content/pm/ResolveInfo.java
43920-p9 core/java/android/content/pm/ServiceInfo.java
60641-p9 core/java/android/content/res/Configuration.java
60734-p9 core/java/android/content/res/TypedArray.java
137672-p9 core/java/android/inputmethodservice/ExtractButton.java
123112-p9 core/java/android/inputmethodservice/ExtractEditText.java
119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java
115078-p9 core/java/android/os/BatteryStats.java
124790-p9 core/java/android/text/style/UpdateAppearance.java
45083-p9 core/java/android/view/RawInputEvent.java
101491-p9 core/java/android/view/inputmethod/EditorInfo.java
114701-p9 core/java/android/view/inputmethod/ExtractedText.java
123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java
119291-p9 core/java/com/android/internal/os/HandlerCaller.java
129279-p9 core/java/com/android/internal/os/PkgUsageStats.java
114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java
114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java
84364-p9 opengl/java/android/opengl/EGLLogWrapper.java
11355-p9 opengl/tools/glgen/src/CFunc.java
11355-p9 opengl/tools/glgen/src/CType.java
11355-p9 opengl/tools/glgen/src/CodeEmitter.java
11355-p9 opengl/tools/glgen/src/GenerateGL.java
11355-p9 opengl/tools/glgen/src/JFunc.java
11355-p9 opengl/tools/glgen/src/JType.java
11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java
11355-p9 opengl/tools/glgen/src/ParameterChecker.java
57236-p9 services/java/com/android/server/status/AnimatedImageView.java
66754-p9 services/java/com/android/server/status/CloseDragHandle.java
57188-p9 services/java/com/android/server/status/DateView.java
46928-p9 services/java/com/android/server/status/ExpandedView.java
70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java
45968-p9 services/java/com/android/server/status/IconData.java
57470-p9 services/java/com/android/server/status/IconMerger.java
82719-p9 services/java/com/android/server/status/LatestItemView.java
45968-p9 services/java/com/android/server/status/NotificationData.java
66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java
57458-p9 services/java/com/android/server/status/NotificationViewList.java
45968-p9 services/java/com/android/server/status/StatusBarException.java
45968-p9 services/java/com/android/server/status/StatusBarIcon.java
46130-p9 services/java/com/android/server/status/StatusBarNotification.java
45968-p9 services/java/com/android/server/status/StatusBarView.java
46199-p9 services/java/com/android/server/status/Ticker.java
62286-p9 services/java/com/android/server/status/TickerView.java
57188-p9 services/java/com/android/server/status/TrackingView.java
86041-p9 telephony/java/android/telephony/PhoneStateListener.java
87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java
136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java
34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java
55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java
127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java
129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java
25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java
46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java
77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java
53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java
93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java
328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java
eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java
49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java
a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java
3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java
5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java
c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java
9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java
21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java
e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java
192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java
1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java
69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java
c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java
df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java

Copyright header moved to top in following file:

core/tests/coretests/src/android/widget/ListViewTest.java

Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
 2010-03-11 18:22:10 -08:00
John Wang
eb3035cbca Merge "Make getCellLocation return null if not available." 2010-03-11 13:56:59 -08:00
John Wang
41a46718b3 Make getCellLocation return null if not available. 
For bug 2422284.

Check the cell location and return null if the location is not available.

Change-Id: Ie9a331b906a8253c9a9596365af8705dc03823ce
 2010-03-11 13:53:46 -08:00
Robert Greenwalt
a9729deb9c Merge "Update the Mcc Table for Canada." 2010-03-08 16:35:13 -08:00
Robert Greenwalt
e640a5aee4 Update the Mcc Table for Canada. 
Changing the mnc length from 2 to 3.  We don't have any canandian APNs with 2 digit mncs
and wikipedia doesn't list any canadian carriers with 2 digit mncs.

Rogers was reporting some sims with 72 and others with the correct 720 - a sample "72" sim
didn't have the mnc-length field set so we went with 2.  With this fix all rogers sims will
be picked up correctly.
 2010-03-08 16:26:34 -08:00
Wink Saville
01b6d24417 Allow the configuration string to have quotes. 
This makes properties easier to read so from:
   ro.cdma.data_retry_config=default_randomization=2000,0,0,120000,180000

to this:
   ro.cdma.data_retry_config="default_randomization=2000,0,0,120000,180000"

Change-Id: Ied2a7be0102512cd2ce528d566c19ed3a8e2f480
 2010-03-05 13:23:06 -08:00
John Wang
fe4f2c9ea2 Merge "Add r-w property of emergency number list." 2010-03-04 14:42:42 -08:00
Xia Wang
4736ff3534 Merge "Suppress testCheckAndProcessPlusCode from continuous test system as testing devices are not registered with any carrier networks." 2010-03-04 14:19:51 -08:00
Xia Wang
85b3508d56 Suppress testCheckAndProcessPlusCode from continuous test system as testing devices are not registered with any carrier networks. 2010-03-04 14:10:05 -08:00
John Wang
fc26c77f61 Update DSAC notification. 
Update the notification string of CS restricted per DoCoMo's request. More restricted message string are added for future use.
 2010-03-04 14:09:24 -08:00
John Wang
0bd36175fb Add r-w property of emergency number list. 
Currently, the emergency calls are put into an readonly property ro.ril.ecclist.

It is possible that ecclist has to be changed before and after SIM pin lock.

And ecclist can also be changed after network broadcasts the local emgergency numbers.

So add r-w property ril.ecclist to make emergency number list changable, while still

check r-o property to make old RIL work.
 2010-03-04 14:05:49 -08:00
John Wang
ef38327f3a Merge "Update Singapore default time zone." 2010-03-04 11:10:21 -08:00
Naveen Kalla
1a61b586b5 Retry pending memory status update to modem when radio is ON. 
When radio is powered off / airplane mode, memory status updates are
ignored by RIL. With this fix, pending memory status updates are sent
again when radio is powered back on.
 2010-03-03 18:54:36 -08:00
Wink Saville
16dc6dbf30 Fix a loss of data. 
Fix a bug in DataConnection state machine where the notification
of disconnection completion was sent before we actually transitioned
to the in active state. Also, change conn.reset to send a response
so the user can know when the transition to the in active state
completes for that also.

bug: 2471897
Change-Id: I5776324ac89a607925d07f4a600bc5b34c3f3ed6
 2010-03-03 17:54:39 -08:00
John Wang
e4b293cd64 Update Singapore default time zone. 
In MccTable, Singapore is marked as 'Asia/Singapore' instead of 'Singapore'.
 2010-03-03 16:56:01 -08:00
Mike Lockwood
448fa8ba41 CdmaDataConnectionTracker: Add DUN to list of supported APN types. 
Change-Id: I72549a761757f93cfeb9d16e2f64331134155156
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-02-26 15:16:52 -05:00
Dianne Hackborn
2269d1572e Re-arrange android-common so framework no longer links with it. 
This is the framework part, moving classes around so the framework
no longer needs to link to android-common.  Makes some APIs public,
others that didn't need to be public are private in the framework,
some small things are copied.
 2010-02-25 11:39:33 -08:00
Robert Greenwalt
c03fa50149 Add mobile data on/off switch. 
bug:2251458
 2010-02-24 18:14:07 -08:00
Robert Greenwalt
5cde63a60d Merge "Add USB RNDIS enable/disable control" 2010-02-23 18:08:04 -08:00
Robert Greenwalt
65ae29bd85 Add USB RNDIS enable/disable control 
Also adding interface configuration to the tethering machine.
Also fixing netd bug that didn't send up/down portion of iface config command.
 2010-02-23 16:04:41 -08:00
Romain Guy
a1303e0193 Calling super.finalize() in finalize() methods. 
Also cleanup code, mostly removing unused handlers and casts.
 2010-02-22 16:29:10 -08:00
Kenny Root
7b1c067b90 Merge "Correct use of logical AND" 2010-02-17 13:24:59 -08:00
Kenny Root
433735f871 Merge "Prevent sign extension in IccUtils.parseToRGB" 2010-02-17 12:02:35 -08:00
Kenny Root
a409128a72 Prevent sign extension in UsimPhoneBookManager 
When performing a logical OR on a byte value, make sure to truncate its
value to prevent possible sign extension when it is converted to 32-bit.

Change-Id: I7bdfded32cec3e8a5f6b5c45316b2af5ab9471d1
 2010-02-17 10:21:11 -08:00
Kenny Root
d142df535d Prevent sign extension in IccUtils.parseToRGB 
When a signed byte value is taken from an array, make sure to truncate
it so it doesn't have a problem when it's sign extended to 32-bit.

Change-Id: Ic2b35c317e21c63dff960501145a4f3074b687ad
 2010-02-17 10:16:15 -08:00
Kenny Root
7ae1776046 Correct use of logical AND 
A bitwise AND was use when a logical AND was meant to be used.

Change-Id: I4e5529ff9fce1e6397d7cd9483268766fc92dcf5
 2010-02-17 09:55:53 -08:00
Wink Saville
5b31fdae60 am 58d6a20c: am 6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair 
Merge commit '58d6a20cfaa55ebe269ac0736999b90c3227b0c1'

* commit '58d6a20cfaa55ebe269ac0736999b90c3227b0c1':
  Always assume evdoXxxx signal strength values are correct.
 2010-02-13 09:48:43 -08:00
Wink Saville
7d97ff10c7 Always assume evdoXxxx signal strength values are correct. 
This solves a race condition between the network type changing and
a signal strength changing. This could cause StatusBarPolicy to see
the -1 values for the evdo strength parameters and hence 0 bars would
be displayed.

Bug: 2419251
Change-Id: Iba0bdbd2023b6a5e49fc1f82c997ec3219158286
 2010-02-13 07:56:20 -08:00
Mark Vandevoorde
9384b145e6 Map base station lat-lng of "0","0" to undefined. 
Also introduce a public constant for the invalid lat/lng value.

Change-Id: Ifaa1e563bfa94c06dfbba51157b9160055442682
 2010-02-12 10:13:12 -08:00