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

Merge "Address API council comments" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-30 06:43:07 +00:00
committed by Android (Google) Code Review
parent 606c05396d f965b87a78
commit 4c60abc9ae
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -11040,7 +11040,7 @@ package android.content.pm {
ctor public VersionedPackage(java.lang.String, int);
method public int describeContents();
method public java.lang.String getPackageName();
method public long getVersionCode();
method public int getVersionCode();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.content.pm.VersionedPackage> CREATOR;
}
@@ -47752,7 +47752,7 @@ package android.view.autofill {
public final class AutofillManager {
method public void cancel();
method public void commit();
method public void disableOwnedAutofillServices();
method public void disableAutofillServices();
method public boolean hasEnabledAutofillServices();
method public boolean isAutofillSupported();
method public boolean isEnabled();

4
api/system-current.txt
View File

@@ -11806,7 +11806,7 @@ package android.content.pm {
ctor public VersionedPackage(java.lang.String, int);
method public int describeContents();
method public java.lang.String getPackageName();
method public long getVersionCode();
method public int getVersionCode();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.content.pm.VersionedPackage> CREATOR;
}
@@ -51348,7 +51348,7 @@ package android.view.autofill {
public final class AutofillManager {
method public void cancel();
method public void commit();
method public void disableOwnedAutofillServices();
method public void disableAutofillServices();
method public boolean hasEnabledAutofillServices();
method public boolean isAutofillSupported();
method public boolean isEnabled();

4
api/test-current.txt
View File

@@ -11082,7 +11082,7 @@ package android.content.pm {
ctor public VersionedPackage(java.lang.String, int);
method public int describeContents();
method public java.lang.String getPackageName();
method public long getVersionCode();
method public int getVersionCode();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.content.pm.VersionedPackage> CREATOR;
}
@@ -48131,7 +48131,7 @@ package android.view.autofill {
public final class AutofillManager {
method public void cancel();
method public void commit();
method public void disableOwnedAutofillServices();
method public void disableAutofillServices();
method public boolean hasEnabledAutofillServices();
method public boolean isAutofillSupported();
method public boolean isEnabled();

8
core/java/android/content/pm/VersionedPackage.java
View File

@@ -28,7 +28,7 @@ import java.lang.annotation.RetentionPolicy;
*/
public final class VersionedPackage implements Parcelable {
private final String mPackageName;
private final long mVersionCode;
private final int mVersionCode;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@@ -49,7 +49,7 @@ public final class VersionedPackage implements Parcelable {
private VersionedPackage(Parcel parcel) {
mPackageName = parcel.readString();
mVersionCode = parcel.readLong();
mVersionCode = parcel.readInt();
}
/**
@@ -66,7 +66,7 @@ public final class VersionedPackage implements Parcelable {
*
* @return The version code.
*/
public @VersionCode long getVersionCode() {
public @VersionCode int getVersionCode() {
return mVersionCode;
}
@@ -83,7 +83,7 @@ public final class VersionedPackage implements Parcelable {
@Override
public void writeToParcel(Parcel parcel, int flags) {
parcel.writeString(mPackageName);
parcel.writeLong(mVersionCode);
parcel.writeInt(mVersionCode);
}
public static final Creator<VersionedPackage> CREATOR = new Creator<VersionedPackage>() {

7
core/java/android/view/autofill/AutofillManager.java
View File

@@ -630,11 +630,16 @@ public final class AutofillManager {
}
}
/** @hide */
public void disableOwnedAutofillServices() {
disableAutofillServices();
}
/**
* If the app calling this API has enabled autofill services they
* will be disabled.
*/
public void disableOwnedAutofillServices() {
public void disableAutofillServices() {
if (!hasAutofillFeature()) {
return;
}