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

2787 Commits

Author SHA1 Message Date
Pavel Zhamaitsiak
3c78e6a35e am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 
automerge: 4abd09f

* commit '4abd09f773a938fe006e4cc0839f0dc6023cb2f3':
  IMS OMA-DM Intent and ImsReasonInfo Additions
 2014-12-16 19:38:41 +00:00
Pavel Zhamaitsiak
4abd09f773 am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 
* commit 'ab4f9976e0cade0009223681ecc5ff49df160dd7':
  IMS OMA-DM Intent and ImsReasonInfo Additions
 2014-12-16 19:37:15 +00:00
Omkar Kolangade
827fcb7f8d IMS OMA-DM Intent and ImsReasonInfo Additions 
Adding an intent for OMA-DM use case where
the network sends a string error indicating
the device is not provisioned to make calls.
The string the network is expected to send
is added to ImsReasonInfo.

Bug: 18242739
Change-Id: If7f654f834f543523af40b422ea9659c5f0b4de4
 2014-12-16 09:48:27 -08:00
Amit Mahajan
33dba3d4d3 am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
automerge: 98cc133

* commit '98cc133f077ba393d6c9a6e302c3e89ade64247f':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:28:43 +00:00
Amit Mahajan
98cc133f07 am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
* commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:27:10 +00:00
Amit Mahajan
d060b50b33 Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 2014-12-15 19:06:48 +00:00
Amit Mahajan
d9835f0c16 Change to treat slotId 0 emergency numbers as default. 
Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
 2014-12-15 10:38:27 -08:00
Wink Saville
6cc211669c am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: 6cc44cc 
automerge: 05e2ada

* commit '05e2ada58a79994170e8e98ff9a619715cdddc28':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:45:29 +00:00
Wink Saville
05e2ada58a am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
automerge: 6cc44cc

* commit '6cc44cce0e375b165580a8061359b2ff163a4556':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:42:38 +00:00
Wink Saville
a54bf65833 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId. 
Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
 2014-12-11 13:37:50 -08:00
Pavel Zhamaitsiak
072c7638af am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev automerge: b07de8d 
automerge: de67144

* commit 'de6714474d9d54c5ba0d6a83eafe5ecb96bf337e':
  Add missing member to string conversion - helps in debugging.
 2014-12-11 10:24:36 +00:00
Pavel Zhamaitsiak
de6714474d am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 
automerge: b07de8d

* commit 'b07de8d172e7c7b663dec0dd14f7d6dba168aa4c':
  Add missing member to string conversion - helps in debugging.
 2014-12-11 05:47:45 +00:00
Pavel Zhamaitsiak
fda0ff020d Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 2014-12-11 04:47:20 +00:00
Shishir Agrawal
f864e44901 am 23172c70: am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd 
* commit '23172c706b0422ec2cc5bb9e1988a3bd2944a257':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
 2014-12-11 01:39:54 +00:00
Shishir Agrawal
23172c706b am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd 
* commit '960dccebf576d53059fd7d026cdd1b81fb0b5974':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
 2014-12-11 00:24:33 +00:00
Shishir Agrawal
951dcdd940 Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev 2014-12-10 23:19:16 +00:00
Wink Saville
5109041731 am 3a426694: am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev automerge: afd6f5a 
* commit '3a426694ffa268b331c5b1fc5bb40460d6d883c5':
  Update API and documentation for invalid subscriptions id's
 2014-12-10 21:59:42 +00:00
Wink Saville
3a426694ff am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev 
automerge: afd6f5a

* commit 'afd6f5a37ec4c39fffdb5f29fff7450284a3c562':
  Update API and documentation for invalid subscriptions id's
 2014-12-10 19:23:23 +00:00
Etan Cohen
db45a01e22 Add missing member to string conversion - helps in debugging. 
Change-Id: I0c8b58f69adcd89038a2c320c9d75172b7a10d5c
 2014-12-10 18:17:26 +00:00
Wink Saville
eb4de87683 Merge "Update API and documentation for invalid subscriptions id's" into lmp-mr1-dev 2014-12-10 17:56:58 +00:00
Pavel Zhamaitsiak
1263d0cd39 am 6549e9be: am 1e989df5: am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev 
* commit '6549e9be44d2370b624079c0a8ead95c9588afb7':
  IMS: change getMasterValue to getProvisionedValue.
 2014-12-09 23:49:00 +00:00
Pavel Zhamaitsiak
4ef46266d3 am 863fb4dd: am d2762ca9: am 14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev 
* commit '863fb4ddcac01849b66025e202302b8e1431d7e9':
  IMS: add ImsConfig api to get volte provisioned value.
 2014-12-09 23:48:55 +00:00
Wink Saville
189c180857 am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '7a4df2b7d8fc162881dd482fb13fe85c780d0351':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 23:47:19 +00:00
Narayan Kamath
b328d72057 am 8ff1a5ee: am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc." 
* commit '8ff1a5ee0df9abba4fc63bcfc93efbda4a176255':
  Fix PhoneStateListener constructor javadoc.
 2014-12-09 23:23:41 +00:00
Pavel Zhamaitsiak
22595d9c43 am 963db3fa: am c67da06d: am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev 
* commit '963db3fa697016051a570ccb2d6b566db4f2d594':
  IMS: start and stop dtmf tones.
 2014-12-09 23:22:33 +00:00
Jeff Sharkey
a9f6048a94 am d5b5576d: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
* commit 'd5b5576dd6565a61030d7769a44bd5189242a7e2':
  Offer to "merge" subscribers for data usage.
 2014-12-09 22:23:19 +00:00
Pavel Zhamaitsiak
6549e9be44 am 1e989df5: am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev 
* commit '1e989df50d3435c47c8685caabb463ec34f59840':
  IMS: change getMasterValue to getProvisionedValue.
 2014-12-09 20:34:48 +00:00
Pavel Zhamaitsiak
863fb4ddca am d2762ca9: am 14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev 
* commit 'd2762ca9bcb902cc9c66d26ac4268d14a164c46e':
  IMS: add ImsConfig api to get volte provisioned value.
 2014-12-09 20:34:43 +00:00
Shishir Agrawal
5fb1118d8c Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming. 
The calls allow us to specify MCC/MNCs (for GSM) and SIDs for CDMA that should
not be considered as roaming for the current ICCID.

Bug: 13288143

Change-Id: Iae97b02f3eb9954fedf1b005c9ecd2aa09138505
 2014-12-09 10:37:16 -08:00
Wink Saville
7a4df2b7d8 am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '2f5cb843553a596d314596c2bb776541db864d63':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 18:06:03 +00:00
Libin.Tang@motorola.com
2cdac3bd53 IMS: change getMasterValue to getProvisionedValue. 
Bug: 18576107
Change-Id: I21293d42b87911a98af8169b697d0e40eafb8760
 2014-12-09 10:03:21 -08:00
Libin.Tang@motorola.com
bec2c3e251 IMS: add ImsConfig api to get volte provisioned value. 
Bug: 18576107
Change-Id: I22d9f675ec607c30906b36cdab72e4d25463ecf5
 2014-12-09 10:03:21 -08:00
Wink Saville
15b29ac7fa Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 2014-12-09 17:52:27 +00:00
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