Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,723 Commits 3 Branches 0 Tags
9acd65e488152494e28cf5f8564a901fb1c2acda
Commit Graph

2516 Commits

Author SHA1 Message Date
Wink Saville
9acd65e488 am 6a3e5406: am b5942450: Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber. 
* commit '6a3e54061dffa161b7736420f9e2f4a1628d6a13':
  Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber.
 2014-09-19 04:25:54 +00:00
Wink Saville
5a1216bd67 am 7566ef9e: am 78a04d06: Unhide SubscriptionManager and SubInfoRecord 
* commit '7566ef9e16ed395ba50d27cafc0c51e0d1219411':
  Unhide SubscriptionManager and SubInfoRecord
 2014-09-19 04:08:27 +00:00
Wink Saville
4b4d685341 am 1ddcdc2d: Merge commit \'e58e59cc\' into fix-merge-conflict 
* commit '1ddcdc2d1cef6387612923ad3f9e73de12727dc1':
  ksd to lmp-sprout-dev
 2014-09-19 03:21:56 +00:00
Sailesh Nepal
c8d894b9f7 am 6bdca97a: am 40c4c3eb: am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev 
* commit '6bdca97ac497fd17335905281530ffbc978cbe39':
  Include code when converting unknown causes to string
 2014-09-17 18:45:41 +00:00
Sailesh Nepal
7f46657454 Include code when converting unknown causes to string 
Bug: 17535687
Bug: 17241433
Change-Id: I12f0c3b4334dfcb5ac0cd2439ecab9dc77546680
 2014-09-17 04:27:36 +00:00
Andrew Lee
fb748b69d4 am 5325e9bf: am 2167e7dd: am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev 
* commit '5325e9bf00c1a0b057cd66ede9f5ef10ee6c7f1e':
  Add new DisconnectCause class to telecomm.
 2014-09-16 22:18:08 +00:00
Andrew Lee
7f3d41fd12 Add new DisconnectCause class to telecomm. 
+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.

Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
 2014-09-16 12:07:41 -07:00
Wink Saville
48068c86d5 am b5942450: Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber. 
* commit 'b5942450f1c2e873862c3f188a7b116d4164e15e':
  Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber.
 2014-09-16 00:05:36 +00:00
Wink Saville
1ecaf11828 am 78a04d06: Unhide SubscriptionManager and SubInfoRecord 
* commit '78a04d069fe0438cdb324cb94351ff79fa2f48cf':
  Unhide SubscriptionManager and SubInfoRecord
 2014-09-15 21:30:52 +00:00
Wink Saville
02e3979d62 Merge commit 'e58e59cc' into fix-merge-conflict 
* commit 'e58e59cc':
  ksd to lmp-sprout-dev

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/SubInfoRecord.java
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ISub.aidl
	telephony/java/com/android/internal/telephony/TelephonyIntents.java

Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd
 2014-09-15 12:40:02 -07:00
Yorke Lee
4a19862413 am 5916e775: am 952a2f89: am f3804c3c: Pipe TelephonyManager.getCallState through TelecommManager 
* commit '5916e7752da2ffa29d056ba446f88daf7d1356f0':
  Pipe TelephonyManager.getCallState through TelecommManager
 2014-09-14 17:39:41 +00:00
Yorke Lee
2ae312e306 Pipe TelephonyManager.getCallState through TelecommManager 
* Add TelecommManager.getCallState (hidden API)
* Make TelephonyManager.getCallState call through to
TelecommManager, to be consistent with
TelephonyManager.ACTION_PHONE_STATE_CHANGED broadcasts for
overall call state. Telephony continues to manage call states for
individual subscriptions.

Bug: 17378767
Change-Id: Ia5e8b21df801ed3af4f6e14c110a72c92f077f88
 2014-09-14 09:54:23 -07:00
Tyler Gunn
cc616bca0d am b51263b9: am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit 'b51263b99fc2c8293e1f0fe844e65ce2afec2089':
  Renaming Telecomm to Telecom.
 2014-09-13 18:19:31 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Cheuksan Wang
9deec68832 am 051af39c: am 249ef14b: am 59c04032: Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev 
* commit '051af39c8357fcb7d40c99781bde92f34c4ffe50':
  Send and download MMS via content provider instead of PDU bytes.
 2014-09-13 02:16:10 +00:00
