History log of /frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
92760e1668917ad234d7283fc47d4c99f8c427c8 21-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix data connection issues introduced in a7228870

Bug: 25026240
Change-Id: Ia6c8c84106efd519abe42d2e7c24674bcb901125
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
682afe07527c6042e34b14fc29bf058e5b2cd7cc 15-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> Fix handling for no default phone.

When there's no sub available the SubscriptionManager gives
DEFAULT_PHONE_INDEX when asking for the default phone. Handle
that (gracefully do nothing).

bug:24939067
Change-Id: I43211b3026d358ec915d3426b0d89a1ac54c3cd5
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
a7228870e5203c8c0d73ea506ebac0a34e25b78a 09-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> Fix use of memorized phoneId.

We remember the phoneId we used to make the request so when the request is released we can
talk to the proper DcTracker even if the subId -> phoneId mapping is lost (removed the sim).
However the list of requests is a singleton and entries are stored per requestId so
a request that applies to multiple phones only has a single entry - we can't record
the phone id at request submission time.

Change it to store the phoneId at request execution time. This also removes the need
for a separate "has been executed" boolean since we won't have an executed-phoneId if
it's not been executed.

In the future we should get rid of multiple TelephonyNetworkFactories, simplifying all
this.

bug:24411288
Change-Id: Ie430e0a9251c3ae09384e1a4e29b65fe90f46740
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
558d6f408824b524d9f8d5310a772cc299ef8531 19-Aug-2015 Amit Mahajan <amitmahajan@google.com> Store phoneId in network requestInfo.

If the SIM is removed, phoneId returned by subscription controller
based on subId is MAX_INT leading to a crash.

Bug: 23315629
Change-Id: I8809cfaaeb6ff78b1e24915e350329b8133d99e9
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
5bc4a86f7d58a18a65c71e9227b0f09a6338ce0c 13-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Cleanup network release

Fixes a handful of issues. PendingRequests were getting touched on
random threads, so moved to handler thread. Release could get
confused by state changes, so made it depend only on state set
during the request (if it's in the pending list, remove it, if it's
on the request list, release it).

bug:23080486
Change-Id: Ia5884e100394efcd0a7ca7f2821b44c647ded07a
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
10d1e565e9b7446a661a2a5300b95c69817fe56b 11-Aug-2015 Amit Mahajan <amitmahajan@google.com> am d1158a95: Merge "Adding EmergencyCall state to DcSwitch state machine." into mnc-dev

* commit 'd1158a95f5b04fc3ca2ea96706f5a6065a40ad12':
Adding EmergencyCall state to DcSwitch state machine.
d1158a95f5b04fc3ca2ea96706f5a6065a40ad12 11-Aug-2015 Amit Mahajan <amitmahajan@google.com> Merge "Adding EmergencyCall state to DcSwitch state machine." into mnc-dev
f3cb9192272e4ddd68970352e998690f6c80e393 04-Aug-2015 Amit Mahajan <amitmahajan@google.com> Adding EmergencyCall state to DcSwitch state machine.

State will be entered on making emergency call, and ended either on
emergency call end or emergency callback mode end if that is supported.
This is only for CDMA.

Bug: 22777920
Change-Id: I9cac544966b1b6be5410a40273d20e52cab8b396
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
bea14741969f6b517ecf6390fa009d40ed36eeab 05-Aug-2015 Paul Jensen <pauljensen@google.com> am 1caf59d4: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev

* commit '1caf59d49e4713ad122bd9147c84759fcb935176':
Fix NOT_RESTRICTED network capability and enforce it.
1caf59d49e4713ad122bd9147c84759fcb935176 05-Aug-2015 Paul Jensen <pauljensen@google.com> Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
af171aa4dcf294bf2d1b9bed54ef9a6b0ec76361 31-Jul-2015 Paul Jensen <pauljensen@google.com> Fix NOT_RESTRICTED network capability and enforce it.

With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
46c4302b8f52fbd62d7000848cd2bb3d36d15725 31-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Don't process NetworkRequests when there are none.

getTopPriorityRequestPhoneId was making up DEFAULT Id when
there were no requests. This bogus data was confusing onProcessRequest
and causing it to think we were working with the wrong phone, triggering
a PS detatch.

bug:21988698
Change-Id: Idf9928ac75327509f81c47ecea48d75fbabc89b2
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
2f5e0f602beab84c8ba1a9c8ee7736c9df62b0be 29-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Revert "DO NOT MERGE Add logging to detect the start of a sync problem."

This reverts commit f65485c99cf0fb0e844ae9e39c2c6cd6bae0fd2c.

bug:22632129
Change-Id: I531668bc0874c71c70773ceda071cf5a7f5c1121
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
592359ae17a17d92bdaad8fb1757a769649ee7fb 28-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Catch nulls in the new logging code.

bug:22723423
Change-Id: I2e019732944e4738698db828cd4620963a5791dc
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
57da084e0a778f4c081315283bd4d14dd8289e0d 25-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Handle out-of-order request execution.

