diff --git a/core/api/current.txt b/core/api/current.txt index addca77b3941b..b39843a92d796 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -4611,6 +4611,7 @@ package android.app { method public boolean getLockTaskMode(); method public int getSplashScreenStyle(); method public boolean isPendingIntentBackgroundActivityLaunchAllowed(); + method public boolean isShareIdentityEnabled(); method public static android.app.ActivityOptions makeBasic(); method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int); method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int); diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 1b923122d8898..2214c8e08459e 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1499,13 +1499,13 @@ public class ActivityOptions extends ComponentOptions { * Returns whether the launching app has opted-in to sharing its identity with the launched * activity. * + * @return {@code true} if the launching app has opted-in to sharing its identity + * * @see #setShareIdentityEnabled(boolean) * @see Activity#getLaunchedFromUid() * @see Activity#getLaunchedFromPackage() - * - * @hide */ - public boolean getShareIdentity() { + public boolean isShareIdentityEnabled() { return mShareIdentity; } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 064f4ee915546..d8b423996cac6 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2003,7 +2003,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mOverrideTaskTransition = options.getOverrideTaskTransition(); mDismissKeyguard = options.getDismissKeyguard(); - mShareIdentity = options.getShareIdentity(); + mShareIdentity = options.isShareIdentityEnabled(); } ColorDisplayService.ColorDisplayServiceInternal cds = LocalServices.getService(