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

Merge "Rename to follow API council guidance." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-01 23:15:54 +00:00
committed by Android (Google) Code Review
parent f852ed40a6 f29d19610d
commit 0d6c3a691e
8 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -10889,8 +10889,8 @@ package android.content.pm {
field public android.content.pm.ActivityInfo activityInfo;
field public android.content.IntentFilter filter;
field public int icon;
field public boolean instantAppAvailable;
field public boolean isDefault;
field public boolean isInstantAppAvailable;
field public int labelRes;
field public int match;
field public java.lang.CharSequence nonLocalizedLabel;

4
api/removed.txt
View File

@@ -126,6 +126,10 @@ package android.content.pm {
method public abstract boolean setInstantAppCookie(byte[]);
}
public class ResolveInfo implements android.os.Parcelable {
field public deprecated boolean instantAppAvailable;
}
public final class SharedLibraryInfo implements android.os.Parcelable {
method public boolean isBuiltin();
method public boolean isDynamic();

2
api/system-current.txt
View File

@@ -11655,8 +11655,8 @@ package android.content.pm {
field public android.content.pm.ActivityInfo activityInfo;
field public android.content.IntentFilter filter;
field public int icon;
field public boolean instantAppAvailable;
field public boolean isDefault;
field public boolean isInstantAppAvailable;
field public int labelRes;
field public int match;
field public java.lang.CharSequence nonLocalizedLabel;

4
api/system-removed.txt
View File

@@ -124,6 +124,10 @@ package android.content.pm {
method public abstract boolean setInstantAppCookie(byte[]);
}
public class ResolveInfo implements android.os.Parcelable {
field public deprecated boolean instantAppAvailable;
}
public final class SharedLibraryInfo implements android.os.Parcelable {
method public boolean isBuiltin();
method public boolean isDynamic();

2
api/test-current.txt
View File

@@ -10930,8 +10930,8 @@ package android.content.pm {
field public android.content.pm.ActivityInfo activityInfo;
field public android.content.IntentFilter filter;
field public int icon;
field public boolean instantAppAvailable;
field public boolean isDefault;
field public boolean isInstantAppAvailable;
field public int labelRes;
field public int match;
field public java.lang.CharSequence nonLocalizedLabel;

4
api/test-removed.txt
View File

@@ -126,6 +126,10 @@ package android.content.pm {
method public abstract boolean setInstantAppCookie(byte[]);
}
public class ResolveInfo implements android.os.Parcelable {
field public deprecated boolean instantAppAvailable;
}
public final class SharedLibraryInfo implements android.os.Parcelable {
method public boolean isBuiltin();
method public boolean isDynamic();

11
core/java/android/content/pm/ResolveInfo.java
View File

@@ -71,6 +71,10 @@ public class ResolveInfo implements Parcelable {
/**
* Whether or not an instant app is available for the resolved intent.
*/
public boolean isInstantAppAvailable;
/** @removed */
@Deprecated
public boolean instantAppAvailable;
/**
@@ -330,7 +334,8 @@ public class ResolveInfo implements Parcelable {
system = orig.system;
targetUserId = orig.targetUserId;
handleAllWebDataURI = orig.handleAllWebDataURI;
instantAppAvailable = orig.instantAppAvailable;
isInstantAppAvailable = orig.isInstantAppAvailable;
instantAppAvailable = isInstantAppAvailable;
}
public String toString() {
@@ -394,7 +399,7 @@ public class ResolveInfo implements Parcelable {
dest.writeInt(noResourceId ? 1 : 0);
dest.writeInt(iconResourceId);
dest.writeInt(handleAllWebDataURI ? 1 : 0);
dest.writeInt(instantAppAvailable ? 1 : 0);
dest.writeInt(isInstantAppAvailable ? 1 : 0);
}
public static final Creator<ResolveInfo> CREATOR
@@ -442,7 +447,7 @@ public class ResolveInfo implements Parcelable {
noResourceId = source.readInt() != 0;
iconResourceId = source.readInt();
handleAllWebDataURI = source.readInt() != 0;
instantAppAvailable = source.readInt() != 0;
instantAppAvailable = isInstantAppAvailable = source.readInt() != 0;
}
public static class DisplayNameComparator

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -6508,7 +6508,7 @@ public class PackageManagerService extends IPackageManager.Stub
ephemeralInstaller.filter = new IntentFilter(intent.getAction());
ephemeralInstaller.filter.addDataPath(
intent.getData().getPath(), PatternMatcher.PATTERN_LITERAL);
ephemeralInstaller.instantAppAvailable = true;
ephemeralInstaller.isInstantAppAvailable = true;
result.add(ephemeralInstaller);
}
}
@@ -12610,7 +12610,7 @@ public class PackageManagerService extends IPackageManager.Stub
}
res.iconResourceId = info.icon;
res.system = res.activityInfo.applicationInfo.isSystemApp();
res.instantAppAvailable = userState.instantApp;
res.isInstantAppAvailable = userState.instantApp;
return res;
}