Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,266 Commits 3 Branches 0 Tags
445fff144d37d3b4af978decafbb4455683fdf02
Commit Graph

2557 Commits

Author SHA1 Message Date
Stuart Scott
4caa333b83 am 3aacaac3: am a541338a: am ec89863a: am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev 
* commit '3aacaac344d3bc9699d8dbb89094867310417725':
  Get the MCC/MNC using defaults.
 2014-09-30 16:19:46 +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
70d7a7a2af am cedd0910: am 20bb1511: am 1f228230: am 1f560a73: am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app 
* commit 'cedd0910f9ebfbf40ba8b17c08bc802773a4425d':
  redirect RIL_UNSOL_OEM_HOOK_RAW to system app
 2014-09-29 19:47:48 +00:00
Etan Cohen
531b17a2e4 am 96117a71: am 07719bb5: am 2b267872: Added mechanism to merge voice & baseline ServiceState objects. 
* commit '96117a717616b1d3fbf1129084b3b7f4c35b456d':
  Added mechanism to merge voice & baseline ServiceState objects.
 2014-09-29 19:47:02 +00: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
bfcc536eb7 am 56ad075e: am feffe6cc: am 753044d3: am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev 
* commit '56ad075e34a8036774ba29d130c098bcae00cdd9':
  Support multiple SIM/Subscription on telephony registration
 2014-09-26 21:03:02 +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
320ced0674 am 330bdf85: am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev 
* commit '330bdf857fffdbf0e1c6d8e47dd36195eaff4f34':
  Revert "Hide CarrierPrivilege APIs in TelMgr."
 2014-09-26 15:26:59 +00:00
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
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
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