am 31ad3d55: am abcbf05c: Merge "fullBackupContent isn\'t public API" into mnc-dev

* commit '31ad3d559aa0b68967ae0000c26eba4a1d061dad':
  fullBackupContent isn't public API
This commit is contained in:
Christopher Tate
2015-05-15 02:12:36 +00:00
committed by Android Git Automerger
3 changed files with 2 additions and 2 deletions

View File

@@ -8920,7 +8920,6 @@ package android.content.pm {
field public int descriptionRes;
field public boolean enabled;
field public int flags;
field public int fullBackupContent;
field public boolean hardwareAccelerated;
field public int largestWidthLimitDp;
field public java.lang.String manageSpaceActivityName;

View File

@@ -9151,7 +9151,6 @@ package android.content.pm {
field public int descriptionRes;
field public boolean enabled;
field public int flags;
field public int fullBackupContent;
field public boolean hardwareAccelerated;
field public int largestWidthLimitDp;
field public java.lang.String manageSpaceActivityName;

View File

@@ -107,6 +107,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
*
* @see {@link android.content.Context#getNoBackupFilesDir}
* @see {@link #FLAG_ALLOW_BACKUP}
*
* @hide
*/
public int fullBackupContent = 0;