diff options
| -rw-r--r-- | api/current.txt | 6 | ||||
| -rw-r--r-- | core/java/android/content/pm/LauncherApps.java | 6 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageInstaller.java | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/api/current.txt b/api/current.txt index 11f7ce13d830..c06d618c6ea5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11271,11 +11271,11 @@ package android.content.pm { method public boolean shouldHideFromSuggestions(@NonNull String, @NonNull android.os.UserHandle); method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle); method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle); - method public void startPackageInstallerSessionDetailsActivity(android.content.pm.PackageInstaller.SessionInfo, android.graphics.Rect, android.os.Bundle); + method public void startPackageInstallerSessionDetailsActivity(@NonNull android.content.pm.PackageInstaller.SessionInfo, @Nullable android.graphics.Rect, @Nullable android.os.Bundle); method public void startShortcut(@NonNull String, @NonNull String, @Nullable android.graphics.Rect, @Nullable android.os.Bundle, @NonNull android.os.UserHandle); method public void startShortcut(@NonNull android.content.pm.ShortcutInfo, @Nullable android.graphics.Rect, @Nullable android.os.Bundle); method public void unregisterCallback(android.content.pm.LauncherApps.Callback); - method public void unregisterPackageInstallerSessionCallback(android.content.pm.PackageInstaller.SessionCallback); + method public void unregisterPackageInstallerSessionCallback(@NonNull android.content.pm.PackageInstaller.SessionCallback); field public static final String ACTION_CONFIRM_PIN_APPWIDGET = "android.content.pm.action.CONFIRM_PIN_APPWIDGET"; field public static final String ACTION_CONFIRM_PIN_SHORTCUT = "android.content.pm.action.CONFIRM_PIN_SHORTCUT"; field public static final String EXTRA_PIN_ITEM_REQUEST = "android.content.pm.extra.PIN_ITEM_REQUEST"; @@ -11465,7 +11465,7 @@ package android.content.pm { method public long getSize(); method public int getStagedSessionErrorCode(); method @NonNull public String getStagedSessionErrorMessage(); - method public android.os.UserHandle getUser(); + method @NonNull public android.os.UserHandle getUser(); method public boolean isActive(); method public boolean isMultiPackage(); method public boolean isSealed(); diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 0cc5f3931487..2a19763321f2 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -585,8 +585,8 @@ public class LauncherApps { * @param sourceBounds The Rect containing the source bounds of the clicked icon * @param opts Options to pass to startActivity */ - public void startPackageInstallerSessionDetailsActivity(SessionInfo sessionInfo, - Rect sourceBounds, Bundle opts) { + public void startPackageInstallerSessionDetailsActivity(@NonNull SessionInfo sessionInfo, + @Nullable Rect sourceBounds, @Nullable Bundle opts) { try { mService.startSessionDetailsActivityAsUser(mContext.getIApplicationThread(), mContext.getPackageName(), sessionInfo, sourceBounds, opts, @@ -1503,7 +1503,7 @@ public class LauncherApps { * @param callback The callback to unregister. * @see #registerPackageInstallerSessionCallback(Executor, SessionCallback) */ - public void unregisterPackageInstallerSessionCallback(SessionCallback callback) { + public void unregisterPackageInstallerSessionCallback(@NonNull SessionCallback callback) { synchronized (mDelegates) { for (Iterator<SessionCallbackDelegate> i = mDelegates.iterator(); i.hasNext();) { final SessionCallbackDelegate delegate = i.next(); diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 7b4dd195ded9..f14b22861006 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -1833,7 +1833,7 @@ public class PackageInstaller { /** * Return the user associated with this session. */ - public UserHandle getUser() { + public @NonNull UserHandle getUser() { return new UserHandle(userId); } |