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

2758 Commits

Author SHA1 Message Date
Nick Vaccaro
23c7cef2ca am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev 
* commit '74a0eb360da012c5a13577a8af33f6b28b0fadf7':
  Avoid unhandled page fault cases on Android Wear
 2015-03-18 23:44:20 +00:00
Nick Vaccaro
f257469c08 Avoid unhandled page fault cases on Android Wear 
Telephony routines were dereferencing the null result of
getITelephony() and getSubscriberInfo(), causing unhandled page
faults at the hardware level.

Bug: 18264818
Change-Id: I7d058aa881c7dac20051d6faea2a6d52be4bd74e
 2015-02-27 15:31:09 -08:00
Sanket Padawe
40aa30b374 am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev 
* commit '654a473bfea9a4197868ae81091812505da8ca87':
  Changing usage of carrier name field of SubInfoRecord
 2015-02-26 23:37:55 +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
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
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
Sanket Padawe
1acdd4b1f4 Suppress phone number from logcat. 
Bug: 19251204
Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25
 2015-02-05 11:45:27 -08: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
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
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
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
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
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
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
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
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
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
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
Stuart Scott
e3b0449b0f Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 2015-01-13 22:43:14 +00:00
Junda Liu
3fb3abd10a Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council. 
Bug: b/18983535
Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
 2015-01-13 14:11:11 -08:00
Stuart Scott
4abdd07949 Update javadoc and hide getNameSource and getDataRoaming. 
Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet.

bug:18983672
Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5
 2015-01-13 12:31:04 -08:00
Wink Saville
948279954a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:15:58 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:24 -08:00
sohryun.shin
a423a279f6 Add + code handling logic for SMS Global Roaming 
When sending SMS from international CDMA NANP country, outgoing SMS is failed due to + code converting.
(Send a SMS text message: to an international phone number using the plus code (+)).

In kitkat, when user send a sms with plus code, the "+" converted to 011(NANP_IDP_STRING). And it works well.
However, in lollipop, the "+" converted to current IDP, not NANP_IDP_STRING. And it failed to send the SMS.

I think, we need to seperate SMS and Call logic like cdmaCheckAndProcessPlusCodeForSms and cdmaCheckAndProcessPlusCode.
sohryun.shin@lge.com

Change-Id: Ie9d402cbeb4de4ac30299d5820b33909d0e40320
 2015-01-12 14:14:18 +09:00
Robert Greenwalt
0994d12b0d am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly" 
* commit 'd38218d880f02951015733a3d3e00deb546465bf':
  Telephony: Initialize GsmCellLocation class members properly
 2015-01-05 23:39:01 +00:00
Srikanth Chintala
e4ec09da0b Telephony: Initialize GsmCellLocation class members properly 
Default values for class members mLac, mCid, mPsc would be 0.
Initialize these variables with -1 as 0 is considered as valid value.

CRs-Fixed: 406479
Change-Id: Idb3d1737c7101b97a90eab3dc7436ee1806d0bc4
 2014-12-29 11:05:22 +00:00
Amit Mahajan
4b2cbae9cf am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev 
automerge: 4f68c0c

* commit '4f68c0c1d8811d610021d97839af303c2752eff2':
  IMS: add the api to get IMS registration information.
 2014-12-28 05:29:52 +00:00
Libin.Tang@motorola.com
0303be4a8a IMS: add the api to get IMS registration information. 
Bug: 18668325
Change-Id: Ie694c7f1cc12a573cbef2815199ae6c91cf8088e
 2014-12-22 19:35:18 +00:00
Wink Saville
7478d51f70 am 7c580cab: am b5f1e878: Fix build breakage. 
* commit '7c580caba94ca3b917c887b9e8353809c7f320c7':
  Fix build breakage.
 2014-12-19 19:22:41 +00:00
Wink Saville
b5f1e878d1 Fix build breakage. 
I rebased a change and didn't compile, my mistake.

Change-Id: Iad7fc609b08d53aa7b8b96af609e3ff9a4f0e889
 2014-12-19 11:02:01 -08:00
Wink Saville
700b8f080a am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type. 
* commit '57859d704ef2bc61798c172c4524596393f0beef':
  Update mapping between RAF and Network Type.
 2014-12-19 18:33:20 +00:00
Wink Saville
7b727e2e0a am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev 
* commit 'aa40537ca56ce386edcdaed2d21a9e2f07975812':
  Update mapping between RAF and Network Type.
 2014-12-19 18:09:26 +00:00
Wink Saville
f73c2d1f0b Update mapping between RAF and Network Type. 
bug:18754476
Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
 2014-12-19 10:08:15 -08:00