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

2542 Commits

Author SHA1 Message Date
Amit Mahajan
ec20fc9273 am 190202f7: am dbbf4932: am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3 
* commit '190202f7e586e02e098b330ac84eb441a56005d3':
  Sms7BitEncodingTranslator
 2014-10-07 05:23:20 +00:00
Amit Mahajan
dbbf493220 am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3 
* commit 'd9a3f89a0727590a069c563a8b97fe99b866d67c':
  Sms7BitEncodingTranslator
 2014-10-07 05:12:44 +00:00
Amit Mahajan
d9a3f89a07 Merge commit '69555fc2' into fix-merge-conflict3 
Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
 2014-10-06 21:57:42 -07:00
Xia Ying
43eb8a97e7 Sms7BitEncodingTranslator 
Bug: 16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
 2014-10-07 01:02:04 +00:00
Etan Cohen
fe98046494 am 3b73c5c3: am 53fbb02d: am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev 
* commit '3b73c5c3cfc9754358ba1f4c49582d303fd04d8a':
  Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
 2014-10-02 22:01:39 +00:00
Etan Cohen
53fbb02d6d am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev 
* commit 'b3a29067e956c05fd9f01bb31ae4101b43b95948':
  Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
 2014-10-02 21:48:20 +00:00
Etan Cohen
b3a29067e9 am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev 
* commit '81e3e4724d2c506bf9e920fd253c54a0bbd38706':
  Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
 2014-10-02 21:42:15 +00:00
Etan Cohen
6415fba31c Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA. 
Bug: 17784975
Change-Id: Ic887477fac1d45f547e30ed6e3c1158fb9a3b893
 2014-10-02 19:14:18 +00:00
Stuart Scott
3aacaac344 am a541338a: am ec89863a: am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev 
* commit 'a541338a1eaa0fd3ed53c4eaf4be2551ec1a7350':
  Get the MCC/MNC using defaults.
 2014-09-30 16:12:42 +00:00
Stuart Scott
ec89863ade am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev 
* commit '38bfcb4affb234ca901912155d41ec06dce4f43a':
  Get the MCC/MNC using defaults.
 2014-09-29 21:11:50 +00:00
Stuart Scott
015f3b464c Get the MCC/MNC using defaults. 
First try default data, then default sms, then default voice, finally
try the first sub to come up.

bug: 17396869
Change-Id: I09da19b7b25c2a6aa8affd95847dbb10e039f634
 2014-09-29 13:20:25 -07:00
New Author Steven Liu
cedd0910f9 am 20bb1511: am 1f228230: am 1f560a73: am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app 
* commit '20bb15116147edb3364f68f0b7f0d1a3cb588181':
  redirect RIL_UNSOL_OEM_HOOK_RAW to system app
 2014-09-27 07:35:29 +00:00
New Author Steven Liu
15d9ce3e38 am 1f560a73: am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app 
* commit '1f560a7368f8e3bf6b31aec78651419e55786e18':
  redirect RIL_UNSOL_OEM_HOOK_RAW to system app
 2014-09-27 07:26:47 +00:00
New Author Steven Liu
36e7229835 am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app 
* commit '0f84094579696739facbd75a56a4e7b98a6a5edc':
  redirect RIL_UNSOL_OEM_HOOK_RAW to system app
 2014-09-27 07:22:10 +00:00
New Author Steven Liu
485f2095f8 redirect RIL_UNSOL_OEM_HOOK_RAW to system app 
Add LISTEN_OEM_HOOK_RAW_EVENT and onOemHookRawEvent to PhoneStateListener.

Bug: 17298769
Change-Id: Iaea054d3cc2925eea1e11f8871faabc7bc9dfb2d
 2014-09-27 07:16:38 +00:00
Etan Cohen
96117a7176 am 07719bb5: am 2b267872: Added mechanism to merge voice & baseline ServiceState objects. 
* commit '07719bb58313a78af087495874358dc4f22b9098':
  Added mechanism to merge voice & baseline ServiceState objects.
 2014-09-27 06:12:08 +00:00
Etan Cohen
dcc0736c43 Added mechanism to merge voice & baseline ServiceState objects. 
Needed in the context of separate phones handling baseline connectivity
and voice connectivity (e.g. IMS).

Bug: 17627405
Change-Id: Ifb5a6ea11f6350090b989408e9eed80958d8558b
 2014-09-27 04:55:28 +00:00
xinhe
12dc15b355 am feffe6cc: am 753044d3: am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev 
* commit 'feffe6cc5019d0a2bd870bcc14d7b92dd3500c4b':
  Support multiple SIM/Subscription on telephony registration
 2014-09-26 20:52:03 +00:00
xinhe
31a5a1c15c am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev 
* commit '53ba6368fe84513f0cd2726938fbf8838dcf68b3':
  Support multiple SIM/Subscription on telephony registration
 2014-09-26 19:47:02 +00:00
xinhe
3d4834f0eb Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev 2014-09-26 16:47:04 +00:00
Junda Liu
5c1d26bac3 am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev 
* commit '65f5ce82b4d54d1b5156c7196dab9ade34f8f600':
  Revert "Hide CarrierPrivilege APIs in TelMgr."
 2014-09-26 04:28:42 +00:00
xinhe
e9f1640b6b Support multiple SIM/Subscription on telephony registration 
During calling telephony registry call back API, we force the call back will be
triggered if the registered subId is Default Sub ID. This is due to some risk
condition. Please refer to Issue 17472622 and its fix. This fix is ok for single
SIM/Subscription. However, on multiple SIM/subscription, there is potential problem
on wrong notifications.

Bug:17613629
Change-Id: I3f41e03f37424bcc82a71090d4f4142b4c5ba922
 2014-09-25 18:52:58 -07: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
f52ac900ca Revert "Hide CarrierPrivilege APIs in TelMgr." 
This reverts commit b7aa9e4a6338811d4dacc77e6024a0b97a99e5e9.

Change-Id: I212cd4f1b7b45e0523fc47b2a9c2a6b487e9dbb5
 2014-09-25 18:56:11 +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
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
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
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
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
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
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
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
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
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
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
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