Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 99510681: Unhide constant DATA_ACTIVITY_DORMANT.

Browse Source 
Merge commit '99510681e9f1c76f82719e724990f744cfdbcefd' into eclair-mr2

* commit '99510681e9f1c76f82719e724990f744cfdbcefd':
  Unhide constant DATA_ACTIVITY_DORMANT.
This commit is contained in:
John Wang
2009-10-04 15:13:58 -07:00
committed by Android Git Automerger
parent 7d63829296 99510681e9
commit dcd1fe5fc8
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/current.xml
View File

@@ -125295,6 +125295,17 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="DATA_ACTIVITY_DORMANT"
type="int"
transient="false"
volatile="false"
value="4"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="DATA_ACTIVITY_IN" <field name="DATA_ACTIVITY_IN"
type="int" type="int"
transient="false" transient="false"

1
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -732,7 +732,6 @@ public class TelephonyManager {
public static final int DATA_ACTIVITY_INOUT = DATA_ACTIVITY_IN | DATA_ACTIVITY_OUT; public static final int DATA_ACTIVITY_INOUT = DATA_ACTIVITY_IN | DATA_ACTIVITY_OUT;
/** /**
* Data connection is active, but physical link is down * Data connection is active, but physical link is down
* @hide
*/ */
public static final int DATA_ACTIVITY_DORMANT = 0x00000004; public static final int DATA_ACTIVITY_DORMANT = 0x00000004;