diff options
-rw-r--r-- | core/api/current.txt | 45 | ||||
-rw-r--r-- | core/api/system-current.txt | 40 | ||||
-rw-r--r-- | core/java/android/content/pm/DataLoaderParams.java | 2 | ||||
-rw-r--r-- | core/java/android/content/pm/InstallationFile.java | 6 | ||||
-rw-r--r-- | core/java/android/content/pm/PackageInstaller.java | 37 | ||||
-rw-r--r-- | core/java/android/service/dataloader/DataLoaderService.java | 11 | ||||
-rw-r--r-- | core/res/AndroidManifest.xml | 9 | ||||
-rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 | ||||
-rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 | ||||
-rw-r--r-- | services/core/java/com/android/server/pm/PackageInstallerService.java | 8 | ||||
-rw-r--r-- | services/core/java/com/android/server/pm/PackageInstallerSession.java | 3 |
11 files changed, 114 insertions, 50 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 98568436703f..ceb98d2480b6 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12086,13 +12086,6 @@ package android.content.pm { field public static final String ACTION_CAN_INTERACT_ACROSS_PROFILES_CHANGED = "android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED"; } - public class DataLoaderParams { - method @NonNull public static final android.content.pm.DataLoaderParams forStreaming(@NonNull android.content.ComponentName, @NonNull String); - method @NonNull public final String getArguments(); - method @NonNull public final android.content.ComponentName getComponentName(); - method @NonNull public final int getType(); - } - public final class FeatureGroupInfo implements android.os.Parcelable { ctor public FeatureGroupInfo(); ctor public FeatureGroupInfo(android.content.pm.FeatureGroupInfo); @@ -12127,14 +12120,6 @@ package android.content.pm { field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.InstallSourceInfo> CREATOR; } - public final class InstallationFile { - method public long getLengthBytes(); - method public int getLocation(); - method @Nullable public byte[] getMetadata(); - method @NonNull public String getName(); - method @Nullable public byte[] getSignature(); - } - public class InstrumentationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable { ctor public InstrumentationInfo(); ctor public InstrumentationInfo(android.content.pm.InstrumentationInfo); @@ -12331,9 +12316,6 @@ package android.content.pm { field public static final String ACTION_SESSION_COMMITTED = "android.content.pm.action.SESSION_COMMITTED"; field public static final String ACTION_SESSION_DETAILS = "android.content.pm.action.SESSION_DETAILS"; field public static final String ACTION_SESSION_UPDATED = "android.content.pm.action.SESSION_UPDATED"; - field public static final int DATA_LOADER_TYPE_NONE = 0; // 0x0 - field public static final int DATA_LOADER_TYPE_STREAMING = 1; // 0x1 - field public static final String EXTRA_DATA_LOADER_TYPE = "android.content.pm.extra.DATA_LOADER_TYPE"; field public static final String EXTRA_OTHER_PACKAGE_NAME = "android.content.pm.extra.OTHER_PACKAGE_NAME"; field public static final String EXTRA_PACKAGE_NAME = "android.content.pm.extra.PACKAGE_NAME"; field public static final String EXTRA_SESSION = "android.content.pm.extra.SESSION"; @@ -12341,9 +12323,6 @@ package android.content.pm { field public static final String EXTRA_STATUS = "android.content.pm.extra.STATUS"; field public static final String EXTRA_STATUS_MESSAGE = "android.content.pm.extra.STATUS_MESSAGE"; field public static final String EXTRA_STORAGE_PATH = "android.content.pm.extra.STORAGE_PATH"; - field public static final int LOCATION_DATA_APP = 0; // 0x0 - field public static final int LOCATION_MEDIA_DATA = 2; // 0x2 - field public static final int LOCATION_MEDIA_OBB = 1; // 0x1 field public static final int STATUS_FAILURE = 1; // 0x1 field public static final int STATUS_FAILURE_ABORTED = 3; // 0x3 field public static final int STATUS_FAILURE_BLOCKED = 2; // 0x2 @@ -12351,7 +12330,6 @@ package android.content.pm { field public static final int STATUS_FAILURE_INCOMPATIBLE = 7; // 0x7 field public static final int STATUS_FAILURE_INVALID = 4; // 0x4 field public static final int STATUS_FAILURE_STORAGE = 6; // 0x6 - field public static final int STATUS_PENDING_STREAMING = -2; // 0xfffffffe field public static final int STATUS_PENDING_USER_ACTION = -1; // 0xffffffff field public static final int STATUS_SUCCESS = 0; // 0x0 } @@ -12359,12 +12337,10 @@ package android.content.pm { public static class PackageInstaller.Session implements java.io.Closeable { method public void abandon(); method public void addChildSessionId(int); - method public void addFile(int, @NonNull String, long, @NonNull byte[], @Nullable byte[]); method public void close(); method public void commit(@NonNull android.content.IntentSender); method public void fsync(@NonNull java.io.OutputStream) throws java.io.IOException; method @NonNull public int[] getChildSessionIds(); - method @Nullable public android.content.pm.DataLoaderParams getDataLoaderParams(); method @NonNull public String[] getNames() throws java.io.IOException; method public int getParentSessionId(); method public boolean isMultiPackage(); @@ -12372,7 +12348,6 @@ package android.content.pm { method @NonNull public java.io.InputStream openRead(@NonNull String) throws java.io.IOException; method @NonNull public java.io.OutputStream openWrite(@NonNull String, long, long) throws java.io.IOException; method public void removeChildSessionId(int); - method public void removeFile(int, @NonNull String); method public void removeSplit(@NonNull String) throws java.io.IOException; method @Deprecated public void setChecksums(@NonNull String, @NonNull java.util.List<android.content.pm.Checksum>, @Nullable byte[]) throws java.io.IOException; method public void setStagingProgress(float); @@ -12443,7 +12418,6 @@ package android.content.pm { method public void setAppLabel(@Nullable CharSequence); method public void setAppPackageName(@Nullable String); method @Deprecated public void setAutoRevokePermissionsMode(boolean); - method public void setDataLoaderParams(@NonNull android.content.pm.DataLoaderParams); method public void setInstallLocation(int); method public void setInstallReason(int); method public void setInstallScenario(int); @@ -38369,25 +38343,6 @@ package android.service.controls.templates { } -package android.service.dataloader { - - public abstract class DataLoaderService extends android.app.Service { - ctor public DataLoaderService(); - method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent); - method @Nullable public android.service.dataloader.DataLoaderService.DataLoader onCreateDataLoader(@NonNull android.content.pm.DataLoaderParams); - } - - public static interface DataLoaderService.DataLoader { - method public boolean onCreate(@NonNull android.content.pm.DataLoaderParams, @NonNull android.service.dataloader.DataLoaderService.FileSystemConnector); - method public boolean onPrepareImage(@NonNull java.util.Collection<android.content.pm.InstallationFile>, @NonNull java.util.Collection<java.lang.String>); - } - - public static final class DataLoaderService.FileSystemConnector { - method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void writeData(@NonNull String, long, long, @NonNull android.os.ParcelFileDescriptor) throws java.io.IOException; - } - -} - package android.service.dreams { public class DreamService extends android.app.Service implements android.view.Window.Callback { diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 93572cf97b43..e77334358efd 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -2527,6 +2527,18 @@ package android.content.pm { public class DataLoaderParams { method @NonNull public static final android.content.pm.DataLoaderParams forIncremental(@NonNull android.content.ComponentName, @NonNull String); + method @NonNull public static final android.content.pm.DataLoaderParams forStreaming(@NonNull android.content.ComponentName, @NonNull String); + method @NonNull public final String getArguments(); + method @NonNull public final android.content.ComponentName getComponentName(); + method @NonNull public final int getType(); + } + + public final class InstallationFile { + method public long getLengthBytes(); + method public int getLocation(); + method @Nullable public byte[] getMetadata(); + method @NonNull public String getName(); + method @Nullable public byte[] getSignature(); } public final class InstantAppInfo implements android.os.Parcelable { @@ -2620,10 +2632,19 @@ package android.content.pm { public class PackageInstaller { method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setPermissionsResult(int, boolean); field public static final int DATA_LOADER_TYPE_INCREMENTAL = 2; // 0x2 + field public static final int DATA_LOADER_TYPE_NONE = 0; // 0x0 + field public static final int DATA_LOADER_TYPE_STREAMING = 1; // 0x1 + field public static final String EXTRA_DATA_LOADER_TYPE = "android.content.pm.extra.DATA_LOADER_TYPE"; + field public static final int LOCATION_DATA_APP = 0; // 0x0 + field public static final int LOCATION_MEDIA_DATA = 2; // 0x2 + field public static final int LOCATION_MEDIA_OBB = 1; // 0x1 } public static class PackageInstaller.Session implements java.io.Closeable { + method @RequiresPermission("com.android.permission.USE_INSTALLER_V2") public void addFile(int, @NonNull String, long, @NonNull byte[], @Nullable byte[]); method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void commitTransferred(@NonNull android.content.IntentSender); + method @Nullable @RequiresPermission("com.android.permission.USE_INSTALLER_V2") public android.content.pm.DataLoaderParams getDataLoaderParams(); + method @RequiresPermission("com.android.permission.USE_INSTALLER_V2") public void removeFile(int, @NonNull String); } public static class PackageInstaller.SessionInfo implements android.os.Parcelable { @@ -2644,6 +2665,7 @@ package android.content.pm { public static class PackageInstaller.SessionParams implements android.os.Parcelable { method @RequiresPermission(android.Manifest.permission.ALLOCATE_AGGRESSIVE) public void setAllocateAggressive(boolean); method @Deprecated public void setAllowDowngrade(boolean); + method @RequiresPermission(allOf={android.Manifest.permission.INSTALL_PACKAGES, "com.android.permission.USE_INSTALLER_V2"}) public void setDataLoaderParams(@NonNull android.content.pm.DataLoaderParams); method public void setDontKillApp(boolean); method public void setEnableRollback(boolean); method public void setEnableRollback(boolean, int); @@ -9815,6 +9837,24 @@ package android.service.contentsuggestions { } +package android.service.dataloader { + + public abstract class DataLoaderService extends android.app.Service { + ctor public DataLoaderService(); + method @Nullable public android.service.dataloader.DataLoaderService.DataLoader onCreateDataLoader(@NonNull android.content.pm.DataLoaderParams); + } + + public static interface DataLoaderService.DataLoader { + method public boolean onCreate(@NonNull android.content.pm.DataLoaderParams, @NonNull android.service.dataloader.DataLoaderService.FileSystemConnector); + method public boolean onPrepareImage(@NonNull java.util.Collection<android.content.pm.InstallationFile>, @NonNull java.util.Collection<java.lang.String>); + } + + public static final class DataLoaderService.FileSystemConnector { + method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void writeData(@NonNull String, long, long, @NonNull android.os.ParcelFileDescriptor) throws java.io.IOException; + } + +} + package android.service.displayhash { public final class DisplayHashParams implements android.os.Parcelable { diff --git a/core/java/android/content/pm/DataLoaderParams.java b/core/java/android/content/pm/DataLoaderParams.java index f808cfda4835..a6d3b45c289a 100644 --- a/core/java/android/content/pm/DataLoaderParams.java +++ b/core/java/android/content/pm/DataLoaderParams.java @@ -24,7 +24,9 @@ import android.content.ComponentName; * This class represents the parameters used to configure a DataLoader. * * {@see android.service.dataloader.DataLoaderService.DataLoader} + * @hide */ +@SystemApi public class DataLoaderParams { @NonNull private final DataLoaderParamsParcel mData; diff --git a/core/java/android/content/pm/InstallationFile.java b/core/java/android/content/pm/InstallationFile.java index e76402077714..7e07c4534328 100644 --- a/core/java/android/content/pm/InstallationFile.java +++ b/core/java/android/content/pm/InstallationFile.java @@ -18,16 +18,18 @@ package android.content.pm; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SystemApi; /** * Definition of a file in a streaming installation session. * You can use this class to retrieve the information of such a file, such as its name, size and * metadata. These file attributes will be consistent with those used in: - * {@code android.content.pm.PackageInstaller.Session#addFile}, when the file was first added - * into the session. + * {@code PackageInstaller.Session#addFile}, when the file was first added into the session. * * @see android.content.pm.PackageInstaller.Session#addFile + * @hide */ +@SystemApi public final class InstallationFile { private final @NonNull InstallationFileParcel mParcel; diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 8b380b79e8c7..5157e08deb34 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -229,12 +229,15 @@ public class PackageInstaller { /** * Type of DataLoader for this session. Will be one of - * {@link #DATA_LOADER_TYPE_NONE}, {@link #DATA_LOADER_TYPE_STREAMING}. + * {@link #DATA_LOADER_TYPE_NONE}, {@link #DATA_LOADER_TYPE_STREAMING}, + * {@link #DATA_LOADER_TYPE_INCREMENTAL}. * <p> * See the individual types documentation for details. * * @see Intent#getIntExtra(String, int) + * {@hide} */ + @SystemApi public static final String EXTRA_DATA_LOADER_TYPE = "android.content.pm.extra.DATA_LOADER_TYPE"; /** @@ -242,6 +245,7 @@ public class PackageInstaller { * Caller should make sure DataLoader is able to prepare image and reinitiate the operation. * * @see #EXTRA_SESSION_ID + * {@hide} */ public static final int STATUS_PENDING_STREAMING = -2; @@ -344,21 +348,25 @@ public class PackageInstaller { * Default value, non-streaming installation session. * * @see #EXTRA_DATA_LOADER_TYPE + * {@hide} */ + @SystemApi public static final int DATA_LOADER_TYPE_NONE = DataLoaderType.NONE; /** * Streaming installation using data loader. * * @see #EXTRA_DATA_LOADER_TYPE + * {@hide} */ + @SystemApi public static final int DATA_LOADER_TYPE_STREAMING = DataLoaderType.STREAMING; /** * Streaming installation using Incremental FileSystem. * * @see #EXTRA_DATA_LOADER_TYPE - * @hide + * {@hide} */ @SystemApi public static final int DATA_LOADER_TYPE_INCREMENTAL = DataLoaderType.INCREMENTAL; @@ -366,13 +374,18 @@ public class PackageInstaller { /** * Target location for the file in installation session is /data/app/<packageName>-<id>. * This is the intended location for APKs. + * Requires permission to install packages. + * {@hide} */ + @SystemApi public static final int LOCATION_DATA_APP = InstallationFileLocation.DATA_APP; /** * Target location for the file in installation session is * /data/media/<userid>/Android/obb/<packageName>. This is the intended location for OBBs. + * {@hide} */ + @SystemApi public static final int LOCATION_MEDIA_OBB = InstallationFileLocation.MEDIA_OBB; /** @@ -380,7 +393,9 @@ public class PackageInstaller { * /data/media/<userid>/Android/data/<packageName>. * This is the intended location for application data. * Can only be used by an app itself running under specific user. + * {@hide} */ + @SystemApi public static final int LOCATION_MEDIA_DATA = InstallationFileLocation.MEDIA_DATA; /** @hide */ @@ -1152,7 +1167,10 @@ public class PackageInstaller { /** * @return data loader params or null if the session is not using one. + * {@hide} */ + @SystemApi + @RequiresPermission(android.Manifest.permission.USE_INSTALLER_V2) public @Nullable DataLoaderParams getDataLoaderParams() { try { DataLoaderParamsParcel data = mSession.getDataLoaderParams(); @@ -1189,7 +1207,11 @@ public class PackageInstaller { * @throws IllegalStateException if called for non-streaming session * * @see android.content.pm.InstallationFile + * + * {@hide} */ + @SystemApi + @RequiresPermission(android.Manifest.permission.USE_INSTALLER_V2) public void addFile(@FileLocation int location, @NonNull String name, long lengthBytes, @NonNull byte[] metadata, @Nullable byte[] signature) { try { @@ -1209,8 +1231,11 @@ public class PackageInstaller { * @param name name of a file, e.g. split. * @throws SecurityException if called after the session has been * sealed or abandoned - * @throws IllegalStateException if called for non-streaming session + * @throws IllegalStateException if called for non-DataLoader session + * {@hide} */ + @SystemApi + @RequiresPermission(android.Manifest.permission.USE_INSTALLER_V2) public void removeFile(@FileLocation int location, @NonNull String name) { try { mSession.removeFile(location, name); @@ -2026,7 +2051,13 @@ public class PackageInstaller { * staging folder. * * @see android.service.dataloader.DataLoaderService.DataLoader + * + * {@hide} */ + @SystemApi + @RequiresPermission(allOf = { + Manifest.permission.INSTALL_PACKAGES, + Manifest.permission.USE_INSTALLER_V2}) public void setDataLoaderParams(@NonNull DataLoaderParams dataLoaderParams) { this.dataLoaderParams = dataLoaderParams; } diff --git a/core/java/android/service/dataloader/DataLoaderService.java b/core/java/android/service/dataloader/DataLoaderService.java index 63ec252c2fa8..7e8acde2e20d 100644 --- a/core/java/android/service/dataloader/DataLoaderService.java +++ b/core/java/android/service/dataloader/DataLoaderService.java @@ -19,6 +19,7 @@ package android.service.dataloader; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; +import android.annotation.SystemApi; import android.app.Service; import android.content.Intent; import android.content.pm.DataLoaderParams; @@ -48,14 +49,19 @@ import java.util.Collection; * * @see android.content.pm.DataLoaderParams * @see android.content.pm.PackageInstaller.SessionParams#setDataLoaderParams + * + * @hide */ +@SystemApi public abstract class DataLoaderService extends Service { private static final String TAG = "DataLoaderService"; private final DataLoaderBinderService mBinder = new DataLoaderBinderService(); /** * DataLoader interface. Each instance corresponds to a single installation session. + * @hide */ + @SystemApi public interface DataLoader { /** * A virtual constructor. @@ -112,7 +118,9 @@ public abstract class DataLoaderService extends Service { /** * DataLoader factory method. * An installation session uses it to create an instance of DataLoader. + * @hide */ + @SystemApi public @Nullable DataLoader onCreateDataLoader(@NonNull DataLoaderParams dataLoaderParams) { return null; } @@ -178,7 +186,10 @@ public abstract class DataLoaderService extends Service { /** * Provides access to the installation image. + * + * @hide */ + @SystemApi public static final class FileSystemConnector { /** * Create a wrapper for a native instance. diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 925a212d10cb..d6a9a1fe9d1f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -4099,6 +4099,15 @@ <permission android:name="com.android.permission.INSTALL_EXISTING_PACKAGES" android:protectionLevel="signature|privileged" /> + <!-- Allows an application to use the package installer v2 APIs. + <p>The package installer v2 APIs are still a work in progress and we're + currently validating they work in all scenarios. + <p>Not for use by third-party applications. + @hide + --> + <permission android:name="com.android.permission.USE_INSTALLER_V2" + android:protectionLevel="signature|installer" /> + <!-- Allows an application to use System Data Loaders. <p>Not for use by third-party applications. @hide diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 5f344267d71c..9f1d94366f43 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -417,6 +417,8 @@ applications that come with the platform <permission name="android.permission.SET_WALLPAPER" /> <permission name="android.permission.SET_WALLPAPER_COMPONENT" /> <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" /> + <!-- Permissions required for Incremental CTS tests --> + <permission name="com.android.permission.USE_INSTALLER_V2"/> <permission name="android.permission.LOADER_USAGE_STATS"/> <!-- Permission required to test system only camera devices. --> <permission name="android.permission.SYSTEM_CAMERA" /> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index f685d888ffa3..a8d1534b5c5e 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -162,6 +162,7 @@ <uses-permission android:name="android.permission.READ_INPUT_STATE" /> <uses-permission android:name="android.permission.SET_ORIENTATION" /> <uses-permission android:name="android.permission.INSTALL_PACKAGES" /> + <uses-permission android:name="com.android.permission.USE_INSTALLER_V2" /> <uses-permission android:name="com.android.permission.USE_SYSTEM_DATA_LOADERS" /> <uses-permission android:name="android.permission.MOVE_PACKAGE" /> <uses-permission android:name="android.permission.KEEP_UNINSTALLED_PACKAGES" /> diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 0a484e21b018..27077b6b2a09 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -527,6 +527,14 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements throw new SecurityException("User restriction prevents installing"); } + if (params.dataLoaderParams != null + && mContext.checkCallingOrSelfPermission(Manifest.permission.USE_INSTALLER_V2) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException("You need the " + + "com.android.permission.USE_INSTALLER_V2 permission " + + "to use a data loader"); + } + // INSTALL_REASON_ROLLBACK allows an app to be rolled back without requiring the ROLLBACK // capability; ensure if this is set as the install reason the app has one of the necessary // signature permissions to perform the rollback. diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index e532790589a3..b6a65ddb5ec2 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -3636,12 +3636,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { @Override public DataLoaderParamsParcel getDataLoaderParams() { + mContext.enforceCallingOrSelfPermission(Manifest.permission.USE_INSTALLER_V2, null); return params.dataLoaderParams != null ? params.dataLoaderParams.getData() : null; } @Override public void addFile(int location, String name, long lengthBytes, byte[] metadata, byte[] signature) { + mContext.enforceCallingOrSelfPermission(Manifest.permission.USE_INSTALLER_V2, null); if (!isDataLoaderInstallation()) { throw new IllegalStateException( "Cannot add files to non-data loader installation session."); @@ -3674,6 +3676,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { @Override public void removeFile(int location, String name) { + mContext.enforceCallingOrSelfPermission(Manifest.permission.USE_INSTALLER_V2, null); if (!isDataLoaderInstallation()) { throw new IllegalStateException( "Cannot add files to non-data loader installation session."); |