Anthony Lee
1db943197b am d1155b23: am 821b1df1: am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev 
* commit 'd1155b23b3e5d49669462a5f687a0966d72b7ede':
  isValidSlotId() and isValidPhoneId() updated to handle negatives.
 2014-09-12 19:22:52 +00:00
Cheuksan Wang
a6c52ac624 Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev 2014-09-12 17:07:49 +00:00
Cheuksan Wang
ee04543d58 Send and download MMS via content provider instead of PDU bytes. 
Change-Id: Ib5a93d07799c9e14fea8be820c6bd4bc7ae8be3a
 2014-09-11 14:17:15 -07:00
Anthony Lee
b78890c159 isValidSlotId() and isValidPhoneId() updated to handle negatives. 
The old version of the code wanted to just check to make sure
that the slot/phone id is greater than INVALID_SLOT_ID or
INVALID_PHONE_ID that are both currently defined to be -1000. The
changes are made for 2 reasons.  First, INVALID_SLOT_ID and/or
INVALID_PHONE_ID might not always be defined to be a negative value
so there is a big assumption.  Secondly, anything greater than
-1000 allows other negative values to be considered valid ids.

Bug: 17243556
Change-Id: I2bbfcc2cfd2d7c4772dfb9c50af2dc88c0f315e2
 2014-09-11 12:37:29 -07:00
Derek Tan
4e77e58cc1 am df4aee76: am 5cebc235: am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev 
* commit 'df4aee76cc6da4c6f9f1e3ca5153c8dbf537d1a3':
  Update the comment in two APIs since we will persist the settings.
 2014-09-11 17:30:37 +00:00
Derek Tan
6d955b88c3 Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev 2014-09-11 05:16:35 +00:00
Brian Williammee
7d1d2e39f3 Improve equals and hashCode in CellIdentityXxx methods 
The equals methods were a lot of dead code that boiled down to
seeing if two references pointed to the same object.  The hashCode
methods were likely to result in collisions on unequal objects.

Bug: 10328291
Change-Id: I4bd93efd1f4a34e9dec55ac05868df37368abd6a
 2014-09-10 17:06:09 -07:00
Wink Saville
62ee07d160 Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber. 
Bug: 17255752
Change-Id: I0c792227105c6b4697b9de0e7120247795ab6641
 2014-09-09 23:20:18 -07:00
Junda Liu
7100d15a99 am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument. 
* commit 'bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8':
  Add ForSubscriber suffix to APIs w/ subId argument.
 2014-09-10 01:00:59 +00:00
Junda Liu
13e28bb938 Add ForSubscriber suffix to APIs w/ subId argument. 
Bug: b/17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
 2014-09-09 17:50:09 -07:00
Wink Saville
f2090b88b7 Unhide SubscriptionManager and SubInfoRecord 
Change-Id: I1e6efb4442f0400d404d725c7db5020a26c00f98
 2014-09-09 19:51:45 +00:00
Wink Saville
6e9c5aeeee am 5dac65ad: Change suffix UsingSubId to ForSubscriber. 
* commit '5dac65ad043ee9d0535813ef5dba06dd80c11f82':
  Change suffix UsingSubId to ForSubscriber.
 2014-09-09 17:46:37 +00:00
Wink Saville
bc0272754d Change suffix UsingSubId to ForSubscriber. 
Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
 2014-09-09 17:38:19 +00:00
Wink Saville
8110da62ed am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev 
* commit '26207b53a82f1e8f3d72eaf36bd69dbcb06833fc':
  Change getCurrentPhoneType to SystemApi
 2014-09-09 00:04:50 +00:00
Amit Mahajan
5dd345286c am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-dev 
* commit '034fe21c638960d8d67711f446c818b93e41641e':
  Assisted dialing support of MO SMS
 2014-09-09 00:04:47 +00:00
Wink Saville
40e9f393df Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev 2014-09-09 00:00:49 +00:00
Amit Mahajan
4009b98f73 Merge "Assisted dialing support of MO SMS" into lmp-dev 2014-09-08 23:56:31 +00:00
Amit Mahajan
07018456d9 am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev 
* commit '1fa77bb56b47049ab90fb3b1b81f1588896bc87c':
  change the property name about IDP from 'telephony.' to 'gsm.'
 2014-09-08 23:54:31 +00:00
