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

1805 Commits

Author SHA1 Message Date
Wink Saville
3d8fcebc98 am ec18268e: am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 
* commit 'ec18268eb42641cd2a6ae9c8b26e35d67bb41021':
  Always clear settings when entering Inactive state.
 2011-06-15 14:37:00 -07:00
Wink Saville
ec18268eb4 am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 
* commit '1146bddf92fc91dad384bdaea740f9472bebd911':
  Always clear settings when entering Inactive state.
 2011-06-15 14:34:08 -07:00
Wink Saville
1146bddf92 Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 2011-06-15 14:31:16 -07:00
Wink Saville
f3e3edb2f9 am aff9ec70: am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE 
* commit 'aff9ec70e22abb64149e335ae2eb519c6027eb4a':
  Clean up some debug statements.
 2011-06-15 14:03:31 -07:00
Wink Saville
aff9ec70e2 am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE 
* commit '4d6233b2edd24c83efe10f4403456b8d0c87241a':
  Clean up some debug statements.
 2011-06-15 13:58:20 -07:00
Wink Saville
eddc3a579c Clean up some debug statements. 
Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
 2011-06-15 13:45:29 -07:00
Marco Nelissen
181aafd75c am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
  Ignore duplicate WAP push PDU source/destination port if configured
 2011-06-15 13:44:56 -07:00
Marco Nelissen
9c3c3004c4 am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
  Ignore duplicate WAP push PDU source/destination port if configured
 2011-06-15 12:20:57 -07:00
Marco Nelissen
d8f9a83cab resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
Change-Id: I169c415bf998b9935ab36812511573db05717b91
 2011-06-15 08:58:38 -07:00
Wink Saville
0e765f8b73 Always clear settings when entering Inactive state. 
Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
 2011-06-15 06:41:21 -07:00
John Wang
b0b24b3df5 Support SIM permanently disabled state. 
SIM card can get permanently disabled due to too many
PUK retries. The PERM_BLOCKED pin state of SIM application
represents this state.

This change decodes permanent disabled state and broadcasts it
via ICC_ABSENT intent with PERM_DISABLED reason. It also update
the lockscreen to show the prompt message.

bug:4392059
Change-Id: I5e60dd65f48f42aa2e54db4cdebf803d6e666b99
 2011-06-14 16:50:03 -07:00
Wink Saville
02f4e4f981 am 5d47d203: am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 
* commit '5d47d203fb60f4e7c91d97fa852a23863861b011':
  Enforce provision check for CSIM record only.
 2011-06-14 15:22:42 -07:00
Wink Saville
35831f198a am aad3c3cb: am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE 
* commit 'aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a':
  Make APN re-connect delay configuable
 2011-06-14 15:22:38 -07:00
Wink Saville
3bcc33fdec am 46cd4a4b: am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 
* commit '46cd4a4bfe432ed6b483c0d6fc1045e387f22710':
  Revert "CDMALTE: Get roaming status based on SID/NID"
 2011-06-14 15:22:33 -07:00
Wink Saville
5d47d203fb am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 
* commit 'fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
  Enforce provision check for CSIM record only.
 2011-06-14 14:48:51 -07:00
Wink Saville
aad3c3cbb8 am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE 
* commit 'c2d17d3bea02991df378237ea7058ccedb7c6a14':
  Make APN re-connect delay configuable
 2011-06-14 14:47:07 -07:00
Wink Saville
46cd4a4bfe am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 
* commit '82c1a5dea305d56eb77efa7d9a730307ff6af28a':
  Revert "CDMALTE: Get roaming status based on SID/NID"
 2011-06-14 14:47:04 -07:00
Wink Saville
fbef26eb55 Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 2011-06-14 14:44:31 -07:00
Wink Saville
c2d17d3bea Merge "Make APN re-connect delay configuable" into honeycomb-LTE 2011-06-14 14:44:23 -07:00
Kazuhiro Ondo
98e1e28f30 Enforce provision check for CSIM record only. 
Change-Id: I94bb6dd9191b24b0bd8c0e7d6267de5cd4b82be8
 2011-06-14 13:55:24 -07:00
Kazuhiro Ondo
c65d52b148 Make APN re-connect delay configuable 
Add configurability on hard coded timer.

Change-Id: Ic9a6ee43d9da3bd45f862aa3a21f05d836b402e3
 2011-06-14 13:54:33 -07:00
Kazuhiro Ondo
23f646367d Revert "CDMALTE: Get roaming status based on SID/NID" 
This reverts commit 3fc9055c7f3bc25948f17bc29582abae72fe7de1.
 2011-06-14 13:53:39 -07:00
David Brown
94202fe121 Add "geoDescription" to CallerInfo 
As of change https://android-git.corp.google.com/g/111296 the
libphonenumber library now provides an API ("PhoneNumberOfflineGeocoder")
to look up a geographical description string for a given number.

This change adds a new CallerInfo field called "geoDescription", and
uses the PhoneNumberOfflineGeocoder to look it up (if the contact lookup
fails) during the CallerInfoAsyncQuery sequence.

See https://android-git.corp.google.com/g/114715 for the corresponding
change under apps/Phone, to display this string (along with the raw
number) in the incoming-call UI.

Also some other minor cleanup:
  - fixed spelling of the "normalizedNumber" field
  - tiny javadoc and code style cleanup
  - slight CallManager and CallerInfo debug output cleanup

Bug: 4595580
Change-Id: I900d8f48e953d1b24983602cb5467a5c6a6c518a
 2011-06-13 17:39:49 -07:00
John Wang
e1a4fcdeaa am cc44bea0: am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE 
* commit 'cc44bea0400bc6b6e995d66b705a4db0a77a7dfa':
  Add toString for IccCard Status and App.
 2011-06-10 17:31:42 -07:00
John Wang
cc44bea040 am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE 
* commit '2addaf97b319e257677ac3e5bbb772ba40cfa78a':
  Add toString for IccCard Status and App.
 2011-06-10 17:28:11 -07:00
John Wang
2addaf97b3 Merge "Add toString for IccCard Status and App." into honeycomb-LTE 2011-06-10 17:19:42 -07:00
Robert Greenwalt
8b7eede0bc am 75612e9c: am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE 
* commit '75612e9c3f92364ba1f0a7fce46f1df11b0a14ca':
  CDMALTE: Get roaming status based on SID/NID
 2011-06-10 15:21:22 -07:00
Robert Greenwalt
75612e9c3f am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE 
* commit '1ea549e8990d2d73ccd9e92db1e7312423ee423e':
  CDMALTE: Get roaming status based on SID/NID
 2011-06-10 14:13:25 -07:00
Soojung Shin
d027329cd6 Ignore duplicate WAP push PDU source/destination port if configured 
Some carriers duplicate the OMADM wap push PDU source/destination
port.

e.g. MSGTYPE-TotalSegments-CurrentSegment
     -SourcePortDestPort-SourcePortDestPort-OMADM PDU

So the client has to ignore the duplicate source/destination
port.

Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
 2011-06-10 13:48:36 -07:00
Robert Greenwalt
9e7c20635f am 5a8455c3: am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE 
* commit '5a8455c3c625201f3ae6b9ce32913bf97ba61cc8':
  Set locale based on SIM preferred language.
 2011-06-10 10:33:23 -07:00
John Wang
c7a58b4de0 Add toString for IccCard Status and App. 
Enhance the debug info for GET_SIM_STATUS. Print out the
Card status and App status instead of Object id. It helps
to debug PUK lock and other SIM related issues.

Change-Id: I489f3933529a9719827a8799c41de8e999db6b40
 2011-06-09 19:10:12 -07:00
Kazuhiro Ondo
3fc9055c7f CDMALTE: Get roaming status based on SID/NID 
Change-Id: Iec70f2036c1c698331696ff9869bfb057604c637
 2011-06-09 16:42:18 -07:00
Robert Greenwalt
5a8455c3c6 am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE 
* commit '75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22':
  Set locale based on SIM preferred language.
 2011-06-09 15:54:45 -07:00
Kazuhiro Ondo
e9b46c3ac5 Set locale based on SIM preferred language. 
Unless user had selected a desired locale, EFli or EFpl will be
used to decide the locale to be used.

Note this locale setting is not persistent - only valid while
SIM card is present.

Change-Id: I1f3945f7bc02624dff94b90e7f1a658a136033e8
 2011-06-09 12:05:26 -07:00
Wink Saville
599b102997 am 2d8500d2: am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 
* commit '2d8500d21a3fe6af36040a5dcd0599e00a242766':
  Report data status from ApnContext even if data is detached
 2011-06-09 11:58:28 -07:00
Wink Saville
62bd659a09 am a384ff32: am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE 
* commit 'a384ff32827cf6383ead48ec4e0da42365ed3584':
  Use CSIM to get provision information
 2011-06-09 11:58:16 -07:00
Wink Saville
0231804095 am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE 
* commit '0da86d4fef70f94a02a504f8500df2833719da6b':
  Fix default preferred network.
 2011-06-09 11:55:30 -07:00
Jake Hamby
0cf353e052 am 22165bb5: am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
* commit '22165bb54af1cd3cb636c1d65da7c643d854c385':
  Fixes for SMS Cell Broadcast support.
 2011-06-09 11:29:13 -07:00
John Wang
3fa5f37346 am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 
* commit '229d3a0cbce70db82003705abf6844deec136d20':
  Make getDeviceId return null for Non-phone device.
 2011-06-09 11:25:50 -07:00
Jake Hamby
d4f1bacca5 resolved conflicts for merge of 7ca13deb to master 
Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae
 2011-06-08 23:20:09 -07:00
Wink Saville
2d8500d21a am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 
* commit '799f04c09cc7284e0660d419bcb24af57b86f08e':
  Report data status from ApnContext even if data is detached
 2011-06-08 15:03:43 -07:00
Wink Saville
a384ff3282 am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE 
* commit '33e1424b2e924e9b0162aa648137e8254f729161':
  Use CSIM to get provision information
 2011-06-08 15:03:35 -07:00
Wink Saville
799f04c09c Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 2011-06-08 15:00:46 -07:00
John Wang
cea03df201 Do not merge. Return null id for Non-phone device. 
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
 2011-06-08 13:10:22 -07:00
Kazuhiro Ondo
2e994586ed Report data status from ApnContext even if data is detached 
While in HO, data connection type may temporary become "unknown".
This triggers TelephonyRegistry picks up the wrong data connection
state, ending up notifying bogus state to ConnectivityService.

The patch is just to pick up the status from ApnContext which
should be maintaining the right state. Also cleaned up unnecessary
lines which was added earlier phase.

Change-Id: I07e74ce55f09ad31f2d8d09e2a144dc0b600eb0c
 2011-06-08 13:05:32 -07:00
Wink Saville
0da86d4fef am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE 
* commit 'a558fdf156601a477964139fee57da29de7f31b3':
  Fix default preferred network.
 2011-06-08 12:59:37 -07:00
Kazuhiro Ondo
53f67f7e9d Use CSIM to get provision information 
In case of LTE & CDMA hybrid system, provision information will be
read from CSIM records.

Also CSIM records can be updated over the air. No data connection
attempt should be made until CSIM provisioning is notified
via SIM_REFRESH event.

Change-Id: I001db48d07d90af22104cb958df638e15e0d494a
 2011-06-08 12:59:22 -07:00
Wink Saville
a558fdf156 Merge "Fix default preferred network." into honeycomb-LTE 2011-06-08 12:56:27 -07:00
Wink Saville
d6bcfd1cd0 Fix default preferred network. 
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.

Some cleanup.


Bug: 4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
 2011-06-08 12:18:07 -07:00
Robert Greenwalt
8a02401129 resolved conflicts for merge of e139167c to master 
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
 2011-06-08 10:01:06 -07:00