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

2969 Commits

Author SHA1 Message Date
Sanket Padawe
8b76495751 am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev 
* commit '025f0938544bae3262acc24e9c6031b6de88901d':
  Changing usage of carrier name field of SubInfoRecord
 2015-02-26 22:09:10 +00:00
Yashdev Singh
bece926b51 Telephony: Implementation for IWLAN. 
Introduce new RAT as IWLAN.
- Allow registration polling in airplane mode.
- Allow non-default PDP activation for iwlan RAT.

Implementation of iwlan and wwan coexistence.
- A new callback event for unsol oem hook response to indicate
  if cellular and iwlan RAT co-exists.
- If co-existence is possible then allow default PDP activation
  along with other PDPs.

Change-Id: Icc6f8111ec3c86ec06e8facd5a5b60b4d5e08e78
 2015-02-26 06:37:36 +00:00
Sanket Padawe
ea4713d6e5 Changing usage of carrier name field of SubInfoRecord 
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
 2015-02-24 13:15:15 -08:00
Santos Cordon
ed4ca5ca2c Add Sub-ID-from-phone-account converter method. 
There are several places in the code that currently attempt to parse the
sub ID directly from the phone account which is undesireable.  Before we
can change from using the subID to using an ICC ID with the phone
accounts, we need to create a conversion method so that no other
components are parsing the sub ID out of the phone account directly.

Change-Id: I74547fe0807da2fe13f3ff4422cd1d0a7a20d04c
 2015-02-19 15:19:16 -08:00
Shishir Agrawal
bad6337b08 GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 automerge: 6b27472 
automerge: b7e04f3

* commit 'b7e04f3294d2ce60450fcc6881249b6b0c6c30b0':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-02-11 03:52:52 +00:00
Shishir Agrawal
b7e04f3294 GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 
automerge: 6b27472

* commit '6b274720c5a210c07256e5b9fc11a1e9aca59017':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-02-11 03:44:42 +00:00
Shishir Agrawal
64ce5f8fab GpsLocationProvider: Read data enabled status from TelephonyManager. 
Bug: 18814559
Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
 2015-02-10 19:20:16 -08:00
Sanket Padawe
b15c00a551 am 0a4c2646: am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev automerge: 4eed340 
* commit '0a4c2646f4b72fdc78299dbb3dd86a7aecefff08':
  Suppress phone number from logcat.
 2015-02-05 23:16:46 +00:00
Sanket Padawe
0a4c2646f4 am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev 
automerge: 4eed340

* commit '4eed340437d23a9b4fabf2881557325b863af23c':
  Suppress phone number from logcat.
 2015-02-05 23:10:57 +00:00
Brian Attwell
c6dbe3be2c Unhide and rename PhoneNumberUtils tts methods 
Renamed ttsSpanAsPhoneNumber #1 -> getPhoneTtsSpannable
Renamed ttsSpanAsPhoneNumber #2 -> addPhoneTtsSpan
Added  				   getPhoneTtsSpan

Instead of removing the original hidden methods, I deprecated them.
Since Telephony changes initially get checked into wireless-dev
branch and dialer/contacts changes get checked into master branch,
immediately deleting the ttsSpanAsPhoneNumber methods would break
builds.

In ContactsCommon, I plan on removing
ContactDisplayUtils#getTelephoneTtsSpannable and instead using
these Telephony APIs. Numbers I tested worked in ToT master talkback:
911, (650) 215 3111, 22222222222, 333-3333, 013334612234, +1 905 471 8484,
001 39 02 444 4444. The changes in this diff cause the numbers
to be talked-back at least as well as before.

Some context: go/question-about-telephonys-ttsspan

Bug: 18777272
Change-Id: I3a6ead3ee9c030761bde903cf88f4aa4fc7a3460
 2015-02-05 14:32:03 -08:00
Sanket Padawe
1acdd4b1f4 Suppress phone number from logcat. 
Bug: 19251204
Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25
 2015-02-05 11:45:27 -08:00
