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

Merge \"Fix documentation of getTelephonyHistogram() api.\" into nyc-mr1-dev

Browse Source 
am: afcc40f818

Change-Id: I82a3f890479ce0358b28d1ec6a42c9f154e0d3f0
This commit is contained in:
Sanket Padawe
2016-06-27 19:29:39 +00:00
committed by android-build-merger
parent c1d9352429 afcc40f818
commit fe84c788e0
3 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/current.txt
View File

@@ -37357,26 +37357,6 @@ package android.telephony {
method public void onSubscriptionsChanged();
}
public final class TelephonyHistogram implements android.os.Parcelable {
ctor public TelephonyHistogram(int, int, int);
ctor public TelephonyHistogram(android.telephony.TelephonyHistogram);
ctor public TelephonyHistogram(android.os.Parcel);
method public void addTimeTaken(int);
method public int describeContents();
method public int getAverageTime();
method public int getBucketCount();
method public int[] getBucketCounters();
method public int[] getBucketEndPoints();
method public int getCategory();
method public int getId();
method public int getMaxTime();
method public int getMinTime();
method public int getSampleCount();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telephony.TelephonyHistogram> CREATOR;
field public static final int TELEPHONY_CATEGORY_RIL = 1; // 0x1
}
public class TelephonyManager {
method public boolean canChangeDtmfToneLength();
method public android.telephony.TelephonyManager createForSubscriptionId(int);
@@ -37407,7 +37387,6 @@ package android.telephony {
method public java.lang.String getSimSerialNumber();
method public int getSimState();
method public java.lang.String getSubscriberId();
method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
method public java.lang.String getVoiceMailAlphaTag();
method public java.lang.String getVoiceMailNumber();
method public int getVoiceNetworkType();

21
api/test-current.txt
View File

@@ -37435,26 +37435,6 @@ package android.telephony {
method public void onSubscriptionsChanged();
}
public final class TelephonyHistogram implements android.os.Parcelable {
ctor public TelephonyHistogram(int, int, int);
ctor public TelephonyHistogram(android.telephony.TelephonyHistogram);
ctor public TelephonyHistogram(android.os.Parcel);
method public void addTimeTaken(int);
method public int describeContents();
method public int getAverageTime();
method public int getBucketCount();
method public int[] getBucketCounters();
method public int[] getBucketEndPoints();
method public int getCategory();
method public int getId();
method public int getMaxTime();
method public int getMinTime();
method public int getSampleCount();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telephony.TelephonyHistogram> CREATOR;
field public static final int TELEPHONY_CATEGORY_RIL = 1; // 0x1
}
public class TelephonyManager {
method public boolean canChangeDtmfToneLength();
method public android.telephony.TelephonyManager createForSubscriptionId(int);
@@ -37485,7 +37465,6 @@ package android.telephony {
method public java.lang.String getSimSerialNumber();
method public int getSimState();
method public java.lang.String getSubscriberId();
method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
method public java.lang.String getVoiceMailAlphaTag();
method public java.lang.String getVoiceMailNumber();
method public int getVoiceNetworkType();

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

@@ -5423,7 +5423,7 @@ public class TelephonyManager {
return null;
}
/*
/**
* Get snapshot of Telephony histograms
* @return List of Telephony histograms
* Requires Permission: