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

2904 Commits

Author SHA1 Message Date
Narayan Kamath
8ff1a5ee0d am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc." 
* commit '5620604261a24419bb87a4540f1a4ff333d32a3f':
  Fix PhoneStateListener constructor javadoc.
 2014-12-09 11:25:04 +00:00
Pavel Zhamaitsiak
963db3fa69 am c67da06d: am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev 
* commit 'c67da06df74095e44ecf9449216563b622927463':
  IMS: start and stop dtmf tones.
 2014-12-09 01:42:53 +00:00
Ihab Awad
88bf9bcb49 am 657f25e9: am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 
* commit '657f25e9641e7c546032adf90b9c4bdaef36eab9':
  Add Text-to-Speech annotations for phone number displays (1/3)
 2014-12-09 00:59:40 +00:00
Stuart Scott
85ca687df8 am 6b0025ea: am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev 
* commit '6b0025ea7ca0e7343ee95bc622261b2f3e86012a':
  Add mapping between RAT and Network Mode
 2014-12-09 00:19:09 +00:00
Uma Maheswari Ramalingam
a8af6bb333 IMS: start and stop dtmf tones. 
Support of start and stop dtmf tones in Imsphone

Bug: 18371919
Change-Id: I986f6b8e9aa1a5729d280eb8a5c60e129c3796cd
CRs-Fixed: 751797
 2014-12-08 22:59:44 +00:00
Wink Saville
98513d7bd4 Update API and documentation for invalid subscriptions id's 
Bug: 18668873
Change-Id: I3ee987b77fef856e97ea09898c695147cb87a517
 2014-12-08 12:44:16 -08:00
Jeff Sharkey
d5b5576dd6 am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
* commit '5b41696c56c124124d48168227a83b63bd55aea7':
  Offer to "merge" subscribers for data usage.
 2014-12-08 19:44:27 +00:00
Ihab Awad
657f25e964 am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 
* commit '2b45554454b6b9db3e2626fe3ca3cd5f42f960ca':
  Add Text-to-Speech annotations for phone number displays (1/3)
 2014-12-08 19:35:17 +00:00
Stuart Scott
6b0025ea7c am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev 
* commit 'eb29c7332c40aacfae3dfb77588b262a043c94ee':
  Add mapping between RAT and Network Mode
 2014-12-08 19:17:22 +00:00
Jeff Sharkey
3256601f5e Offer to "merge" subscribers for data usage. 
There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective.  This is done by extending the template used for
matching purposes to support multiple subscribers.

Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included.  When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.

This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface.  Also correctly create default policies for multi-SIM
devices.  This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent.  (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)

Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
 2014-12-08 08:42:59 -08:00
Karol Wrótniak
69d3e55193 Fix PhoneStateListener constructor javadoc. 
Removed sentence in visible javadoc of #PhoneStateListener() which
was useless because it referred to another hidden constructor.

Change-Id: I14a956ac29881000e48bf31e0090e9e1f93bf6e3
 2014-12-08 13:13:24 +00:00
Ihab Awad
0855e7aea2 Add Text-to-Speech annotations for phone number displays (1/3) 
Bug: 17321294
Change-Id: Id7e48e683694e2f9ea2a7dd7fa7d69acc727489d
 2014-12-05 15:27:08 -08:00
Stuart Scott
997ddc8e3e Add mapping between RAT and Network Mode 
bug:18416275
bug:18415493

Change-Id: I0b29ec953ec9eb29248a22d582013127ee0fea41
 2014-12-05 20:28:14 +00:00
Wink Saville
36ffb0494d Add subId as parameter for get/setDataEnabled. 
Bug: 18279333
Change-Id: I2496a2fd92b154e5e6981cbf6b5b5939cda59122
 2014-12-05 11:10:30 -08:00
Pavel Zhamaitsiak
bf41d13ce1 am 10f47f92: am 38916819: am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev 
* commit '10f47f9233484763a8a0e0c8e36f68dd28056485':
  IMS Call End Cause Additions
 2014-12-04 21:55:29 +00:00
Cheuksan Wang
412766a7d6 am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit '29ac679f9f85a68eca03c262e740d62f8af66797':
  new SMS/MMS carrier app API
 2014-12-04 21:55:19 +00:00
Pavel Zhamaitsiak
10f47f9233 am 38916819: am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev 
* commit '38916819693a69fbc882ac509e60ef0b6419c5dc':
  IMS Call End Cause Additions
 2014-12-04 21:45:21 +00:00
Cheuksan Wang
29ac679f9f am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
  new SMS/MMS carrier app API
 2014-12-04 21:45:08 +00:00
xinhe
a766b75103 am c377c360: am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit 'c377c360e971b07ccb3c2937f23168c88f426640':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 21:23:53 +00:00
Wink Saville
6abe46c472 am 58a3561f: am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '58a3561f74204a3c4cf913169ebc990ca9c0db28':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 21:23:48 +00:00
xinhe
c377c360e9 am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit '9a4472bf45044082f4fa6d906530f3640761676a':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 21:17:50 +00:00
Wink Saville
58a3561f74 am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '0304c529b6a166547aaf104a46bc876780ba7416':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 21:17:43 +00:00
Robert Greenwalt
48af2cf8cd am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '83c0b096b775e7b39f89c2da1c9a8193555c0178':
  Separate voice/data roaming state and type
 2014-12-04 20:45:03 +00:00