Robert Greenwalt
af7454bafb am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged" 
automerge: 21475c6

* commit '21475c6a92b893f5d078ba23f06f0be6edaaacbd':
 2015-02-02 17:33:09 +00:00
Robert Greenwalt
21475c6a92 am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged" 
* commit '0cdd4560dac5784dda169863eb844d489bdc79d5':
 2015-02-02 17:29:21 +00:00
Robert Greenwalt
3c6e38d3b5 Fixing up the formatting code which is already merged 
I just apply google coding guide like space.

Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"

This code is about + plus number converting logic for international NANP.

Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
 2015-02-02 15:04:56 +09:00
Stuart Scott
3165abfd34 am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 
automerge: 2e233d3

* commit '2e233d30662d26846a42c298967842d2e8537653':
  [DS] Correct the access method for telephony system property
 2015-01-30 22:26:27 +00:00
Stuart Scott
2e233d3066 am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 
* commit '712d5b3d582dfe8f7fb855ba98704c98e9441836':
  [DS] Correct the access method for telephony system property
 2015-01-30 22:24:25 +00:00
Stuart Scott
147b6a3522 Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 2015-01-30 22:09:38 +00:00
Legler Wu
85973dcf8c [DS] Correct the access method for telephony system property 
Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC

Bug: 18675498
Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
 2015-01-29 19:02:55 -08:00
Amit Mahajan
f58ab0ae43 am d492aa08: am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 
automerge: ed1a463

* commit 'ed1a46393e50cb2954876ef19ca539829fdf4a19':
  Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
 2015-01-30 01:05:24 +00:00
Amit Mahajan
ed1a46393e am d492aa08: am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 
* commit 'd492aa08206d21ba2e5ba533532630e5abe0bffe':
  Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
 2015-01-30 01:03:30 +00:00
Amit Mahajan
45446c6321 Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 2015-01-30 00:52:50 +00:00
Sanket Padawe
81f63a60f3 am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 
automerge: f19485b

* commit 'f19485b644b7ba7bda1f5c7a2279ca56c37923f0':
  Suppress logging to avoid showing phone no.
 2015-01-29 21:57:29 +00:00
Sanket Padawe
f19485b644 am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 
* commit '60e4edfb94fd744001b4c7013a89ef4abb311f97':
  Suppress logging to avoid showing phone no.
 2015-01-29 21:56:04 +00:00
Sanket Padawe
5df10e1842 Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 2015-01-29 21:44:05 +00:00
Sanket Padawe
14d21344d2 Suppress logging to avoid showing phone no. 
Bug: 19193581
Change-Id: I6ee17a2eab9d0ed84c931d6395a5aeb148177f95
 2015-01-29 11:21:34 -08:00
Amit Mahajan
1e62748b94 Adding new API to ISms to check if default SMS SIM needs to be chosen by 
user.

Bug: 19112332
Change-Id: I7da30ebcebaf57f713acc6938626930dbc51d1f2
 2015-01-28 18:15:56 -08:00
Stuart Scott
d31cafb369 am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236 
automerge: cf8ae79

* commit 'cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b':
  Change getDeviceId to take phoneId.
 2015-01-29 02:13:35 +00:00
Stuart Scott
cf8ae79ef2 am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236 
* commit '8d702000a7291068e639a9954e03c36d66144449':
  Change getDeviceId to take phoneId.
 2015-01-29 02:06:51 +00:00
Stuart Scott
f4e5236061 Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev 2015-01-29 01:55:47 +00:00
xinhe
7cfb00fb94 am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1 
automerge: 5e51c21

* commit '5e51c21943a4e9c0096acbaee5f923e9e0297f25':
  Sprint: MMS cannot be sent in the UK
 2015-01-28 21:56:50 +00:00
xinhe
5e51c21943 am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1 
* commit '93487e286e6bfa434fb092c6276d96b40e5d62c4':
  Sprint: MMS cannot be sent in the UK
 2015-01-28 21:53:34 +00:00