Don't process executeRequest if the request has been released.
A more comprehensive fix.

bug:22632129
Change-Id: Iadc78af0310091b962c6e803526811a243938095
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
f65485c99cf0fb0e844ae9e39c2c6cd6bae0fd2c 24-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE Add logging to detect the start of a sync problem.

This should be removed prior to shipment!

The DctController is getting out of sync with the ApnContexts. Add a callback
mechanism so the ApnContexts can let DctController know when they apply a change
and then when all is quiet we can compare and verify everything is good.

Potentially can fix the problem detected too (if there should be no live requests, nuke
the ref counts) but currently turned off so people will notice problems (battery life) and
file bugreports with the data of how it started.

bug:22632129
Change-Id: I84a67687f0b6dc43b2e429943935f4045ffc51ed
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
f15fec95574304db6a7f434fb606276f4b614e85 14-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Add logging for telephony network requests." into mnc-dev
2dde8b1659b1eb231e667bc19307ef294b627beb 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Add logging for telephony network requests.

Try to track and retain what happens to requests to get to the bottom of
20731384.

bug:20731384
bug:21641873
Change-Id: Iabb01b3866c6748323a967e26c008246b29bdb17
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
19736f6fbee4d3079dc2debf9fb6a54bf7686161 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Enable EMERGENCY mobile connections.

Hooks the ConnectivityManager.TYPE_MOBILE_EMERGENCY,
PhoneConstants.APN_TYPE_EMERGENCY, and NetworkCapabilities.NET_CAPABILITY_EIMS
together so carrier apps can request connections to this APN.

bug:21785357
Change-Id: Iafd477dbc7bda89de888a124602b21efbbaa6712
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
be2a6a25317c857290e486c0d9903c6cb658f9b5 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> More logging at dumpsys time.

Trying to understand what's happening in this issue.

bug: 20731384
Change-Id: I01d3516adb8f443ce3b616be5b296a00771f302a
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
dabb160754d8266ed97d819ba30d95b0d3dd6bb8 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Add dumpsys Logging.

This bug is hard to repro and understand. Add some clues.

bug:20731384
Change-Id: I7b0c65f07b4940f508826fc09bd9f51c0987e0a8
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
a5ea9112a448ee8a51df1a2317457ae560a191f2 07-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Clean up the switch state machine.

Handle inputs while in any state. This is made much easier by removing
the synchronous calls - any time you find a synchronous call into a state
machine you're doing something wrong.

Also rework the timeout system - it was bad in that it injected the
new session id whenever you start an new session so old timers were
always acted upon.

Also should eliminate/reduce the duplicate ALLOW_DATA RIL calls.

bug:20076867
Change-Id: Ibabd76fad0759dd9c403ac8ee017958e38df56a5
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
ceec26c0578b5eadeb15776b33a35010390040bb 08-Apr-2015 Abhishek Adappa <aadappa@codeaurora.org> Fix no data call on SIM2 on multisim

For release network request, request info is removed first
and then processed. Due to this, phone id cannot be retrieved
as there is no request info present, and default phone id of
sub1 is used. This is leading to issues in data call restore
to sub 2 after wifi is disabled.
Fix is to use the default data phone id instead of default phone id.

bug:20002067
Change-Id: I2a1aee22fb472ed591dfad8c8f829a3161606541
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
33d14d71f4b43d82d6c1b87d1d30cd86d13c5372 13-Jan-2015 Wink Saville <wink@google.com> Rename reg/unreg OnSubscriptionsChangedListener.

To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
d4865a0d910a03458730aa428fd008dc163ceab4 11-Dec-2014 Wink Saville <wink@google.com> Merge "[DS] Data registration fails" into lmp-mr1-dev
d21febaffa28f41e8cce37f88f4ceea5e7e2a398 11-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Add logging of TelephonyNetworkFactory" into lmp-mr1-dev
8bb75423745b09a92688919f5b32d49695a61abb 10-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Add logging of TelephonyNetworkFactory

It seems sometimes we don't react to a request properly. I suspect the
NetworkCapabilities are misconfigured for this Sub.

bug:18569575
Change-Id: I1a4605a4d9b02804f4d6a9b959e9f300008164a7
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
77d90293fb7dff1d71f6673e74192f8d265638b4 10-Dec-2014 Sanket Padawe <sanketpadawe@google.com> Fixed phone crash due to missing NP check.

Bug: 18291406
Change-Id: Iefc9b3834f7b138d8ebff917cfd4e9f57dbb472c
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
1392c6c61aaff0f52f8d21423956aef6fa80f46b 08-Dec-2014 Legler Wu <legler.wu@mediatek.com> [DS] Data registration fails

Try to process all request after sub ready. When encountering abnormal
situation and causes subscription manager unready, data frameworks needs
to process requests after subscription manager is ready again

