diff options
| author | 2018-07-24 22:46:52 +0000 | |
|---|---|---|
| committer | 2018-07-24 22:46:52 +0000 | |
| commit | 3b8a4cec85ea3008c9a7044130f33f5209cc7c33 (patch) | |
| tree | 914ce39b983177cab852d34584fab2c579f3b7f1 | |
| parent | ddc0f7eedc14881cfa4286272f258179e84249a8 (diff) | |
| parent | e8fe3cb1958f0bbc47372596e03c59ec04cf073b (diff) | |
Merge "Rename ACTION_CONFIRM_PERMISSIONS -> ACTION_CONFIRM_INSTALL"
| -rw-r--r-- | core/java/android/content/pm/PackageInstaller.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageInstallerSession.java | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 2f3bf635d1aa..f99c52f4004c 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -121,8 +121,7 @@ public class PackageInstaller { "android.content.pm.action.SESSION_COMMITTED"; /** {@hide} */ - public static final String - ACTION_CONFIRM_PERMISSIONS = "android.content.pm.action.CONFIRM_PERMISSIONS"; + public static final String ACTION_CONFIRM_INSTALL = "android.content.pm.action.CONFIRM_INSTALL"; /** * An integer session ID that an operation is working with. diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index b92d52cb870a..a4ca9b748069 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -947,9 +947,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { Preconditions.checkNotNull(mResolvedBaseFile); if (needToAskForPermissionsLocked()) { - // User needs to accept permissions; give installer an intent they - // can use to involve user. - final Intent intent = new Intent(PackageInstaller.ACTION_CONFIRM_PERMISSIONS); + // User needs to confirm installation; give installer an intent they can use to involve + // user. + final Intent intent = new Intent(PackageInstaller.ACTION_CONFIRM_INSTALL); intent.setPackage(mContext.getPackageManager().getPermissionControllerPackageName()); intent.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId); try { |