Stuart Scott
d456ec4be1 Change getDeviceId to take phoneId. 
bug:18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5
 2015-01-28 13:06:12 -08:00
xinhe
6620b4273e Sprint: MMS cannot be sent in the UK 
This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.

Bug:18241756
Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd
 2015-01-28 10:40:27 -08:00
Robert Greenwalt
fe0e33495c am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f 
automerge: 52f25f7

* commit '52f25f7b30b684a46814cff60538e6a7636ed618':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 20:05:30 +00:00
Robert Greenwalt
52f25f7b30 am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f 
* commit 'b73f431dddc0ba9260a342f2322e818460cf6f34':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 20:01:50 +00:00
Sanket Padawe
63e77bf8a5 am f0f5eee8: Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 automerge: 76e9d18 
* commit 'f0f5eee8238284aad08fd573959392542e57a8ab':
  Fixed a crash in TelephonyManager while calling getDeviceID()
 2015-01-20 23:54:52 +00:00
Sanket Padawe
f0f5eee823 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 
automerge: 76e9d18

* commit '76e9d18055d131bede49886c9c86c9f59db3fac4':
  Fixed a crash in TelephonyManager while calling getDeviceID()
 2015-01-20 23:49:54 +00:00
Sanket Padawe
201cc00947 Fixed a crash in TelephonyManager while calling getDeviceID() 
Bug: 19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
 2015-01-20 14:40:14 -08:00
Sanket Padawe
c0fa70ee19 am 60b41e6a: am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 
* commit '60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe':
  Modify getDeviceId() to get device id independent of Subscription.
 2015-01-17 22:37:03 +00:00
Sanket Padawe
60b41e6aa7 am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 
* commit '543348eb94624907102c1baffe5bdaf1087fede8':
  Modify getDeviceId() to get device id independent of Subscription.
 2015-01-17 22:30:25 +00:00
Sanket Padawe
d2dd69ae8d Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 2015-01-17 22:15:56 +00:00
Stuart Scott
2a3e8c729d am e2b9d5b5: am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 
* commit 'e2b9d5b56c6b06418e85cd49afd87e0d08f57c71':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
 2015-01-15 03:45:04 +00:00
Jorim Jaggi
568e54be71 resolve merge conflicts of 87f5369 to master. 
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
 2015-01-15 00:12:18 +01:00
Stuart Scott
e2b9d5b56c am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 
* commit '542f4ee61986e2a2883211f229a1b3ad23ceca81':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
 2015-01-14 21:40:06 +00:00
Stuart Scott
98b8cf2c80 am 2d68b428: am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev automerge: dfb99e8 
* commit '2d68b428b06df4f91ffd12c01ccbac61ce9cb163':
  Update javadoc and hide getNameSource and getDataRoaming.
 2015-01-14 21:13:42 +00:00
Stuart Scott
400a3f6df2 Unhide getDataRoaming, Messenger uses it to decide to download MMS or not. 
bug:19015551
Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
 2015-01-14 12:12:02 -08:00
Sanket Padawe
0b7f5e81ba Modify getDeviceId() to get device id independent of Subscription. 
+ Add getDeviceId() in ITelephony to find device id independent of
subscription.

Bug: 18780202
Change-Id: I21cc38418eb7f4f1b300c6372e1dc7548385c112
 2015-01-14 09:49:58 -08:00
Junda Liu
427e7162ca am ead01845: am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 
* commit 'ead0184548fdd341f5903d9ce35604c926dcddde':
  Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
 2015-01-14 00:17:58 +00:00
Junda Liu
6e41019633 Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 2015-01-14 00:06:19 +00:00
Stuart Scott
2d68b428b0 am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 
automerge: dfb99e8

* commit 'dfb99e82740fe21006bb6972af6af610ed12edbe':
  Update javadoc and hide getNameSource and getDataRoaming.
 2015-01-13 23:23:20 +00:00