Bug: 18542143
Change-Id: Idebacb242fb08ac6b9ed307572499a19753eba97
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
4b09dff383ae7dfca595aeeea886a594a1947340 22-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
299dad50409e907993fa96c7401d4f10c58018b1 11-Nov-2014 Wink Saville <wink@google.com> Update SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
26a0a93d610130e2a6f11a49f2f4b454617fcd55 28-Oct-2014 Shishir Agrawal <shishir@google.com> DctContoller should recreate TelephonyNetworkFactory on phone object update.

Not doing this means that a setup_data_call will not trigger when we change
phone (say from CDMA to GSM). Ideally it should be doing this on DcTracker
object getting created, but since DcTracker is tied to Phone, this approach
should work.

Bug: 18158402
Change-Id: I2ed04f1d7b48081e809925d9fda35062b40955ef
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
b237a11044ed842d2865ff8c8716befb06b6ca25 25-Oct-2014 Wink Saville <wink@google.com> Change subId to int from long

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
ba2cc792e5d696b7128df35a9f085c4950067c28 01-Oct-2014 Wink Saville <wink@google.com> Merge "Rename mDcSwitchState to mDcSwitchStateMachine." into lmp-sprout-dev
e27408ec980c598a29d2122ce157037c4707eb81 30-Sep-2014 Wink Saville <wink@google.com> No data connectivity.

Some devices aren't getting data connectivity, Motorola has supplied
this patch which fixes it. We may refine this change in the future.

Bug: 17696051
Change-Id: I84c916f498411eb808d8569fb30ec3acbab367c4
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
6bac33f472fbf66697b8eedd9b54a40daaba3086 30-Sep-2014 Wink Saville <wink@google.com> Rename mDcSwitchState to mDcSwitchStateMachine.

Add a couple log statements.

Change-Id: I1cdc307459e814f79a520e7d4ef8739dda37c056
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
1321ae8e44e3339ace5dabc4daf9512347c0fcc4 29-Sep-2014 Etan Cohen <etancohen@google.com> DctController onSettingsChange race condition with active phone ID - crash (NPE).

Change-Id: I84d8e97a9854638fb78b4c68ae9248188de5f57c
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
e97be3971cb6b55e019433c32524cc60ce0d037b 26-Sep-2014 Wink Saville <wink@google.com> Reorganize and add more dumps within opt/telephony.

In particular dump is added to PhoneProxy which dumps
PhoneSubInfoProxy which dumps PhoneSubInfo this should
provide the desired information.

Also add some additional pw.flush() statements to
minimize the buffer overflows and truncate the output.

Bug: 17545077
Change-Id: I39787a84c97a8fc0410419965f6be2468dec7568
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
bda761320929f714951c328bfec6a51a1978db97 23-Sep-2014 Wink Saville <wink@google.com> [DS] Data supports DSDS

Main modification:
1. Handle network requests for different subscriptions according
to the priority of the ApnContext
2. Handle data attach and detach procedures when switching the active
data subscription

Modifications in TelephonyNetworkFactory:
1. needNetworkFor; network request are dispatched to DctController for
determining the active data subscription.
2. releaseNetworkFor; DctController is notified that the network request is
going to be released and the active data subscription may be changed
after the release of network request.

DctController maintains all cellular network requests. When a new request
is sent to DctController the active data subscription would be determined
again. If active data subscription has not changed, the reference count of
corresponding ApnContext is increased. Otherwise, data detach procedure
will be triggered on previous data subscription and a data attach procedure
is triggered on the new active data subscription.

After data is attached, all network requests for the subscription will be
executed. That means reference count of corresponding ApnContext will be
increased.

When a network request is going to be released, the rererence count of the
ApnContext will be decreased. DctController will determine active data
subscription again after the request is released and data detach and attach
procedures will be triggered appropriately.

Change-Id: Ie991096a986e4580efd453f0d20e43971e3fa9a2
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
0379adba01db1e6a4d7b8563c9062baf1461e438 10-Sep-2014 Wink Saville <wink@google.com> Merge commit 'f54d520ee2eaeb081c208b3d33b0d1fb6ae49254' into fix-merge-conflict

* commit 'f54d520ee2eaeb081c208b3d33b0d1fb6ae49254':
Fix ArrayOutOfBounds bug, tighten parameter checking.

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DctController.java

Change-Id: I1b1e6714430eac7e808112e89e8f10e15286cb67
f54d520ee2eaeb081c208b3d33b0d1fb6ae49254 09-Sep-2014 Wink Saville <wink@google.com> Fix ArrayOutOfBounds bug, tighten parameter checking.

Also, make logging consistent.

Bug: 17424200
Change-Id: Ie5bef1f557bf88b01eeb97c117807a40689c28e4
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
6bc4098827f3070a44b5e51508b455d7c7be9c07 01-Sep-2014 Wink Saville <wink@google.com> ksd to lmp-sprout-dev

Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java
a8467dd0c524787104b1ccdddc5e8af10ba729ed 13-Jun-2014 Wink Saville <wink@google.com> Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
/frameworks/opt/telephony/src/java/com/android/internal/telephony/dataconnection/DctController.java