Wink Saville
96b3e61ff6 Change getCurrentPhoneType to SystemApi 
Bug: 17394367
Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683
 2014-09-08 16:52:03 -07:00
Steven Liu
db960ad188 change the property name about IDP from 'telephony.' to 'gsm.' 
'telphony.' couldn't be set successfully.

Change-Id: I8a9ee29461bf764f2b269bb81fafe83d8d5e48d9
 2014-09-08 16:47:15 -07:00
Derek Tan
2bae510cce Update the comment in two APIs since we will persist the settings. 
Bug: 17255752
Change-Id: I28926381e8e982579b38c19799078f7a3151aefe
 2014-09-08 10:55:29 -07:00
Junda Liu
077ffae681 am 8e250c57: Merge "Hide APIs for simplified network settings." into lmp-dev 
* commit '8e250c572a6d56ba6b3645faa5b32edf1e795442':
  Hide APIs for simplified network settings.
 2014-09-06 02:58:04 +00:00
Junda Liu
c6bd32e94f Merge "Hide APIs for simplified network settings." into lmp-dev 2014-09-06 00:55:30 +00:00
Derek Tan
79b0cbb799 am de6fefb4: Merge "Update the preferred network type APIs." into lmp-dev 
* commit 'de6fefb4f5e9da6aedc600abd7c10d14398b47c7':
  Update the preferred network type APIs.
 2014-09-06 00:18:28 +00:00
Derek Tan
54e883bedc Update the preferred network type APIs. 
Bug: 17255752
Change-Id: I8f74749752f8d8c6cd5b28dd5fe4ed89a33481ed
 2014-09-05 17:06:46 -07:00
Derek Tan
22a3cf8349 am 6f25963e: Merge "Remove setCdmaSubscription API." into lmp-dev 
* commit '6f25963ebc8f91638b056107a7b7bdb6e182102f':
  Remove setCdmaSubscription API.
 2014-09-06 00:02:58 +00:00
Derek Tan
0bee5f5208 am d16f633f: Merge "Update the comment in sendEnvelope." into lmp-dev 
* commit 'd16f633fc9c949af155b3dff5f6f2d98c50a7c80':
  Update the comment in sendEnvelope.
 2014-09-05 23:58:16 +00:00
Shishir Agrawal
c4799b6bdc am 32148644: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev 
* commit '321486444e6c4d7ee77f8981e9921b923308ced9':
  API change: SetOperatorBrandOverride should not take iccId as a param.
 2014-09-05 23:58:13 +00:00
Derek Tan
b5928445d1 Merge "Remove setCdmaSubscription API." into lmp-dev 2014-09-05 23:53:55 +00:00
Derek Tan
a0729d3487 Merge "Update the comment in sendEnvelope." into lmp-dev 2014-09-05 23:53:10 +00:00
Xia Ying
77ea3ee5ec Assisted dialing support of MO SMS 
This is special for VZW requirement. Follow the specificaitons
of assisted dialing of MO SMS while traveling on VZW CDMA,
international CDMA or GSM markets.

Change-Id: I34a531b817095f4ce035f3f49a3bf7d6e2e8bc13
 2014-09-05 16:52:56 -07:00
Shishir Agrawal
1244333998 Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev 2014-09-05 23:51:40 +00:00
Junda Liu
b8025f3260 Hide APIs for simplified network settings. 
Bug: b/17255752
Change-Id: Ibbe5d5cdbc2398ba0df2103bd7a33b98dc977734
 2014-09-05 16:46:38 -07:00
Vineeta Srivastava
e30eeb5f56 am a8ceba1c: Merge "Plus code handling for non-NANP CDMA carrier" into lmp-dev 
* commit 'a8ceba1cb610c2ce166d4cdcbdb6eaec08886aa9':
  Plus code handling  for non-NANP CDMA carrier
 2014-09-05 23:03:22 +00:00
Shishir Agrawal
d2cfa92146 API change: SetOperatorBrandOverride should not take iccId as a param. 
Taking ICCID as a parameter is not scure since a carrier can override the
brand for other carriers. We should override only the current ICCID.

Bug: 17390144

Change-Id: I9be2cb5c5fa15367fcb3b548b6e601a294e84dbc
 2014-09-05 15:37:44 -07:00