Robert Greenwalt
83c0b096b7 am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '98f81182fb61953e0712bd788941710b6ad842c2':
  Separate voice/data roaming state and type
 2014-12-04 20:23:55 +00:00
Omkar Kolangade
93c33d7d90 IMS Call End Cause Additions 
Adding call end reasons for the
following use cases:
1. User rejects/ends call due to
   low battery.
2. User rejects call due to
   blacklisted call ID.

Bug: 18481702
Change-Id: I3537c732880e60218c83ec69861cb788adc57bc1
 2014-12-04 01:30:34 +00:00
Cheuksan Wang
109ec376da Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 2014-12-04 00:19:06 +00:00
xinhe
8f61e7549e Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 2014-12-03 23:39:32 +00:00
xinhe
18b9c3cb50 Unable to unlock SIM with a PIN/PUK 
call TelephonyManager.getSimState instead of accessing systemProperty
Bug:18489776

Change-Id: I45d2315a588f706c4815750963dcfec9f8409c5d
 2014-12-03 23:36:16 +00:00
Wink Saville
82611e6d9c Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 2014-12-03 23:32:46 +00:00
Robert Greenwalt
647b437d07 Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 2014-12-03 22:18:24 +00:00
Wink Saville
47920fac33 Add getSimStateForSubscriber and additional SIM_STATE_XXXX values 
Bug: 18364932
Change-Id: I836b751a443635efcfb9987bb3b91f55c4dff9d6
 2014-12-02 17:08:14 -08:00
Stuart Scott
cacd99bd2c am cc4cd6e1: am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 
* commit 'cc4cd6e1abe81d1edda7f1489dbd26298d38a699':
  Subscription Info density-dependent text size and localized SIM slot index
 2014-12-03 00:29:21 +00:00
Stuart Scott
cc4cd6e1ab am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 
* commit '15b2d9ab44690156e067020e12b329997ef5bba6':
  Subscription Info density-dependent text size and localized SIM slot index
 2014-12-02 21:18:29 +00:00
Stuart Scott
4e779ecd56 Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 2014-12-02 21:04:54 +00:00
Jing Zhao
e6edb161a7 Separate voice/data roaming state and type 
It is possible for voice and data to register on different networks so
that the roaming state for them could be different. Provide separated
APIs to handle voice and data roaming.

Also, add the configuration of CDMA international roaming indicators.

Bug: 17318123
Change-Id: Iede9132cbf94bc9971702bd9232374585edd5cd0
 2014-12-02 12:33:06 -08:00
Junda Liu
b27dbd2151 am 92205a33: am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit '92205a33655f8a4f487e8d85a9d6d151d0db21a1':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:52:28 +00:00
Junda Liu
92205a3365 am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit '50e2d6c2ce079c00531ecbcf112593cb0263e47a':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:45:41 +00:00
Junda Liu
ef6178a99c Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 2014-12-02 18:18:24 +00:00
Cheuksan Wang
b72eb97e4b new SMS/MMS carrier app API 
Changes based on api council review

BUG: 18005911
Change-Id: I23bd207ce70f7fa201d6d964c1700cfc44cb009b
 2014-12-01 18:11:07 -08:00
Pavel Zhamaitsiak
9c2268388a am fd5fc197: am 75371fd7: am 73f10473: Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev 
* commit 'fd5fc197985701c23025481c145df407983f237c':
  MSIM IMS: convert to phone ID based selection.
 2014-12-02 01:45:59 +00:00
Pavel Zhamaitsiak
fd5fc19798 am 75371fd7: am 73f10473: Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev 
* commit '75371fd7eeda52cb04a77b4e218c470c79e20402':
  MSIM IMS: convert to phone ID based selection.
 2014-12-02 01:39:26 +00:00
Etan Cohen
fbedecc099 MSIM IMS: convert to phone ID based selection. 
Bug: 18576822
Change-Id: I2a756782ccdab5e4d10193c593cf89a7aa4fcda4
 2014-12-01 23:30:58 +00:00
Shishir Agrawal
688b107330 am 7158dfb1: am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 
* commit '7158dfb1be1689282e0014bd779b7510e85022c8':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
 2014-12-01 20:36:12 +00:00
Shishir Agrawal
7158dfb1be am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 
* commit '592707c5250655cbed2b48848701b288605c01ac':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
 2014-12-01 20:29:07 +00:00
Shishir Agrawal
0201a6f6f1 TelephonyManager.setLine1NumberForDisplay should return a boolean. 
The call can fail and should return the success status of the call.

Bug: 18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
 2014-12-01 11:48:53 -08:00
Amit Mahajan
cf45709e5c am 719638af: am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit '719638afea79a3cee77fc75c4c54d36de2ca44a5':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:37:54 +00:00
Amit Mahajan
719638afea am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit 'b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:32:06 +00:00
Stuart Scott
7151cde3ca Subscription Info density-dependent text size and localized SIM slot index 
Change-Id: I49fed470ea82c91ff7d77df2c3447b17a203a38d
 2014-12-01 11:14:53 -08:00
Amit Mahajan
bc2f1371bb am 65940c4c: am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '65940c4ceb43e81aa720a29a9bb84818bdaabcbc':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:09:47 +00:00
Amit Mahajan
65940c4ceb am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '476520f744a950fc27d6ac466c301a909d92481a':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:02:28 +00:00