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

2537 Commits

Author SHA1 Message Date
Junda Liu
5c65836f58 am 85764048: am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '8576404876fe609d74c26945fa4b5beb9a0edf96':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-26 15:25:43 +00:00
Junda Liu
6c49e6e923 am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '73d72b6067d7b25c6727b054cfcc44997d03fc23':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-26 00:23:03 +00:00
Junda Liu
cb6b5f9bd1 am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '96c548791145ab33ceb0935f38323d3182d44419':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 17:46:39 +00:00
Junda Liu
bac6d61ab6 Hide CarrierPrivilege APIs in TelMgr. 
Per API council decision, we will polish and public in MR1.

Bug: b/17639966
Change-Id: Id009cd62b4d44dd17fe7a30e0f8037c6fb373c32
 2014-09-25 10:25:10 -07:00
Wink Saville
cf56442090 am 3d74e690: am 01632c82: am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev 
* commit '3d74e690724ada5f011e0f6c7217a31ce5681a96':
  Add SM isUsableSubIdValue
 2014-09-23 23:12:01 +00:00
Wink Saville
8ac6bb335d am 01632c82: am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev 
* commit '01632c82fe635fd6501f9fd5190754e229944ce7':
  Add SM isUsableSubIdValue
 2014-09-23 22:59:20 +00:00
Wink Saville
8eab2b6bdf Add SM isUsableSubIdValue 
Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
 2014-09-23 14:20:58 -07:00
xinhe
2f7926be45 am c1a7454d: am cad7b8cd: am ec6b28c3: am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'c1a7454da647e65df04fdfee2e024383259f9b67':
  Fix for empty RSSI triangle after boot
 2014-09-23 16:21:32 +00:00
xinhe
f7d75f26f4 am cad7b8cd: am ec6b28c3: am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'cad7b8cd31e936337a63f9309c2934607d7493d2':
  Fix for empty RSSI triangle after boot
 2014-09-23 15:50:37 +00:00
xinhe
f57086a38c am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'f1524b5db229bc08b65df70e8da0e450d153cff3':
  Fix for empty RSSI triangle after boot
 2014-09-23 00:16:05 +00:00
xinhe
43c5029349 Fix for empty RSSI triangle after boot 
After device bootup, the signal strength triangle is empty although there is
both voice and data connection. This is due to when TelephonyRegistry doing call
back listen register, some APP use mDefaultSubID. However, when the reigister
happen, the mDefaultSubId does not exist. Althouhgh it can be update later, if
the update event comes too late (especially after the steady state), no
ServiceStatechange event can be received anymore. Thus the service is always not
available and the signal stength trangle has no chance to be updated anymore.
This is a risk condition.

Bug:17472622

Change-Id: I772d29e6dd9da212b78fd0d4438b8273e3318dba
 2014-09-19 16:22:12 -07:00
Wink Saville
40aca89a27 am c501947a: Merge commit \'edd57a98\' into fix-conflict 
* commit 'c501947a3ebed84792c235f29c73194d095906ed':
 2014-09-19 06:44:44 +00:00
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
506e560509 am 715683e4: am b1fdc4ba: am d3edb391: am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev 
* commit '715683e4f30b601d86d029c1b64c10918d43c98d':
  Include code when converting unknown causes to string
 2014-09-17 19:00: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
2853267816 am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev 
* commit '86f939e832c257b5fa2606aed00e9dfaeaef90cd':
  Include code when converting unknown causes to string
 2014-09-17 17:47:54 +00:00
Andrew Lee
f56946a81f am 8074424b: am df23ff67: am 14f6fff6: am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev 
* commit '8074424b69f0bddf4a802e9650eba6a6ca733b4f':
  Add new DisconnectCause class to telecomm.
 2014-09-17 14:12:51 +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
0686e30652 am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev 
* commit '258f835f705bfcead1769da703c4fdb78d71295a':
  Add new DisconnectCause class to telecomm.
 2014-09-16 21:51:43 +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
ee743e6071 resolved conflicts for merge of f3804c3c to lmp-sprout-dev 
Conflicts:
	telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ibdd0b6c2c9901ec46196ac9460a0908dfb739ad4
 2014-09-14 13:58:59 -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
6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev 
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
 2014-09-13 20:10:08 +00: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
f7a1e7a69e am 59c04032: Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev 
* commit '59c0403265a842ae47559b8b2055372a545edb61':
  Send and download MMS via content provider instead of PDU bytes.
 2014-09-12 18:52:39 +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
Anthony Lee
2222d9bc9e am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev 
* commit '12c83b93b13a7e6d37b385c1270c29d8a959bc78':
  isValidSlotId() and isValidPhoneId() updated to handle negatives.
 2014-09-12 07:21:03 +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
e7fc8602eb am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev 
* commit '4c8c759106eba4070a46393f2978607964881511':
  Update the comment in two APIs since we will persist the settings.
 2014-09-11 16:00:55 +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