diff options
169 files changed, 4990 insertions, 6029 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java index 04f96de08acd..4952894c068b 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -1575,8 +1575,10 @@ public class AppStandbyController (reason & REASON_MAIN_MASK) == REASON_MAIN_FORCED_BY_SYSTEM; if (app.currentBucket == newBucket && wasForcedBySystem && isForcedBySystem) { - mAppIdleHistory - .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason); + if (newBucket == STANDBY_BUCKET_RESTRICTED) { + mAppIdleHistory + .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason); + } // Keep track of all restricting reasons reason = REASON_MAIN_FORCED_BY_SYSTEM | (app.bucketingReason & REASON_SUB_MASK) diff --git a/core/api/current.txt b/core/api/current.txt index 9edc2dfdb4e3..19ffd36eb47a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -3901,6 +3901,7 @@ package android.animation { method public Object getAnimatedValue(String); method public long getCurrentPlayTime(); method public long getDuration(); + method @FloatRange(from=0, to=1) public static float getDurationScale(); method public static long getFrameDelay(); method public int getRepeatCount(); method public int getRepeatMode(); @@ -3912,6 +3913,7 @@ package android.animation { method public static android.animation.ValueAnimator ofInt(int...); method public static android.animation.ValueAnimator ofObject(android.animation.TypeEvaluator, java.lang.Object...); method public static android.animation.ValueAnimator ofPropertyValuesHolder(android.animation.PropertyValuesHolder...); + method public static boolean registerDurationScaleChangeListener(@NonNull android.animation.ValueAnimator.DurationScaleChangeListener); method public void removeAllUpdateListeners(); method public void removeUpdateListener(android.animation.ValueAnimator.AnimatorUpdateListener); method public void reverse(); @@ -3928,6 +3930,7 @@ package android.animation { method public void setRepeatMode(int); method public void setStartDelay(long); method public void setValues(android.animation.PropertyValuesHolder...); + method public static boolean unregisterDurationScaleChangeListener(@NonNull android.animation.ValueAnimator.DurationScaleChangeListener); field public static final int INFINITE = -1; // 0xffffffff field public static final int RESTART = 1; // 0x1 field public static final int REVERSE = 2; // 0x2 @@ -3937,6 +3940,10 @@ package android.animation { method public void onAnimationUpdate(@NonNull android.animation.ValueAnimator); } + public static interface ValueAnimator.DurationScaleChangeListener { + method public void onChanged(float); + } + } package android.annotation { @@ -26088,7 +26095,7 @@ package android.media.tv.interactive { method @NonNull public java.util.List<android.media.tv.interactive.TvInteractiveAppInfo> getTvInteractiveAppServiceList(); method public void prepare(@NonNull String, int); method public void registerAppLinkInfo(@NonNull String, @NonNull android.media.tv.interactive.AppLinkInfo); - method public void registerCallback(@NonNull android.media.tv.interactive.TvInteractiveAppManager.TvInteractiveAppCallback, @NonNull java.util.concurrent.Executor); + method public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppManager.TvInteractiveAppCallback); method public void sendAppLinkCommand(@NonNull String, @NonNull android.os.Bundle); method public void unregisterAppLinkInfo(@NonNull String, @NonNull android.media.tv.interactive.AppLinkInfo); method public void unregisterCallback(@NonNull android.media.tv.interactive.TvInteractiveAppManager.TvInteractiveAppCallback); @@ -26158,10 +26165,10 @@ package android.media.tv.interactive { public abstract static class TvInteractiveAppService.Session implements android.view.KeyEvent.Callback { ctor public TvInteractiveAppService.Session(@NonNull android.content.Context); - method public void layoutSurface(int, int, int, int); - method public final void notifyBiInteractiveAppCreated(@NonNull android.net.Uri, @Nullable String); - method public void notifySessionStateChanged(int, int); - method public final void notifyTeletextAppStateChanged(int); + method @CallSuper public void layoutSurface(int, int, int, int); + method @CallSuper public final void notifyBiInteractiveAppCreated(@NonNull android.net.Uri, @Nullable String); + method @CallSuper public void notifySessionStateChanged(int, int); + method @CallSuper public final void notifyTeletextAppStateChanged(int); method public void onAdResponse(@NonNull android.media.tv.AdResponse); method public void onBroadcastInfoResponse(@NonNull android.media.tv.BroadcastInfoResponse); method public void onContentAllowed(); @@ -26195,17 +26202,17 @@ package android.media.tv.interactive { method public void onTuned(@NonNull android.net.Uri); method public void onVideoAvailable(); method public void onVideoUnavailable(int); - method public void removeBroadcastInfo(int); - method public void requestAd(@NonNull android.media.tv.AdRequest); - method public void requestBroadcastInfo(@NonNull android.media.tv.BroadcastInfoRequest); - method public void requestCurrentChannelLcn(); - method public void requestCurrentChannelUri(); - method public void requestCurrentTvInputId(); - method public void requestStreamVolume(); - method public void requestTrackInfoList(); - method public void sendPlaybackCommandRequest(@NonNull String, @Nullable android.os.Bundle); - method public void setMediaViewEnabled(boolean); - method public void setVideoBounds(@NonNull android.graphics.Rect); + method @CallSuper public void removeBroadcastInfo(int); + method @CallSuper public void requestAd(@NonNull android.media.tv.AdRequest); + method @CallSuper public void requestBroadcastInfo(@NonNull android.media.tv.BroadcastInfoRequest); + method @CallSuper public void requestCurrentChannelLcn(); + method @CallSuper public void requestCurrentChannelUri(); + method @CallSuper public void requestCurrentTvInputId(); + method @CallSuper public void requestStreamVolume(); + method @CallSuper public void requestTrackInfoList(); + method @CallSuper public void sendPlaybackCommandRequest(@NonNull String, @Nullable android.os.Bundle); + method @CallSuper public void setMediaViewEnabled(boolean); + method @CallSuper public void setVideoBounds(@NonNull android.graphics.Rect); } public class TvInteractiveAppView extends android.view.ViewGroup { diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index a32ebe490d69..3d5232ba4f35 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -102,6 +102,7 @@ package android.content.pm { public abstract class PackageManager { method @NonNull public String getPermissionControllerPackageName(); method @NonNull public String getSdkSandboxPackageName(); + method @RequiresPermission("android.permission.MAKE_UID_VISIBLE") public void makeUidVisible(int, int); field public static final String EXTRA_VERIFICATION_ROOT_HASH = "android.content.pm.extra.VERIFICATION_ROOT_HASH"; field public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 67108864; // 0x4000000 } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 8040a67c5e0e..09d111418e06 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -34,6 +34,7 @@ package android { field public static final String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE"; field public static final String ALLOW_ANY_CODEC_FOR_PLAYBACK = "android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"; field public static final String ALLOW_PLACE_IN_MULTI_PANE_SETTINGS = "android.permission.ALLOW_PLACE_IN_MULTI_PANE_SETTINGS"; + field public static final String ALLOW_SLIPPERY_TOUCHES = "android.permission.ALLOW_SLIPPERY_TOUCHES"; field public static final String AMBIENT_WALLPAPER = "android.permission.AMBIENT_WALLPAPER"; field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS"; field public static final String ASSOCIATE_COMPANION_DEVICES = "android.permission.ASSOCIATE_COMPANION_DEVICES"; @@ -13340,7 +13341,7 @@ package android.telephony { } public class TelephonyManager { - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void addCarrierPrivilegesListener(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CarrierPrivilegesListener); + method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void addCarrierPrivilegesListener(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CarrierPrivilegesListener); method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) @WorkerThread public void bootstrapAuthenticationRequest(int, @NonNull android.net.Uri, @NonNull android.telephony.gba.UaSecurityProtocolIdentifier, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.BootstrapAuthenticationCallback); method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String); method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult changeIccLockPin(@NonNull String, @NonNull String); @@ -13440,7 +13441,8 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled(); method @RequiresPermission(android.Manifest.permission.REBOOT) public int prepareForUnattendedReboot(); method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio(); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void removeCarrierPrivilegesListener(@NonNull android.telephony.TelephonyManager.CarrierPrivilegesListener); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerCarrierPrivilegesCallback(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CarrierPrivilegesCallback); + method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void removeCarrierPrivilegesListener(@NonNull android.telephony.TelephonyManager.CarrierPrivilegesListener); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean); method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void requestModemActivityInfo(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.telephony.ModemActivityInfo,android.telephony.TelephonyManager.ModemActivityInfoException>); @@ -13490,6 +13492,7 @@ package android.telephony { method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int[] supplyPukReportResult(String, String); method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean switchSlots(int[]); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void toggleRadioOnOff(); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterCarrierPrivilegesCallback(@NonNull android.telephony.TelephonyManager.CarrierPrivilegesCallback); method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor); method public void updateServiceLocation(); field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED"; @@ -13595,8 +13598,13 @@ package android.telephony { field public static final int RESULT_SUCCESS = 0; // 0x0 } - public static interface TelephonyManager.CarrierPrivilegesListener { - method public void onCarrierPrivilegesChanged(@NonNull java.util.List<java.lang.String>, @NonNull int[]); + public static interface TelephonyManager.CarrierPrivilegesCallback { + method public void onCarrierPrivilegesChanged(@NonNull java.util.Set<java.lang.String>, @NonNull java.util.Set<java.lang.Integer>); + method public default void onCarrierServiceChanged(@Nullable String, int); + } + + @Deprecated public static interface TelephonyManager.CarrierPrivilegesListener { + method @Deprecated public void onCarrierPrivilegesChanged(@NonNull java.util.List<java.lang.String>, @NonNull int[]); } public static class TelephonyManager.ModemActivityInfoException extends java.lang.Exception { diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 2eb0f194887f..66f893d71ef9 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -19,6 +19,7 @@ package android { field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES"; field public static final String INSTALL_TEST_ONLY_PACKAGE = "android.permission.INSTALL_TEST_ONLY_PACKAGE"; field public static final String KEEP_UNINSTALLED_PACKAGES = "android.permission.KEEP_UNINSTALLED_PACKAGES"; + field public static final String MAKE_UID_VISIBLE = "android.permission.MAKE_UID_VISIBLE"; field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS"; field public static final String MANAGE_ACTIVITY_TASKS = "android.permission.MANAGE_ACTIVITY_TASKS"; field public static final String MANAGE_CRATES = "android.permission.MANAGE_CRATES"; @@ -95,8 +96,7 @@ package android.accessibilityservice { package android.animation { public class ValueAnimator extends android.animation.Animator { - method public static float getDurationScale(); - method public static void setDurationScale(float); + method @MainThread public static void setDurationScale(@FloatRange(from=0, to=1) float); } } @@ -836,6 +836,7 @@ package android.content.pm { method @Nullable public String getSystemTextClassifierPackageName(); method @Nullable public String getWellbeingPackageName(); method public void holdLock(android.os.IBinder, int); + method @RequiresPermission(android.Manifest.permission.MAKE_UID_VISIBLE) public void makeUidVisible(int, int); method @RequiresPermission(android.Manifest.permission.KEEP_UNINSTALLED_PACKAGES) public void setKeepUninstalledPackages(@NonNull java.util.List<java.lang.String>); field public static final String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage"; field public static final String FEATURE_COMMUNAL_MODE = "android.software.communal_mode"; diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index 06b424bcb417..bca6b6a0ddd0 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -17,7 +17,9 @@ package android.animation; import android.annotation.CallSuper; +import android.annotation.FloatRange; import android.annotation.IntDef; +import android.annotation.MainThread; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; @@ -35,8 +37,10 @@ import android.view.animation.LinearInterpolator; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; /** * This class provides a simple timing engine for running animations @@ -91,6 +95,9 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private static float sDurationScale = 1.0f; + private static final ArrayList<WeakReference<DurationScaleChangeListener>> + sDurationScaleChangeListeners = new ArrayList<>(); + /** * Internal variables * NOTE: This object implements the clone() method, making a deep copy of any referenced @@ -308,20 +315,92 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio */ @UnsupportedAppUsage @TestApi - public static void setDurationScale(float durationScale) { + @MainThread + public static void setDurationScale(@FloatRange(from = 0, to = 1) float durationScale) { sDurationScale = durationScale; + List<WeakReference<DurationScaleChangeListener>> listenerCopy; + + synchronized (sDurationScaleChangeListeners) { + listenerCopy = new ArrayList<>(sDurationScaleChangeListeners); + } + + for (WeakReference<DurationScaleChangeListener> listenerRef : listenerCopy) { + final DurationScaleChangeListener listener = listenerRef.get(); + if (listener != null) { + listener.onChanged(durationScale); + } + } } /** - * @hide + * Returns the system-wide scaling factor for Animator-based animations. + * + * This affects both the start delay and duration of all such animations. Setting to 0 will + * cause animations to end immediately. The default value is 1.0f. + * + * @return the duration scale. */ - @UnsupportedAppUsage - @TestApi + @FloatRange(from = 0, to = 1) public static float getDurationScale() { return sDurationScale; } /** + * Registers a {@link DurationScaleChangeListener} + * + * This listens for changes to the system-wide scaling factor for Animator-based animations. + * Listeners will be called on the main thread. + * + * @param listener the listener to register. + * @return true if the listener was registered. + */ + public static boolean registerDurationScaleChangeListener( + @NonNull DurationScaleChangeListener listener) { + int posToReplace = -1; + synchronized (sDurationScaleChangeListeners) { + for (int i = 0; i < sDurationScaleChangeListeners.size(); i++) { + final WeakReference<DurationScaleChangeListener> ref = + sDurationScaleChangeListeners.get(i); + if (ref.get() == null) { + if (posToReplace == -1) { + posToReplace = i; + } + } else if (ref.get() == listener) { + return false; + } + } + if (posToReplace != -1) { + sDurationScaleChangeListeners.set(posToReplace, new WeakReference<>(listener)); + return true; + } else { + return sDurationScaleChangeListeners.add(new WeakReference<>(listener)); + } + } + } + + /** + * Unregisters a DurationScaleChangeListener. + * + * @see #registerDurationScaleChangeListener(DurationScaleChangeListener) + * @param listener the listener to unregister. + * @return true if the listener was unregistered. + */ + public static boolean unregisterDurationScaleChangeListener( + @NonNull DurationScaleChangeListener listener) { + synchronized (sDurationScaleChangeListeners) { + WeakReference<DurationScaleChangeListener> listenerRefToRemove = null; + for (WeakReference<DurationScaleChangeListener> listenerRef : + sDurationScaleChangeListeners) { + if (listenerRef.get() == listener) { + listenerRefToRemove = listenerRef; + break; + } + } + return sDurationScaleChangeListeners.remove(listenerRefToRemove); + } + } + + /** * Returns whether animators are currently enabled, system-wide. By default, all * animators are enabled. This can change if either the user sets a Developer Option * to set the animator duration scale to 0 or by Battery Savery mode being enabled @@ -1709,4 +1788,18 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio public void setAnimationHandler(@Nullable AnimationHandler animationHandler) { mAnimationHandler = animationHandler; } + + /** + * Listener interface for the system-wide scaling factor for Animator-based animations. + * + * @see #registerDurationScaleChangeListener(DurationScaleChangeListener) + * @see #unregisterDurationScaleChangeListener(DurationScaleChangeListener) + */ + public interface DurationScaleChangeListener { + /** + * Called when the duration scale changes. + * @param scale the duration scalel + */ + void onChanged(float scale); + } } diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index dca5c542af17..7ffa61be7604 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -3832,4 +3832,13 @@ public class ApplicationPackageManager extends PackageManager { throw re.rethrowAsRuntimeException(); } } + + @Override + public void makeUidVisible(int recipientUid, int visibleUid) { + try { + mPM.makeUidVisible(recipientUid, visibleUid); + } catch (RemoteException e) { + throw e.rethrowAsRuntimeException(); + } + } } diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 0f236dfe1a8b..ca7d77b2c44a 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -781,7 +781,11 @@ interface IPackageManager { boolean isAutoRevokeWhitelisted(String packageName); - void grantImplicitAccess(int queryingUid, String visibleAuthority); + void makeProviderVisible(int recipientAppId, String visibleAuthority); + + @JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest" + + ".permission.MAKE_UID_VISIBLE)") + void makeUidVisible(int recipientAppId, int visibleUid); IBinder getHoldLockToken(); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index f9beaa7cd0e9..81c941eedef0 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -10281,19 +10281,38 @@ public abstract class PackageManager { } /** - * Grants implicit visibility of the package that provides an authority to a querying UID. + * Makes a package that provides an authority {@code visibleAuthority} become visible to the + * application {@code recipientUid}. * * @throws SecurityException when called by a package other than the contacts provider * @hide */ - public void grantImplicitAccess(int queryingUid, String visibleAuthority) { + public void makeProviderVisible(int recipientUid, String visibleAuthority) { try { - ActivityThread.getPackageManager().grantImplicitAccess(queryingUid, visibleAuthority); + ActivityThread.getPackageManager().makeProviderVisible(recipientUid, visibleAuthority); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } + /** + * Makes the package associated with the uid {@code visibleUid} become visible to the + * recipient uid application. + * + * @param recipientUid The uid of the application that is being given access to {@code + * visibleUid} + * @param visibleUid The uid of the application that is becoming accessible to {@code + * recipientAppId} + * @hide + */ + @RequiresPermission(android.Manifest.permission.MAKE_UID_VISIBLE) + @TestApi + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + public void makeUidVisible(int recipientUid, int visibleUid) { + throw new UnsupportedOperationException( + "makeUidVisible not implemented in subclass"); + } + // Some of the flags don't affect the query result, but let's be conservative and cache // each combination of flags separately. diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index de1dc8091b2a..5f9fdbfe7503 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -5655,6 +5655,7 @@ public abstract class BatteryStats implements Parcelable { .setMaxStatsAgeMs(0) .includePowerModels() .includeProcessStateData() + .includeVirtualUids() .build()); stats.dump(pw, prefix); diff --git a/core/java/android/os/BatteryUsageStatsQuery.java b/core/java/android/os/BatteryUsageStatsQuery.java index 37bd51bb66c5..b3f4d9874f4e 100644 --- a/core/java/android/os/BatteryUsageStatsQuery.java +++ b/core/java/android/os/BatteryUsageStatsQuery.java @@ -42,6 +42,7 @@ public final class BatteryUsageStatsQuery implements Parcelable { FLAG_BATTERY_USAGE_STATS_POWER_PROFILE_MODEL, FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY, FLAG_BATTERY_USAGE_STATS_INCLUDE_PROCESS_STATE_DATA, + FLAG_BATTERY_USAGE_STATS_INCLUDE_VIRTUAL_UIDS, }) @Retention(RetentionPolicy.SOURCE) public @interface BatteryUsageStatsFlags {} @@ -69,6 +70,8 @@ public final class BatteryUsageStatsQuery implements Parcelable { public static final int FLAG_BATTERY_USAGE_STATS_INCLUDE_PROCESS_STATE_DATA = 0x0008; + public static final int FLAG_BATTERY_USAGE_STATS_INCLUDE_VIRTUAL_UIDS = 0x0010; + private static final long DEFAULT_MAX_STATS_AGE_MS = 5 * 60 * 1000; private final int mFlags; @@ -271,6 +274,15 @@ public final class BatteryUsageStatsQuery implements Parcelable { } /** + * Requests to return attribution data for virtual UIDs such as + * {@link Process#SDK_SANDBOX_VIRTUAL_UID}. + */ + public Builder includeVirtualUids() { + mFlags |= BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_VIRTUAL_UIDS; + return this; + } + + /** * Requests to aggregate stored snapshots between the two supplied timestamps * @param fromTimestamp Exclusive starting timestamp, as per System.currentTimeMillis() * @param toTimestamp Inclusive ending timestamp, as per System.currentTimeMillis() diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index a19b51b7811b..cf28c1639fac 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -989,7 +989,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * Otherwise, this method might throw an exception or return {@code null}. * * @param key a String, or {@code null} - * @param clazz The type of the items inside the array + * @param clazz The type of the items inside the array. This is only verified when unparceling. * @return a Parcelable[] value, or {@code null} */ @SuppressLint({"ArrayReturn", "NullableCollection"}) @@ -1053,7 +1053,8 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * Otherwise, this method might throw an exception or return {@code null}. * * @param key a String, or {@code null} - * @param clazz The type of the items inside the array list + * @param clazz The type of the items inside the array list. This is only verified when + * unparceling. * @return an ArrayList<T> value, or {@code null} */ @SuppressLint("NullableCollection") @@ -1103,6 +1104,8 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * </ul> * * @param key a String, or null + * @param clazz The type of the items inside the sparse array. This is only verified when + * unparceling. * @return a SparseArray of T values, or null */ @SuppressWarnings("unchecked") diff --git a/core/java/android/os/UidBatteryConsumer.java b/core/java/android/os/UidBatteryConsumer.java index a1ff923e3b94..77d1498e1597 100644 --- a/core/java/android/os/UidBatteryConsumer.java +++ b/core/java/android/os/UidBatteryConsumer.java @@ -202,20 +202,24 @@ public final class UidBatteryConsumer extends BatteryConsumer { private static final String PACKAGE_NAME_UNINITIALIZED = ""; private final BatteryStats.Uid mBatteryStatsUid; private final int mUid; + private final boolean mIsVirtualUid; private String mPackageWithHighestDrain = PACKAGE_NAME_UNINITIALIZED; private boolean mExcludeFromBatteryUsageStats; public Builder(BatteryConsumerData data, @NonNull BatteryStats.Uid batteryStatsUid) { - super(data, CONSUMER_TYPE_UID); - mBatteryStatsUid = batteryStatsUid; - mUid = batteryStatsUid.getUid(); - data.putLong(COLUMN_INDEX_UID, mUid); + this(data, batteryStatsUid, batteryStatsUid.getUid()); } public Builder(BatteryConsumerData data, int uid) { + this(data, null, uid); + } + + private Builder(BatteryConsumerData data, @Nullable BatteryStats.Uid batteryStatsUid, + int uid) { super(data, CONSUMER_TYPE_UID); - mBatteryStatsUid = null; + mBatteryStatsUid = batteryStatsUid; mUid = uid; + mIsVirtualUid = mUid == Process.SDK_SANDBOX_VIRTUAL_UID; data.putLong(COLUMN_INDEX_UID, mUid); } @@ -232,6 +236,10 @@ public final class UidBatteryConsumer extends BatteryConsumer { return mUid; } + public boolean isVirtualUid() { + return mIsVirtualUid; + } + /** * Sets the name of the package owned by this UID that consumed the highest amount * of power since BatteryStats reset. diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 6982b3afbb39..1008a2d0ad1a 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -74,6 +74,13 @@ public final class DeviceConfig { public static final String NAMESPACE_ACTIVITY_MANAGER = "activity_manager"; /** + * Namespace for activity manager, specific to the "component alias" feature. We needed a + * different namespace in order to avoid phonetype from resetting it. + * @hide + */ + public static final String NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS = "activity_manager_ca"; + + /** * Namespace for all activity manager related features that are used at the native level. * These features are applied at reboot. * diff --git a/core/java/android/telephony/TelephonyRegistryManager.java b/core/java/android/telephony/TelephonyRegistryManager.java index c1fcd664f6fa..f8445921d3b0 100644 --- a/core/java/android/telephony/TelephonyRegistryManager.java +++ b/core/java/android/telephony/TelephonyRegistryManager.java @@ -27,6 +27,7 @@ import android.os.Binder; import android.os.Build; import android.os.RemoteException; import android.os.ServiceManager; +import android.service.carrier.CarrierService; import android.telephony.Annotation.CallState; import android.telephony.Annotation.DataActivityType; import android.telephony.Annotation.DisconnectCauses; @@ -36,6 +37,7 @@ import android.telephony.Annotation.PreciseDisconnectCauses; import android.telephony.Annotation.RadioPowerState; import android.telephony.Annotation.SimActivationState; import android.telephony.Annotation.SrvccState; +import android.telephony.TelephonyManager.CarrierPrivilegesCallback; import android.telephony.TelephonyManager.CarrierPrivilegesListener; import android.telephony.emergency.EmergencyNumber; import android.telephony.ims.ImsReasonInfo; @@ -44,17 +46,19 @@ import android.util.Log; import com.android.internal.annotations.GuardedBy; import com.android.internal.listeners.ListenerExecutor; -import com.android.internal.telephony.ICarrierPrivilegesListener; +import com.android.internal.telephony.ICarrierPrivilegesCallback; import com.android.internal.telephony.IOnSubscriptionsChangedListener; import com.android.internal.telephony.ITelephonyRegistry; import java.lang.ref.WeakReference; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.Executor; +import java.util.stream.Collectors; /** * A centralized place to notify telephony related status changes, e.g, {@link ServiceState} update @@ -1260,34 +1264,78 @@ public class TelephonyRegistryManager { pkgName, attributionTag, callback, new int[0], notifyNow); } - private static class CarrierPrivilegesListenerWrapper extends ICarrierPrivilegesListener.Stub + // TODO(b/216549778): Remove listener logic once all clients switch to CarrierPrivilegesCallback + private static class CarrierPrivilegesCallbackWrapper extends ICarrierPrivilegesCallback.Stub implements ListenerExecutor { - private final WeakReference<CarrierPrivilegesListener> mListener; - private final Executor mExecutor; + // Either mListener or mCallback may be null, never both + @Nullable private final WeakReference<CarrierPrivilegesListener> mListener; + @Nullable private final WeakReference<CarrierPrivilegesCallback> mCallback; + @NonNull private final Executor mExecutor; + + CarrierPrivilegesCallbackWrapper( + @NonNull CarrierPrivilegesCallback callback, @NonNull Executor executor) { + mListener = null; + mCallback = new WeakReference<>(callback); + mExecutor = executor; + } - CarrierPrivilegesListenerWrapper(CarrierPrivilegesListener listener, Executor executor) { + CarrierPrivilegesCallbackWrapper( + @NonNull CarrierPrivilegesListener listener, @NonNull Executor executor) { mListener = new WeakReference<>(listener); + mCallback = null; mExecutor = executor; } @Override public void onCarrierPrivilegesChanged( - List<String> privilegedPackageNames, int[] privilegedUids) { - Binder.withCleanCallingIdentity( - () -> - executeSafely( - mExecutor, - mListener::get, - cpl -> - cpl.onCarrierPrivilegesChanged( - privilegedPackageNames, privilegedUids))); + @NonNull List<String> privilegedPackageNames, @NonNull int[] privilegedUids) { + if (mListener != null) { + Binder.withCleanCallingIdentity( + () -> + executeSafely( + mExecutor, + mListener::get, + cpl -> + cpl.onCarrierPrivilegesChanged( + privilegedPackageNames, privilegedUids))); + } + + if (mCallback != null) { + // AIDL interface does not support Set, keep the List/Array and translate them here + Set<String> privilegedPkgNamesSet = Set.copyOf(privilegedPackageNames); + Set<Integer> privilegedUidsSet = Arrays.stream(privilegedUids).boxed().collect( + Collectors.toSet()); + Binder.withCleanCallingIdentity( + () -> + executeSafely( + mExecutor, + mCallback::get, + cpc -> + cpc.onCarrierPrivilegesChanged( + privilegedPkgNamesSet, privilegedUidsSet))); + } + } + + @Override + public void onCarrierServiceChanged(@Nullable String packageName, int uid) { + if (mCallback != null) { + Binder.withCleanCallingIdentity( + () -> + executeSafely( + mExecutor, + mCallback::get, + cpc -> cpc.onCarrierServiceChanged(packageName, uid))); + } } } - @GuardedBy("sCarrierPrivilegeListeners") - private static final WeakHashMap< - CarrierPrivilegesListener, WeakReference<CarrierPrivilegesListenerWrapper>> - sCarrierPrivilegeListeners = new WeakHashMap<>(); + // TODO(b/216549778): Change the map key to CarrierPrivilegesCallback once all clients switch to + // CarrierPrivilegesCallback. Before that, the key is either CarrierPrivilegesCallback or + // CarrierPrivilegesListener, no logic actually depends on the type. + @NonNull + @GuardedBy("sCarrierPrivilegeCallbacks") + private static final WeakHashMap<Object, WeakReference<CarrierPrivilegesCallbackWrapper>> + sCarrierPrivilegeCallbacks = new WeakHashMap<>(); /** * Registers a {@link CarrierPrivilegesListener} on the given {@code logicalSlotIndex} to @@ -1297,7 +1345,11 @@ public class TelephonyRegistryManager { * @param logicalSlotIndex The SIM slot to listen on * @param executor The executor where {@code listener} will be invoked * @param listener The callback to register + * + * @deprecated Use {@link #addCarrierPrivilegesCallback} instead. This API will be removed + * prior to API finalization. */ + @Deprecated public void addCarrierPrivilegesListener( int logicalSlotIndex, @NonNull @CallbackExecutor Executor executor, @@ -1305,18 +1357,18 @@ public class TelephonyRegistryManager { if (listener == null || executor == null) { throw new IllegalArgumentException("listener and executor must be non-null"); } - synchronized (sCarrierPrivilegeListeners) { - WeakReference<CarrierPrivilegesListenerWrapper> existing = - sCarrierPrivilegeListeners.get(listener); + synchronized (sCarrierPrivilegeCallbacks) { + WeakReference<CarrierPrivilegesCallbackWrapper> existing = + sCarrierPrivilegeCallbacks.get(listener); if (existing != null && existing.get() != null) { Log.d(TAG, "addCarrierPrivilegesListener: listener already registered"); return; } - CarrierPrivilegesListenerWrapper wrapper = - new CarrierPrivilegesListenerWrapper(listener, executor); - sCarrierPrivilegeListeners.put(listener, new WeakReference<>(wrapper)); + CarrierPrivilegesCallbackWrapper wrapper = + new CarrierPrivilegesCallbackWrapper(listener, executor); + sCarrierPrivilegeCallbacks.put(listener, new WeakReference<>(wrapper)); try { - sRegistry.addCarrierPrivilegesListener( + sRegistry.addCarrierPrivilegesCallback( logicalSlotIndex, wrapper, mContext.getOpPackageName(), @@ -1331,19 +1383,84 @@ public class TelephonyRegistryManager { * Unregisters a {@link CarrierPrivilegesListener}. * * @param listener The callback to unregister + * + * @deprecated Use {@link #removeCarrierPrivilegesCallback} instead. The callback will prior + * to API finalization. */ + @Deprecated public void removeCarrierPrivilegesListener(@NonNull CarrierPrivilegesListener listener) { if (listener == null) { throw new IllegalArgumentException("listener must be non-null"); } - synchronized (sCarrierPrivilegeListeners) { - WeakReference<CarrierPrivilegesListenerWrapper> ref = - sCarrierPrivilegeListeners.remove(listener); + synchronized (sCarrierPrivilegeCallbacks) { + WeakReference<CarrierPrivilegesCallbackWrapper> ref = + sCarrierPrivilegeCallbacks.remove(listener); if (ref == null) return; - CarrierPrivilegesListenerWrapper wrapper = ref.get(); + CarrierPrivilegesCallbackWrapper wrapper = ref.get(); if (wrapper == null) return; try { - sRegistry.removeCarrierPrivilegesListener(wrapper, mContext.getOpPackageName()); + sRegistry.removeCarrierPrivilegesCallback(wrapper, mContext.getOpPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * Registers a {@link CarrierPrivilegesCallback} on the given {@code logicalSlotIndex} to + * receive callbacks when the set of packages with carrier privileges changes. The callback will + * immediately be called with the latest state. + * + * @param logicalSlotIndex The SIM slot to listen on + * @param executor The executor where {@code listener} will be invoked + * @param callback The callback to register + */ + public void addCarrierPrivilegesCallback( + int logicalSlotIndex, + @NonNull @CallbackExecutor Executor executor, + @NonNull CarrierPrivilegesCallback callback) { + if (callback == null || executor == null) { + throw new IllegalArgumentException("callback and executor must be non-null"); + } + synchronized (sCarrierPrivilegeCallbacks) { + WeakReference<CarrierPrivilegesCallbackWrapper> existing = + sCarrierPrivilegeCallbacks.get(callback); + if (existing != null && existing.get() != null) { + Log.d(TAG, "addCarrierPrivilegesCallback: callback already registered"); + return; + } + CarrierPrivilegesCallbackWrapper wrapper = + new CarrierPrivilegesCallbackWrapper(callback, executor); + sCarrierPrivilegeCallbacks.put(callback, new WeakReference<>(wrapper)); + try { + sRegistry.addCarrierPrivilegesCallback( + logicalSlotIndex, + wrapper, + mContext.getOpPackageName(), + mContext.getAttributionTag()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * Unregisters a {@link CarrierPrivilegesCallback}. + * + * @param callback The callback to unregister + */ + public void removeCarrierPrivilegesCallback(@NonNull CarrierPrivilegesCallback callback) { + if (callback == null) { + throw new IllegalArgumentException("listener must be non-null"); + } + synchronized (sCarrierPrivilegeCallbacks) { + WeakReference<CarrierPrivilegesCallbackWrapper> ref = + sCarrierPrivilegeCallbacks.remove(callback); + if (ref == null) return; + CarrierPrivilegesCallbackWrapper wrapper = ref.get(); + if (wrapper == null) return; + try { + sRegistry.removeCarrierPrivilegesCallback(wrapper, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1359,15 +1476,33 @@ public class TelephonyRegistryManager { */ public void notifyCarrierPrivilegesChanged( int logicalSlotIndex, - @NonNull List<String> privilegedPackageNames, - @NonNull int[] privilegedUids) { + @NonNull Set<String> privilegedPackageNames, + @NonNull Set<Integer> privilegedUids) { if (privilegedPackageNames == null || privilegedUids == null) { throw new IllegalArgumentException( "privilegedPackageNames and privilegedUids must be non-null"); } try { - sRegistry.notifyCarrierPrivilegesChanged( - logicalSlotIndex, privilegedPackageNames, privilegedUids); + // AIDL doesn't support Set yet. Convert Set to List/Array + List<String> pkgList = List.copyOf(privilegedPackageNames); + int[] uids = privilegedUids.stream().mapToInt(Number::intValue).toArray(); + sRegistry.notifyCarrierPrivilegesChanged(logicalSlotIndex, pkgList, uids); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * Notify listeners that the {@link CarrierService} for current user has changed. + * + * @param logicalSlotIndex the SIM slot the change occurred on + * @param packageName the package name of the changed {@link CarrierService} + * @param uid the UID of the changed {@link CarrierService} + */ + public void notifyCarrierServiceChanged(int logicalSlotIndex, @Nullable String packageName, + int uid) { + try { + sRegistry.notifyCarrierServiceChanged(logicalSlotIndex, packageName, uid); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/window/DisplayWindowPolicyController.java b/core/java/android/window/DisplayWindowPolicyController.java index 3359a41369d7..1270d87e3a04 100644 --- a/core/java/android/window/DisplayWindowPolicyController.java +++ b/core/java/android/window/DisplayWindowPolicyController.java @@ -17,12 +17,14 @@ package android.window; import android.annotation.NonNull; +import android.app.WindowConfiguration; import android.content.ComponentName; import android.content.pm.ActivityInfo; import android.util.ArraySet; import java.io.PrintWriter; import java.util.List; +import java.util.Set; /** * Abstract class to control the policies of the windows that can be displayed on the virtual @@ -46,6 +48,22 @@ public abstract class DisplayWindowPolicyController { private int mSystemWindowFlags; /** + * The set of windowing mode that are supported in this display. + * @see android.app.WindowConfiguration.WindowingMode + */ + private final Set<Integer> mSupportedWindowingModes = new ArraySet<>(); + + /** + * A controller to control the policies of the windows that can be displayed on the virtual + * display. + */ + public DisplayWindowPolicyController() { + synchronized (mSupportedWindowingModes) { + mSupportedWindowingModes.add(WindowConfiguration.WINDOWING_MODE_FULLSCREEN); + } + } + + /** * Returns {@code true} if the given window flags contain the flags that we're interested in. */ public final boolean isInterestedWindowFlags(int windowFlags, int systemWindowFlags) { @@ -62,9 +80,34 @@ public abstract class DisplayWindowPolicyController { } /** - * Returns {@code true} if the given activities can be displayed on this virtual display. + * Returns {@code true} if the given windowing mode is supported in this display. + */ + public final boolean isWindowingModeSupported( + @WindowConfiguration.WindowingMode int windowingMode) { + synchronized (mSupportedWindowingModes) { + return mSupportedWindowingModes.contains(windowingMode); + } + } + + /** + * Sets the windowing modes are supported in this display. + * + * @param supportedWindowingModes The set of + * {@link android.app.WindowConfiguration.WindowingMode}. + */ + public final void setSupportedWindowingModes(Set<Integer> supportedWindowingModes) { + synchronized (mSupportedWindowingModes) { + mSupportedWindowingModes.clear(); + mSupportedWindowingModes.addAll(supportedWindowingModes); + } + } + + /** + * Returns {@code true} if the given activities can be displayed on this virtual display and + * the windowing mode is supported. */ - public abstract boolean canContainActivities(@NonNull List<ActivityInfo> activities); + public abstract boolean canContainActivities(@NonNull List<ActivityInfo> activities, + @WindowConfiguration.WindowingMode int windowingMode); /** * Called when an Activity window is layouted with the new changes where contains the diff --git a/core/java/com/android/internal/os/AudioPowerCalculator.java b/core/java/com/android/internal/os/AudioPowerCalculator.java index f9310b0c28d9..ebf0ca263a62 100644 --- a/core/java/com/android/internal/os/AudioPowerCalculator.java +++ b/core/java/com/android/internal/os/AudioPowerCalculator.java @@ -78,7 +78,9 @@ public class AudioPowerCalculator extends PowerCalculator { final double powerMah = mPowerEstimator.calculatePower(durationMs); app.setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_AUDIO, durationMs) .setConsumedPower(BatteryConsumer.POWER_COMPONENT_AUDIO, powerMah); - total.durationMs += durationMs; - total.powerMah += powerMah; + if (!app.isVirtualUid()) { + total.durationMs += durationMs; + total.powerMah += powerMah; + } } } diff --git a/core/java/com/android/internal/os/BatteryUsageStatsProvider.java b/core/java/com/android/internal/os/BatteryUsageStatsProvider.java index a1c1917fd83e..81c6ee71e060 100644 --- a/core/java/com/android/internal/os/BatteryUsageStatsProvider.java +++ b/core/java/com/android/internal/os/BatteryUsageStatsProvider.java @@ -22,6 +22,7 @@ import android.os.BatteryStats; import android.os.BatteryUsageStats; import android.os.BatteryUsageStatsQuery; import android.os.Parcel; +import android.os.Process; import android.os.SystemClock; import android.os.UidBatteryConsumer; import android.util.Log; @@ -162,6 +163,8 @@ public class BatteryUsageStatsProvider { final boolean includeProcessStateData = ((query.getFlags() & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_PROCESS_STATE_DATA) != 0) && mStats.isProcessStateDataAvailable(); + final boolean includeVirtualUids = ((query.getFlags() + & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_VIRTUAL_UIDS) != 0); final BatteryUsageStats.Builder batteryUsageStatsBuilder = new BatteryUsageStats.Builder( mStats.getCustomEnergyConsumerNames(), includePowerModels, @@ -174,6 +177,10 @@ public class BatteryUsageStatsProvider { SparseArray<? extends BatteryStats.Uid> uidStats = mStats.getUidStats(); for (int i = uidStats.size() - 1; i >= 0; i--) { final BatteryStats.Uid uid = uidStats.valueAt(i); + if (!includeVirtualUids && uid.getUid() == Process.SDK_SANDBOX_VIRTUAL_UID) { + continue; + } + batteryUsageStatsBuilder.getOrCreateUidBatteryConsumerBuilder(uid) .setTimeInStateMs(UidBatteryConsumer.STATE_BACKGROUND, getProcessBackgroundTimeMs(uid, realtimeUs)) diff --git a/core/java/com/android/internal/os/BluetoothPowerCalculator.java b/core/java/com/android/internal/os/BluetoothPowerCalculator.java index 2ebf689e2c7f..e52c8a3a3efb 100644 --- a/core/java/com/android/internal/os/BluetoothPowerCalculator.java +++ b/core/java/com/android/internal/os/BluetoothPowerCalculator.java @@ -139,8 +139,10 @@ public class BluetoothPowerCalculator extends PowerCalculator { BatteryConsumer.POWER_COMPONENT_BLUETOOTH, powerAndDuration.powerMah, powerModel); - powerAndDuration.totalDurationMs += powerAndDuration.durationMs; - powerAndDuration.totalPowerMah += powerAndDuration.powerMah; + if (!app.isVirtualUid()) { + powerAndDuration.totalDurationMs += powerAndDuration.durationMs; + powerAndDuration.totalPowerMah += powerAndDuration.powerMah; + } if (query.isProcessStateDataNeeded() && powerAndDuration.keys != null) { for (int j = 0; j < powerAndDuration.keys.length; j++) { diff --git a/core/java/com/android/internal/os/CpuPowerCalculator.java b/core/java/com/android/internal/os/CpuPowerCalculator.java index 1fc2baf040b6..8704e936c747 100644 --- a/core/java/com/android/internal/os/CpuPowerCalculator.java +++ b/core/java/com/android/internal/os/CpuPowerCalculator.java @@ -117,7 +117,9 @@ public class CpuPowerCalculator extends PowerCalculator { } } calculateApp(app, app.getBatteryStatsUid(), query, result, keys); - totalPowerMah += result.powerMah; + if (!app.isVirtualUid()) { + totalPowerMah += result.powerMah; + } } final long consumptionUC = batteryStats.getCpuMeasuredBatteryConsumptionUC(); diff --git a/core/java/com/android/internal/os/CustomMeasuredPowerCalculator.java b/core/java/com/android/internal/os/CustomMeasuredPowerCalculator.java index cbbb52621111..0853bd801137 100644 --- a/core/java/com/android/internal/os/CustomMeasuredPowerCalculator.java +++ b/core/java/com/android/internal/os/CustomMeasuredPowerCalculator.java @@ -96,7 +96,9 @@ public class CustomMeasuredPowerCalculator extends PowerCalculator { app.setConsumedPowerForCustomComponent( BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID + i, customMeasuredPowerMah[i]); - newTotalPowerMah[i] += customMeasuredPowerMah[i]; + if (!app.isVirtualUid()) { + newTotalPowerMah[i] += customMeasuredPowerMah[i]; + } } } return newTotalPowerMah; diff --git a/core/java/com/android/internal/os/GnssPowerCalculator.java b/core/java/com/android/internal/os/GnssPowerCalculator.java index 0f783062f3e7..070783a04105 100644 --- a/core/java/com/android/internal/os/GnssPowerCalculator.java +++ b/core/java/com/android/internal/os/GnssPowerCalculator.java @@ -58,8 +58,11 @@ public class GnssPowerCalculator extends PowerCalculator { final long consumptionUC = app.getBatteryStatsUid().getGnssMeasuredBatteryConsumptionUC(); final int powerModel = getPowerModel(consumptionUC, query); - appsPowerMah += calculateApp(app, app.getBatteryStatsUid(), powerModel, + final double powerMah = calculateApp(app, app.getBatteryStatsUid(), powerModel, rawRealtimeUs, averageGnssPowerMa, consumptionUC); + if (!app.isVirtualUid()) { + appsPowerMah += powerMah; + } } final long consumptionUC = batteryStats.getGnssMeasuredBatteryConsumptionUC(); diff --git a/core/java/com/android/internal/os/MobileRadioPowerCalculator.java b/core/java/com/android/internal/os/MobileRadioPowerCalculator.java index f4624de289be..d0df45c9af65 100644 --- a/core/java/com/android/internal/os/MobileRadioPowerCalculator.java +++ b/core/java/com/android/internal/os/MobileRadioPowerCalculator.java @@ -136,12 +136,14 @@ public class MobileRadioPowerCalculator extends PowerCalculator { PowerAndDuration total, BatteryUsageStatsQuery query, BatteryConsumer.Key[] keys) { final long radioActiveDurationMs = calculateDuration(u, BatteryStats.STATS_SINCE_CHARGED); - total.totalAppDurationMs += radioActiveDurationMs; - final long consumptionUC = u.getMobileRadioMeasuredBatteryConsumptionUC(); final int powerModel = getPowerModel(consumptionUC, query); final double powerMah = calculatePower(u, powerModel, radioActiveDurationMs, consumptionUC); - total.totalAppPowerMah += powerMah; + + if (!app.isVirtualUid()) { + total.totalAppDurationMs += radioActiveDurationMs; + total.totalAppPowerMah += powerMah; + } app.setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO, radioActiveDurationMs) diff --git a/core/java/com/android/internal/os/ScreenPowerCalculator.java b/core/java/com/android/internal/os/ScreenPowerCalculator.java index 67d3d6e7bede..5ca1a857fbcd 100644 --- a/core/java/com/android/internal/os/ScreenPowerCalculator.java +++ b/core/java/com/android/internal/os/ScreenPowerCalculator.java @@ -96,8 +96,10 @@ public class ScreenPowerCalculator extends PowerCalculator { appPowerAndDuration.durationMs) .setConsumedPower(BatteryConsumer.POWER_COMPONENT_SCREEN, appPowerAndDuration.powerMah, powerModel); - totalAppPower += appPowerAndDuration.powerMah; - totalAppDuration += appPowerAndDuration.durationMs; + if (!app.isVirtualUid()) { + totalAppPower += appPowerAndDuration.powerMah; + totalAppDuration += appPowerAndDuration.durationMs; + } } break; case BatteryConsumer.POWER_MODEL_POWER_PROFILE: @@ -192,10 +194,13 @@ public class ScreenPowerCalculator extends PowerCalculator { long totalActivityTimeMs = 0; final SparseLongArray activityTimeArray = new SparseLongArray(); for (int i = uidBatteryConsumerBuilders.size() - 1; i >= 0; i--) { - final BatteryStats.Uid uid = uidBatteryConsumerBuilders.valueAt(i).getBatteryStatsUid(); + final UidBatteryConsumer.Builder app = uidBatteryConsumerBuilders.valueAt(i); + final BatteryStats.Uid uid = app.getBatteryStatsUid(); final long timeMs = getProcessForegroundTimeMs(uid, rawRealtimeUs); activityTimeArray.put(uid.getUid(), timeMs); - totalActivityTimeMs += timeMs; + if (!app.isVirtualUid()) { + totalActivityTimeMs += timeMs; + } } if (totalActivityTimeMs >= MIN_ACTIVE_TIME_FOR_SMEARING) { diff --git a/core/java/com/android/internal/os/SensorPowerCalculator.java b/core/java/com/android/internal/os/SensorPowerCalculator.java index 4a9c91d14c4c..573692ea63f3 100644 --- a/core/java/com/android/internal/os/SensorPowerCalculator.java +++ b/core/java/com/android/internal/os/SensorPowerCalculator.java @@ -51,7 +51,9 @@ public class SensorPowerCalculator extends PowerCalculator { builder.getUidBatteryConsumerBuilders(); for (int i = uidBatteryConsumerBuilders.size() - 1; i >= 0; i--) { final UidBatteryConsumer.Builder app = uidBatteryConsumerBuilders.valueAt(i); - appsPowerMah += calculateApp(app, app.getBatteryStatsUid(), rawRealtimeUs); + if (!app.isVirtualUid()) { + appsPowerMah += calculateApp(app, app.getBatteryStatsUid(), rawRealtimeUs); + } } builder.getAggregateBatteryConsumerBuilder( diff --git a/core/java/com/android/internal/os/UserPowerCalculator.java b/core/java/com/android/internal/os/UserPowerCalculator.java index 22cff6e2435a..79e3a195dc82 100644 --- a/core/java/com/android/internal/os/UserPowerCalculator.java +++ b/core/java/com/android/internal/os/UserPowerCalculator.java @@ -49,7 +49,11 @@ public class UserPowerCalculator extends PowerCalculator { builder.getUidBatteryConsumerBuilders(); for (int i = uidBatteryConsumerBuilders.size() - 1; i >= 0; i--) { - UidBatteryConsumer.Builder uidBuilder = uidBatteryConsumerBuilders.valueAt(i); + final UidBatteryConsumer.Builder uidBuilder = uidBatteryConsumerBuilders.valueAt(i); + if (uidBuilder.isVirtualUid()) { + continue; + } + final int uid = uidBuilder.getUid(); if (UserHandle.getAppId(uid) < Process.FIRST_APPLICATION_UID) { continue; diff --git a/core/java/com/android/internal/os/VideoPowerCalculator.java b/core/java/com/android/internal/os/VideoPowerCalculator.java index a222bcb4dfbf..2daf15eb14a6 100644 --- a/core/java/com/android/internal/os/VideoPowerCalculator.java +++ b/core/java/com/android/internal/os/VideoPowerCalculator.java @@ -75,7 +75,9 @@ public class VideoPowerCalculator extends PowerCalculator { final double powerMah = mPowerEstimator.calculatePower(durationMs); app.setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_VIDEO, durationMs) .setConsumedPower(BatteryConsumer.POWER_COMPONENT_VIDEO, powerMah); - total.durationMs += durationMs; - total.powerMah += powerMah; + if (!app.isVirtualUid()) { + total.durationMs += durationMs; + total.powerMah += powerMah; + } } } diff --git a/core/java/com/android/internal/os/WakelockPowerCalculator.java b/core/java/com/android/internal/os/WakelockPowerCalculator.java index 0251e1ccc885..3ae7113faf71 100644 --- a/core/java/com/android/internal/os/WakelockPowerCalculator.java +++ b/core/java/com/android/internal/os/WakelockPowerCalculator.java @@ -62,8 +62,10 @@ public class WakelockPowerCalculator extends PowerCalculator { BatteryStats.STATS_SINCE_CHARGED); app.setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_WAKELOCK, result.durationMs) .setConsumedPower(BatteryConsumer.POWER_COMPONENT_WAKELOCK, result.powerMah); - totalAppDurationMs += result.durationMs; - appPowerMah += result.powerMah; + if (!app.isVirtualUid()) { + totalAppDurationMs += result.durationMs; + appPowerMah += result.powerMah; + } if (app.getUid() == Process.ROOT_UID) { osBatteryConsumer = app; diff --git a/core/java/com/android/internal/os/WifiPowerCalculator.java b/core/java/com/android/internal/os/WifiPowerCalculator.java index 8c3fb86331b2..2181821dd55a 100644 --- a/core/java/com/android/internal/os/WifiPowerCalculator.java +++ b/core/java/com/android/internal/os/WifiPowerCalculator.java @@ -111,9 +111,10 @@ public class WifiPowerCalculator extends PowerCalculator { calculateApp(powerDurationAndTraffic, app.getBatteryStatsUid(), powerModel, rawRealtimeUs, BatteryStats.STATS_SINCE_CHARGED, batteryStats.hasWifiActivityReporting(), consumptionUC); - - totalAppDurationMs += powerDurationAndTraffic.durationMs; - totalAppPowerMah += powerDurationAndTraffic.powerMah; + if (!app.isVirtualUid()) { + totalAppDurationMs += powerDurationAndTraffic.durationMs; + totalAppPowerMah += powerDurationAndTraffic.powerMah; + } app.setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_WIFI, powerDurationAndTraffic.durationMs); diff --git a/core/java/com/android/internal/telephony/ICarrierPrivilegesListener.aidl b/core/java/com/android/internal/telephony/ICarrierPrivilegesCallback.aidl index 6ca8cecba3c8..0c8e73fb2b67 100644 --- a/core/java/com/android/internal/telephony/ICarrierPrivilegesListener.aidl +++ b/core/java/com/android/internal/telephony/ICarrierPrivilegesCallback.aidl @@ -16,7 +16,8 @@ package com.android.internal.telephony; -oneway interface ICarrierPrivilegesListener { +oneway interface ICarrierPrivilegesCallback { void onCarrierPrivilegesChanged( in List<String> privilegedPackageNames, in int[] privilegedUids); + void onCarrierServiceChanged(in String carrierServicePackageName, in int carrierServiceUid); } diff --git a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl index 9712d7e38a4b..c7fa757ac0b7 100644 --- a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -32,7 +32,7 @@ import android.telephony.PreciseDataConnectionState; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.emergency.EmergencyNumber; -import com.android.internal.telephony.ICarrierPrivilegesListener; +import com.android.internal.telephony.ICarrierPrivilegesCallback; import com.android.internal.telephony.IPhoneStateListener; import com.android.internal.telephony.IOnSubscriptionsChangedListener; @@ -102,9 +102,11 @@ interface ITelephonyRegistry { void notifyLinkCapacityEstimateChanged(in int phoneId, in int subId, in List<LinkCapacityEstimate> linkCapacityEstimateList); - void addCarrierPrivilegesListener( - int phoneId, ICarrierPrivilegesListener callback, String pkg, String featureId); - void removeCarrierPrivilegesListener(ICarrierPrivilegesListener callback, String pkg); + void addCarrierPrivilegesCallback( + int phoneId, ICarrierPrivilegesCallback callback, String pkg, String featureId); + void removeCarrierPrivilegesCallback(ICarrierPrivilegesCallback callback, String pkg); void notifyCarrierPrivilegesChanged( int phoneId, in List<String> privilegedPackageNames, in int[] privilegedUids); + void notifyCarrierServiceChanged(int phoneId, in String packageName, int uid); + } diff --git a/core/java/com/android/internal/widget/ConversationLayout.java b/core/java/com/android/internal/widget/ConversationLayout.java index 5fa4a652e176..4706affa3541 100644 --- a/core/java/com/android/internal/widget/ConversationLayout.java +++ b/core/java/com/android/internal/widget/ConversationLayout.java @@ -66,7 +66,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.function.Consumer; /** * A custom-built layout for the Notification.MessagingStyle allows dynamic addition and removal @@ -76,8 +75,6 @@ import java.util.function.Consumer; public class ConversationLayout extends FrameLayout implements ImageMessageConsumer, IMessagingLayout { - private static final Consumer<MessagingMessage> REMOVE_MESSAGE - = MessagingMessage::removeMessage; public static final Interpolator LINEAR_OUT_SLOW_IN = new PathInterpolator(0f, 0f, 0.2f, 1f); public static final Interpolator FAST_OUT_LINEAR_IN = new PathInterpolator(0.4f, 0f, 1f, 1f); public static final Interpolator FAST_OUT_SLOW_IN = new PathInterpolator(0.4f, 0f, 0.2f, 1f); @@ -150,7 +147,7 @@ public class ConversationLayout extends FrameLayout private Icon mShortcutIcon; private View mAppNameDivider; private TouchDelegateComposite mTouchDelegate = new TouchDelegateComposite(this); - private ArrayList<MessagingGroup> mToRecycle = new ArrayList<>(); + private ArrayList<MessagingLinearLayout.MessagingChild> mToRecycle = new ArrayList<>(); public ConversationLayout(@NonNull Context context) { super(context); @@ -463,8 +460,12 @@ public class ConversationLayout extends FrameLayout removeGroups(oldGroups); // Let's remove the remaining messages - mMessages.forEach(REMOVE_MESSAGE); - mHistoricMessages.forEach(REMOVE_MESSAGE); + for (MessagingMessage message : mMessages) { + message.removeMessage(mToRecycle); + } + for (MessagingMessage historicMessage : mHistoricMessages) { + historicMessage.removeMessage(mToRecycle); + } mMessages = messages; mHistoricMessages = historicMessages; @@ -475,8 +476,8 @@ public class ConversationLayout extends FrameLayout updateConversationLayout(); // Recycle everything at the end of the update, now that we know it's no longer needed. - for (MessagingGroup group : mToRecycle) { - group.recycle(); + for (MessagingLinearLayout.MessagingChild child : mToRecycle) { + child.recycle(); } mToRecycle.clear(); } diff --git a/core/java/com/android/internal/widget/MessagingGroup.java b/core/java/com/android/internal/widget/MessagingGroup.java index 9e06e33b79b5..146cb3fadaac 100644 --- a/core/java/com/android/internal/widget/MessagingGroup.java +++ b/core/java/com/android/internal/widget/MessagingGroup.java @@ -262,7 +262,8 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou return createdGroup; } - public void removeMessage(MessagingMessage messagingMessage) { + public void removeMessage(MessagingMessage messagingMessage, + ArrayList<MessagingLinearLayout.MessagingChild> toRecycle) { View view = messagingMessage.getView(); boolean wasShown = view.isShown(); ViewGroup messageParent = (ViewGroup) view.getParent(); @@ -270,15 +271,14 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou return; } messageParent.removeView(view); - Runnable recycleRunnable = () -> { - messageParent.removeTransientView(view); - messagingMessage.recycle(); - }; if (wasShown && !MessagingLinearLayout.isGone(view)) { messageParent.addTransientView(view, 0); - performRemoveAnimation(view, recycleRunnable); + performRemoveAnimation(view, () -> { + messageParent.removeTransientView(view); + messagingMessage.recycle(); + }); } else { - recycleRunnable.run(); + toRecycle.add(messagingMessage); } } diff --git a/core/java/com/android/internal/widget/MessagingLayout.java b/core/java/com/android/internal/widget/MessagingLayout.java index 21ca196886ab..9ac6ef77bc07 100644 --- a/core/java/com/android/internal/widget/MessagingLayout.java +++ b/core/java/com/android/internal/widget/MessagingLayout.java @@ -51,7 +51,6 @@ import com.android.internal.util.ContrastColorUtil; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.function.Consumer; /** * A custom-built layout for the Notification.MessagingStyle allows dynamic addition and removal @@ -62,8 +61,6 @@ public class MessagingLayout extends FrameLayout implements ImageMessageConsumer, IMessagingLayout { private static final float COLOR_SHIFT_AMOUNT = 60; - private static final Consumer<MessagingMessage> REMOVE_MESSAGE - = MessagingMessage::removeMessage; public static final Interpolator LINEAR_OUT_SLOW_IN = new PathInterpolator(0f, 0f, 0.2f, 1f); public static final Interpolator FAST_OUT_LINEAR_IN = new PathInterpolator(0.4f, 0f, 1f, 1f); public static final Interpolator FAST_OUT_SLOW_IN = new PathInterpolator(0.4f, 0f, 0.2f, 1f); @@ -89,6 +86,7 @@ public class MessagingLayout extends FrameLayout private boolean mIsCollapsed; private ImageResolver mImageResolver; private CharSequence mConversationTitle; + private ArrayList<MessagingLinearLayout.MessagingChild> mToRecycle = new ArrayList<>(); public MessagingLayout(@NonNull Context context) { super(context); @@ -212,8 +210,12 @@ public class MessagingLayout extends FrameLayout removeGroups(oldGroups); // Let's remove the remaining messages - mMessages.forEach(REMOVE_MESSAGE); - mHistoricMessages.forEach(REMOVE_MESSAGE); + for (MessagingMessage message : mMessages) { + message.removeMessage(mToRecycle); + } + for (MessagingMessage historicMessage : mHistoricMessages) { + historicMessage.removeMessage(mToRecycle); + } mMessages = messages; mHistoricMessages = historicMessages; @@ -223,6 +225,12 @@ public class MessagingLayout extends FrameLayout // after groups are finalized, hide the first sender name if it's showing as the title mPeopleHelper.maybeHideFirstSenderName(mGroups, mIsOneToOne, mConversationTitle); updateImageMessages(); + + // Recycle everything at the end of the update, now that we know it's no longer needed. + for (MessagingLinearLayout.MessagingChild child : mToRecycle) { + child.recycle(); + } + mToRecycle.clear(); } private void updateImageMessages() { @@ -263,18 +271,17 @@ public class MessagingLayout extends FrameLayout MessagingGroup group = oldGroups.get(i); if (!mGroups.contains(group)) { List<MessagingMessage> messages = group.getMessages(); - Runnable endRunnable = () -> { - mMessagingLinearLayout.removeTransientView(group); - group.recycle(); - }; boolean wasShown = group.isShown(); mMessagingLinearLayout.removeView(group); if (wasShown && !MessagingLinearLayout.isGone(group)) { mMessagingLinearLayout.addTransientView(group, 0); - group.removeGroupAnimated(endRunnable); + group.removeGroupAnimated(() -> { + mMessagingLinearLayout.removeTransientView(group); + group.recycle(); + }); } else { - endRunnable.run(); + mToRecycle.add(group); } mMessages.removeAll(messages); mHistoricMessages.removeAll(messages); diff --git a/core/java/com/android/internal/widget/MessagingLinearLayout.java b/core/java/com/android/internal/widget/MessagingLinearLayout.java index cb1d387dbd07..c06f5f75514f 100644 --- a/core/java/com/android/internal/widget/MessagingLinearLayout.java +++ b/core/java/com/android/internal/widget/MessagingLinearLayout.java @@ -365,6 +365,7 @@ public class MessagingLinearLayout extends ViewGroup { default int getExtraSpacing() { return 0; } + void recycle(); } public static class LayoutParams extends MarginLayoutParams { diff --git a/core/java/com/android/internal/widget/MessagingMessage.java b/core/java/com/android/internal/widget/MessagingMessage.java index 8c8437951402..2cc0d2305a78 100644 --- a/core/java/com/android/internal/widget/MessagingMessage.java +++ b/core/java/com/android/internal/widget/MessagingMessage.java @@ -20,6 +20,7 @@ import android.app.ActivityManager; import android.app.Notification; import android.view.View; +import java.util.ArrayList; import java.util.Objects; /** @@ -96,8 +97,8 @@ public interface MessagingMessage extends MessagingLinearLayout.MessagingChild { return sameAs(message.getMessage()); } - default void removeMessage() { - getGroup().removeMessage(this); + default void removeMessage(ArrayList<MessagingLinearLayout.MessagingChild> toRecycle) { + getGroup().removeMessage(this, toRecycle); } default void setMessagingGroup(MessagingGroup group) { diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index b1846d2402dd..cc7e9d95b4f8 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -435,15 +435,15 @@ public class SystemConfig { } /** Get privapp permission allowlist for an apk-in-apex. */ - public ArraySet<String> getApexPrivAppPermissions(String module, String packageName) { - return mApexPrivAppPermissions.getOrDefault(module, EMPTY_PERMISSIONS) - .get(packageName); + public ArraySet<String> getApexPrivAppPermissions(String apexName, String apkPackageName) { + return mApexPrivAppPermissions.getOrDefault(apexName, EMPTY_PERMISSIONS) + .get(apkPackageName); } /** Get privapp permissions denylist for an apk-in-apex. */ - public ArraySet<String> getApexPrivAppDenyPermissions(String module, String packageName) { - return mApexPrivAppDenyPermissions.getOrDefault(module, EMPTY_PERMISSIONS) - .get(packageName); + public ArraySet<String> getApexPrivAppDenyPermissions(String apexName, String apkPackageName) { + return mApexPrivAppDenyPermissions.getOrDefault(apexName, EMPTY_PERMISSIONS) + .get(apkPackageName); } public ArraySet<String> getVendorPrivAppPermissions(String packageName) { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 10cb47ede31d..d652b2ff4f4a 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -6160,10 +6160,10 @@ <!-- Allows input events to be monitored. Very dangerous! @hide --> <permission android:name="android.permission.MONITOR_INPUT" android:protectionLevel="signature|recents" /> - <!-- Allows the use of FLAG_SLIPPERY, which permits touch events to slip from the current - window to the window where the touch currently is on top of. @hide --> + <!-- @SystemApi Allows the use of FLAG_SLIPPERY, which permits touch events to slip from the + current window to the window where the touch currently is on top of. @hide --> <permission android:name="android.permission.ALLOW_SLIPPERY_TOUCHES" - android:protectionLevel="signature|recents" /> + android:protectionLevel="signature|privileged|recents|role" /> <!-- Allows the caller to change the associations between input devices and displays. Very dangerous! @hide --> <permission android:name="android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY" @@ -6420,6 +6420,12 @@ <permission android:name="android.permission.WRITE_SECURITY_LOG" android:protectionLevel="signature|privileged" /> + <!-- Allows an UID to be visible to the application based on an interaction between the + two apps. This permission is not intended to be held by apps. + @hide @TestApi --> + <permission android:name="android.permission.MAKE_UID_VISIBLE" + android:protectionLevel="signature" /> + <!-- Attribution for Geofencing service. --> <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/> <!-- Attribution for Country Detector. --> diff --git a/core/res/res/drawable-nodpi/stat_sys_adb.xml b/core/res/res/drawable-nodpi/stat_sys_adb.xml index f8c04517800a..cb4462c9a169 100644 --- a/core/res/res/drawable-nodpi/stat_sys_adb.xml +++ b/core/res/res/drawable-nodpi/stat_sys_adb.xml @@ -1,5 +1,5 @@ <!-- -Copyright (C) 2021 The Android Open Source Project +Copyright (C) 2022 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,11 +13,78 @@ Copyright (C) 2021 The Android Open Source Project See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path android:pathData="M18 9c0-.69268-.1174-1.35795-.3333-1.97699C16.8495 4.68061 14.621 3 12 3 8.68629 3 6 5.68629 6 9v3h6M6 15c0 .6927.11738 1.3579.33333 1.977C7.15047 19.3194 9.37897 21 12 21c3.3137 0 6-2.6863 6-6v-3h-6" android:strokeColor="#000000" android:strokeWidth="2" android:fillColor="#00000000"/> - <path android:fillColor="#000000" android:pathData="M10 7a1 1 0 1 0 0 2 1 1 0 1 0 0-2zM14 7a1 1 0 1 0 0 2 1 1 0 1 0 0-2z"/> - <path android:pathData="M6 3l1.5 1.5M18 3l-1.5 1.5" android:strokeColor="#000000" android:strokeWidth="2" android:fillColor="#000000"/> +<vector android:width="24dp" android:height="24dp" + android:viewportWidth="24" android:viewportHeight="24" + xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:pathData=" + M22.45 11.94 + l-.58-.21 + a1.19 1.19 0 0 1-.26-2.12 + l.51-.34 + a1.2 1.2 0 0 0-.83-2.19 + l-.61.08 + a1.2 1.2 0 0 1-1.21-1.76 + l.29-.54 + A1.2 1.2 0 0 0 18 3.31 + l-.5.36 + a1.21 1.21 0 0 1-1.9-1 + v-.61 + a1.2 1.2 0 0 0-2.27-.56 + l-.26.5 + a1.2 1.2 0 0 1-2.14 0 + l-.28-.54 + a1.2 1.2 0 0 0-2.27.56 + v.61 + a1.21 1.21 0 0 1-1.9 1 + L6 3.31 + a1.2 1.2 0 0 0-1.76 1.55 + l.29.54 + a1.2 1.2 0 0 1-1.21 1.76 + l-.61-.08 + a1.2 1.2 0 0 0-.83 2.19 + l.51.34 + a1.19 1.19 0 0 1-.26 2.12 + l-.58.21 + a1.21 1.21 0 0 0 .29 2.33 + l.61.06 + a1.2 1.2 0 0 1 .76 2 + l-.42.46 + a1.2 1.2 0 0 0 1.33 1.92 + l.57-.22 + a1.21 1.21 0 0 1 1.61 1.42 + l-.16.59 + a1.2 1.2 0 0 0 2.07 1.09 + l.4-.47 + a1.2 1.2 0 0 1 2.08.51 + l.14.6 + a1.2 1.2 0 0 0 2.34 0 + l.14-.6 + a1.2 1.2 0 0 1 2.08-.51 + l.4.47 + a1.2 1.2 0 0 0 2.07-1.09 + l-.16-.59 + a1.21 1.21 0 0 1 1.61-1.42 + l.57.22 + a1.2 1.2 0 0 0 1.33-1.92 + l-.42-.46 + a1.2 1.2 0 0 1 .76-2 + l.61-.06 + a1.21 1.21 0 0 0 .29-2.33 + z + M12 19 + a7 7 0 1 1 7-7 7 7 0 0 1-7 7 + z + " + android:fillColor="#000000" /> + <path android:pathData=" + M9 7.75 + a.75.75 0 1 0 0 1.5.75.75 0 1 0 0-1.5 + z + M15 7.75 + a.75.75 0 1 0 0 1.5.75.75 0 1 0 0-1.5 + z + " + android:fillColor="#000000" /> + <path android:strokeColor="#000000" android:strokeMiterLimit="10" android:strokeWidth="2" + android:pathData="M4 12h16M12 12v8" /> </vector> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 04a70cb67d8c..4c71b3abd00c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5739,7 +5739,7 @@ <!-- Content for the log access confirmation dialog. [CHAR LIMIT=NONE]--> <string name="log_access_confirmation_body">Device logs record what happens on your device. Apps can use these logs to find and fix issues.\n\nSome logs may contain sensitive info, so only allow apps you trust to access all device logs. - \n\nIf you don’t allow this app to access all device logs, it can still access its own logs, and your device manufacturer may still be able to access some logs or info on your device. Learn more + \n\nIf you don’t allow this app to access all device logs, it can still access its own logs and your device manufacturer may still be able to access some logs or info on your device. Learn more </string> <!-- Privacy notice do not show [CHAR LIMIT=20] --> diff --git a/core/tests/coretests/src/android/graphics/drawable/IconTest.java b/core/tests/coretests/src/android/graphics/drawable/IconTest.java index 2bdcc284154b..75390a282af9 100644 --- a/core/tests/coretests/src/android/graphics/drawable/IconTest.java +++ b/core/tests/coretests/src/android/graphics/drawable/IconTest.java @@ -180,6 +180,61 @@ public class IconTest extends AndroidTestCase { } } + /** + * Icon resource test that ensures we can load and draw non-bitmaps. (In this case, + * stat_sys_adb is assumed, and asserted, to be a vector drawable.) + */ + @SmallTest + public void testWithStatSysAdbResource() throws Exception { + // establish reference bitmap + final float dp = getContext().getResources().getDisplayMetrics().density; + final int stat_sys_adb_width = (int) (24 * dp); + final int stat_sys_adb_height = (int) (24 * dp); + + final Drawable stat_sys_adb = getContext() + .getDrawable(com.android.internal.R.drawable.stat_sys_adb); + if (!(stat_sys_adb instanceof VectorDrawable)) { + fail("stat_sys_adb is a " + stat_sys_adb.toString() + + ", not a VectorDrawable; stat_sys_adb malformed"); + } + + if (stat_sys_adb.getIntrinsicWidth() != stat_sys_adb_width) { + fail("intrinsic width of stat_sys_adb is not 24dp; stat_sys_adb malformed"); + } + if (stat_sys_adb.getIntrinsicHeight() != stat_sys_adb_height) { + fail("intrinsic height of stat_sys_adb is not 24dp; stat_sys_adb malformed"); + } + final Bitmap referenceBitmap = Bitmap.createBitmap( + stat_sys_adb_width, + stat_sys_adb_height, + Bitmap.Config.ARGB_8888); + stat_sys_adb.setBounds(0, 0, stat_sys_adb_width, stat_sys_adb_height); + stat_sys_adb.draw(new Canvas(referenceBitmap)); + + final Icon im1 = Icon.createWithResource(getContext(), + com.android.internal.R.drawable.stat_sys_adb); + final Drawable draw1 = im1.loadDrawable(getContext()); + + assertEquals(stat_sys_adb.getIntrinsicWidth(), draw1.getIntrinsicWidth()); + assertEquals(stat_sys_adb.getIntrinsicHeight(), draw1.getIntrinsicHeight()); + assertEquals(im1.getResId(), com.android.internal.R.drawable.stat_sys_adb); + + final Bitmap test1 = Bitmap.createBitmap( + draw1.getIntrinsicWidth(), + draw1.getIntrinsicHeight(), + Bitmap.Config.ARGB_8888); + draw1.setBounds(0, 0, test1.getWidth(), test1.getHeight()); + draw1.draw(new Canvas(test1)); + + final File dir = getContext().getExternalFilesDir(null); + test1.compress(Bitmap.CompressFormat.PNG, 100, + new FileOutputStream(new File(dir, "testWithVectorDrawableResource-test.png"))); + if (!equalBitmaps(referenceBitmap, test1)) { + findBitmapDifferences(referenceBitmap, test1); + fail("testWithFile: file1 differs, check " + dir); + } + } + @SmallTest public void testWithFile() throws Exception { final Bitmap bit1 = ((BitmapDrawable) getContext().getDrawable(R.drawable.landscape)) diff --git a/data/etc/com.android.launcher3.xml b/data/etc/com.android.launcher3.xml index 598d2027a0e9..36a51341f52d 100644 --- a/data/etc/com.android.launcher3.xml +++ b/data/etc/com.android.launcher3.xml @@ -16,6 +16,7 @@ --> <permissions> <privapp-permissions package="com.android.launcher3"> + <permission name="android.permission.ALLOW_SLIPPERY_TOUCHES"/> <permission name="android.permission.BIND_APPWIDGET"/> <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/> <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/> diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml index ae350ec547c3..d1873a0f40cf 100644 --- a/data/etc/com.android.systemui.xml +++ b/data/etc/com.android.systemui.xml @@ -17,6 +17,7 @@ <permissions> <privapp-permissions package="com.android.systemui"> <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/> + <permission name="android.permission.ALLOW_SLIPPERY_TOUCHES"/> <permission name="android.permission.BATTERY_STATS"/> <permission name="android.permission.BIND_APPWIDGET"/> <permission name="android.permission.BLUETOOTH_PRIVILEGED"/> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index deffa3a6fea6..c3b0017bead6 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -454,8 +454,8 @@ applications that come with the platform <permission name="android.permission.NEARBY_WIFI_DEVICES" /> <permission name="android.permission.OVERRIDE_WIFI_CONFIG" /> <!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover - P2P external approver API sets require MANAGE_WIFI_AUTO_JOIN permission. --> - <permission name="android.permission.MANAGE_WIFI_AUTO_JOIN" /> + P2P external approver API sets require MANAGE_WIFI_NETWORK_SELECTION permission. --> + <permission name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" /> <!-- Permission required for CTS test CarrierMessagingServiceWrapperTest --> <permission name="android.permission.BIND_CARRIER_SERVICES"/> <!-- Permission required for CTS test - MusicRecognitionManagerTest --> diff --git a/libs/WindowManager/Shell/res/values-land/styles.xml b/libs/WindowManager/Shell/res/values-land/styles.xml index 0ed9368aa067..e89f65bef792 100644 --- a/libs/WindowManager/Shell/res/values-land/styles.xml +++ b/libs/WindowManager/Shell/res/values-land/styles.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="DockedDividerBackground"> - <item name="android:layout_width">10dp</item> + <item name="android:layout_width">@dimen/split_divider_bar_width</item> <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center_horizontal</item> <item name="android:background">@color/split_divider_background</item> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index d0138a488295..d2a1c55d1c29 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -383,23 +383,15 @@ public class BubbleController { mTaskStackListener.addListener(new TaskStackListenerCallback() { @Override public void onTaskMovedToFront(int taskId) { - if (mSysuiProxy == null) { - return; - } - - mSysuiProxy.isNotificationShadeExpand((expand) -> { - mMainExecutor.execute(() -> { - int expandedId = INVALID_TASK_ID; - if (mStackView != null && mStackView.getExpandedBubble() != null - && isStackExpanded() && !mStackView.isExpansionAnimating() - && !expand) { - expandedId = mStackView.getExpandedBubble().getTaskId(); - } - - if (expandedId != INVALID_TASK_ID && expandedId != taskId) { - mBubbleData.setExpanded(false); - } - }); + mMainExecutor.execute(() -> { + int expandedId = INVALID_TASK_ID; + if (mStackView != null && mStackView.getExpandedBubble() != null + && isStackExpanded() && !mStackView.isExpansionAnimating()) { + expandedId = mStackView.getExpandedBubble().getTaskId(); + } + if (expandedId != INVALID_TASK_ID && expandedId != taskId) { + mBubbleData.setExpanded(false); + } }); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index b266189ec262..c1e78251da2b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -18,7 +18,6 @@ package com.android.wm.shell.pip; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.util.RotationUtils.deltaRotation; import static android.util.RotationUtils.rotateBounds; @@ -450,11 +449,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, tx.setWindowCrop(mLeash, destinationBounds.width(), destinationBounds.height()); // We set to fullscreen here for now, but later it will be set to UNDEFINED for // the proper windowing mode to take place. See #applyWindowingModeChangeOnExit. - wct.setActivityWindowingMode(mToken, - direction == TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN - && !requestEnterSplit - ? WINDOWING_MODE_SPLIT_SCREEN_SECONDARY - : WINDOWING_MODE_FULLSCREEN); + wct.setActivityWindowingMode(mToken, WINDOWING_MODE_FULLSCREEN); wct.setBounds(mToken, destinationBounds); wct.setBoundsChangeTransaction(mToken, tx); } diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp index bcfe9c3ecab4..30ca7d155c4c 100644 --- a/libs/hwui/Properties.cpp +++ b/libs/hwui/Properties.cpp @@ -135,7 +135,7 @@ bool Properties::load() { skpCaptureEnabled = debuggingEnabled && base::GetBoolProperty(PROPERTY_CAPTURE_SKP_ENABLED, false); SkAndroidFrameworkTraceUtil::setEnableTracing( - base::GetBoolProperty(PROPERTY_SKIA_ATRACE_ENABLED, false)); + base::GetBoolProperty(PROPERTY_SKIA_ATRACE_ENABLED, true)); runningInEmulator = base::GetBoolProperty(PROPERTY_IS_EMULATOR, false); diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppManager.java b/media/java/android/media/tv/interactive/TvInteractiveAppManager.java index b6db4cfbe910..9eb4a6c393ab 100755 --- a/media/java/android/media/tv/interactive/TvInteractiveAppManager.java +++ b/media/java/android/media/tv/interactive/TvInteractiveAppManager.java @@ -626,6 +626,7 @@ public final class TvInteractiveAppManager { /** * This is called when the state of the interactive app service is changed. * + * @param iAppServiceId The ID of the TV Interactive App service. * @param type the interactive app type * @param state the current state of the service of the given type * @param err the error code for error state. {@link #ERROR_NONE} is used when the state is @@ -815,8 +816,8 @@ public final class TvInteractiveAppManager { * @param executor A {@link Executor} that the status change will be delivered to. */ public void registerCallback( - @NonNull TvInteractiveAppCallback callback, - @CallbackExecutor @NonNull Executor executor) { + @CallbackExecutor @NonNull Executor executor, + @NonNull TvInteractiveAppCallback callback) { Preconditions.checkNotNull(callback); Preconditions.checkNotNull(executor); synchronized (mLock) { diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppService.java b/media/java/android/media/tv/interactive/TvInteractiveAppService.java index bb6edf54a7ff..d22fd83872e1 100755 --- a/media/java/android/media/tv/interactive/TvInteractiveAppService.java +++ b/media/java/android/media/tv/interactive/TvInteractiveAppService.java @@ -16,6 +16,7 @@ package android.media.tv.interactive; +import android.annotation.CallSuper; import android.annotation.MainThread; import android.annotation.NonNull; import android.annotation.Nullable; @@ -351,6 +352,7 @@ public abstract class TvInteractiveAppService extends Service { * @param enable {@code true} if you want to enable the media view. {@code false} * otherwise. */ + @CallSuper public void setMediaViewEnabled(final boolean enable) { mHandler.post(new Runnable() { @Override @@ -467,11 +469,11 @@ public abstract class TvInteractiveAppService extends Service { * in {@link #onSetSurface}. This method is always called at least once, after * {@link #onSetSurface} is called with non-null surface. * - * @param format The new PixelFormat of the surface. + * @param format The new {@link PixelFormat} of the surface. * @param width The new width of the surface. * @param height The new height of the surface. */ - public void onSurfaceChanged(int format, int width, int height) { + public void onSurfaceChanged(@PixelFormat.Format int format, int width, int height) { } /** @@ -631,6 +633,7 @@ public abstract class TvInteractiveAppService extends Service { * @param right Right position in pixels, relative to the overlay view. * @param bottom Bottom position in pixels, relative to the overlay view. */ + @CallSuper public void layoutSurface(final int left, final int top, final int right, final int bottom) { if (left > right || top > bottom) { @@ -659,6 +662,7 @@ public abstract class TvInteractiveAppService extends Service { * Requests broadcast related information from the related TV input. * @param request the request for broadcast info */ + @CallSuper public void requestBroadcastInfo(@NonNull final BroadcastInfoRequest request) { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @@ -683,6 +687,7 @@ public abstract class TvInteractiveAppService extends Service { * Remove broadcast information request from the related TV input. * @param requestId the ID of the request */ + @CallSuper public void removeBroadcastInfo(final int requestId) { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @@ -709,6 +714,7 @@ public abstract class TvInteractiveAppService extends Service { * @param cmdType type of the specific command * @param parameters parameters of the specific command */ + @CallSuper public void sendPlaybackCommandRequest( @PlaybackCommandType @NonNull String cmdType, @Nullable Bundle parameters) { executeOrPostRunnableOnMainThread(new Runnable() { @@ -733,6 +739,7 @@ public abstract class TvInteractiveAppService extends Service { /** * Sets broadcast video bounds. */ + @CallSuper public void setVideoBounds(@NonNull Rect rect) { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @@ -755,6 +762,7 @@ public abstract class TvInteractiveAppService extends Service { /** * Requests the URI of the current channel. */ + @CallSuper public void requestCurrentChannelUri() { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @@ -777,6 +785,7 @@ public abstract class TvInteractiveAppService extends Service { /** * Requests the logic channel number (LCN) of the current channel. */ + @CallSuper public void requestCurrentChannelLcn() { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @@ -799,6 +808,7 @@ public abstract class TvInteractiveAppService extends Service { /** * Requests stream volume. */ + @CallSuper public void requestStreamVolume() { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @@ -821,6 +831,7 @@ public abstract class TvInteractiveAppService extends Service { /** * Requests the list of {@link TvTrackInfo}. */ + @CallSuper public void requestTrackInfoList() { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @@ -845,6 +856,7 @@ public abstract class TvInteractiveAppService extends Service { * * @see android.media.tv.TvInputInfo */ + @CallSuper public void requestCurrentTvInputId() { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @@ -869,6 +881,7 @@ public abstract class TvInteractiveAppService extends Service { * * @param request The advertisement request */ + @CallSuper public void requestAd(@NonNull final AdRequest request) { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @@ -1032,6 +1045,7 @@ public abstract class TvInteractiveAppService extends Service { * used when the state is not * {@link TvInteractiveAppManager#INTERACTIVE_APP_STATE_ERROR}. */ + @CallSuper public void notifySessionStateChanged( @TvInteractiveAppManager.InteractiveAppState int state, @TvInteractiveAppManager.ErrorCode int err) { @@ -1062,6 +1076,7 @@ public abstract class TvInteractiveAppService extends Service { * * @see #onCreateBiInteractiveApp(Uri, Bundle) */ + @CallSuper public final void notifyBiInteractiveAppCreated( @NonNull Uri biIAppUri, @Nullable String biIAppId) { executeOrPostRunnableOnMainThread(new Runnable() { @@ -1087,6 +1102,7 @@ public abstract class TvInteractiveAppService extends Service { * Notifies when the digital teletext app state is changed. * @param state the current state. */ + @CallSuper public final void notifyTeletextAppStateChanged( @TvInteractiveAppManager.TeletextAppState int state) { executeOrPostRunnableOnMainThread(new Runnable() { diff --git a/packages/CompanionDeviceManager/res/drawable/btn_negative_multiple_devices.xml b/packages/CompanionDeviceManager/res/drawable/btn_negative_multiple_devices.xml index 125fee6282d5..ece7bbafc654 100644 --- a/packages/CompanionDeviceManager/res/drawable/btn_negative_multiple_devices.xml +++ b/packages/CompanionDeviceManager/res/drawable/btn_negative_multiple_devices.xml @@ -20,6 +20,6 @@ <corners android:topLeftRadius="16dp" android:topRightRadius="16dp" android:bottomLeftRadius="16dp" android:bottomRightRadius="16dp"/> <stroke - android:width="2dp" + android:width="1dp" android:color="@android:color/system_accent1_600" /> </shape>
\ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/drawable/ic_device_other.xml b/packages/CompanionDeviceManager/res/drawable/ic_device_other.xml new file mode 100644 index 000000000000..f8515c33d57f --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable/ic_device_other.xml @@ -0,0 +1,23 @@ +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path android:fillColor="@android:color/white" + android:pathData="M7,20H4Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20V6H4Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18H7ZM9,20V18.2Q8.55,17.775 8.275,17.225Q8,16.675 8,16Q8,15.325 8.275,14.775Q8.55,14.225 9,13.8V12H13V13.8Q13.45,14.225 13.725,14.775Q14,15.325 14,16Q14,16.675 13.725,17.225Q13.45,17.775 13,18.2V20ZM11,17.5Q11.65,17.5 12.075,17.075Q12.5,16.65 12.5,16Q12.5,15.35 12.075,14.925Q11.65,14.5 11,14.5Q10.35,14.5 9.925,14.925Q9.5,15.35 9.5,16Q9.5,16.65 9.925,17.075Q10.35,17.5 11,17.5ZM21,20H16Q15.575,20 15.288,19.712Q15,19.425 15,19V10Q15,9.575 15.288,9.287Q15.575,9 16,9H21Q21.425,9 21.712,9.287Q22,9.575 22,10V19Q22,19.425 21.712,19.712Q21.425,20 21,20ZM17,18H20V11H17Z"/> +</vector>
\ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/drawable/ic_watch.xml b/packages/CompanionDeviceManager/res/drawable/ic_watch.xml new file mode 100644 index 000000000000..44a40b9fede3 --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable/ic_watch.xml @@ -0,0 +1,25 @@ +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path android:fillColor="@android:color/white" + android:pathData="M9,22 L7.65,17.45Q6.45,16.5 5.725,15.075Q5,13.65 5,12Q5,10.35 5.725,8.925Q6.45,7.5 7.65,6.55L9,2H15L16.35,6.55Q17.55,7.5 18.275,8.925Q19,10.35 19,12Q19,13.65 18.275,15.075Q17.55,16.5 16.35,17.45L15,22ZM12,17Q14.075,17 15.538,15.537Q17,14.075 17,12Q17,9.925 15.538,8.462Q14.075,7 12,7Q9.925,7 8.463,8.462Q7,9.925 7,12Q7,14.075 8.463,15.537Q9.925,17 12,17ZM10.1,5.25Q11.075,4.975 12,4.975Q12.925,4.975 13.9,5.25L13.5,4H10.5ZM10.5,20H13.5L13.9,18.75Q12.925,19.025 12,19.025Q11.075,19.025 10.1,18.75ZM10.1,4H10.5H13.5H13.9Q12.925,4 12,4Q11.075,4 10.1,4ZM10.5,20H10.1Q11.075,20 12,20Q12.925,20 13.9,20H13.5Z"/> +</vector>
\ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml index 9e5b1663ff45..8eec33aeb4ee 100644 --- a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml +++ b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml @@ -20,6 +20,15 @@ <!-- A header for selfManaged devices only. --> <include layout="@layout/vendor_header" /> + <ImageView + android:id="@+id/profile_icon" + android:layout_width="match_parent" + android:layout_height="32dp" + android:gravity="center" + android:layout_marginBottom="12dp" + android:layout_marginTop="1dp" + android:tint="@android:color/system_accent1_600"/> + <!-- Do NOT change the ID of the root LinearLayout above: it's referenced in CTS tests. --> <TextView @@ -28,7 +37,8 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingHorizontal="12dp" - style="@*android:style/TextAppearance.Widget.Toolbar.Title"/> + android:layout_marginBottom="12dp" + style="@*android:style/TextAppearance.Widget.Toolbar.Title" /> <TextView android:id="@+id/summary" @@ -45,11 +55,29 @@ android:layout_height="0dp" android:layout_weight="1"> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/device_list" + <LinearLayout + android:id="@+id/multiple_device_list" android:layout_width="match_parent" - android:scrollbars="vertical" - android:layout_height="200dp" /> + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + + <View + android:id="@+id/border_top" + android:layout_marginTop="12dp" + style="@style/DeviceListBorder" /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/device_list" + android:layout_width="match_parent" + android:scrollbars="vertical" + android:layout_height="200dp" /> + + <View + android:id="@+id/border_bottom" + style="@style/DeviceListBorder" /> + + </LinearLayout> <androidx.recyclerview.widget.RecyclerView android:id="@+id/permission_list" diff --git a/packages/CompanionDeviceManager/res/layout/list_item_device.xml b/packages/CompanionDeviceManager/res/layout/list_item_device.xml index b732b1bd9ad8..3c8a81f4fe83 100644 --- a/packages/CompanionDeviceManager/res/layout/list_item_device.xml +++ b/packages/CompanionDeviceManager/res/layout/list_item_device.xml @@ -28,7 +28,8 @@ android:id="@android:id/icon" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginRight="12dp"/> + android:layout_marginRight="12dp" + android:tint="@android:color/system_accent1_600"/> <TextView android:id="@android:id/text1" diff --git a/packages/CompanionDeviceManager/res/layout/list_item_permission.xml b/packages/CompanionDeviceManager/res/layout/list_item_permission.xml index b8a0f7938f0b..79aa4e7e8927 100644 --- a/packages/CompanionDeviceManager/res/layout/list_item_permission.xml +++ b/packages/CompanionDeviceManager/res/layout/list_item_permission.xml @@ -27,6 +27,7 @@ android:layout_height="24dp" android:layout_marginTop="7dp" android:layout_marginEnd="12dp" + android:tint="@android:color/system_accent1_600" android:contentDescription="Permission Icon"/> <LinearLayout diff --git a/packages/CompanionDeviceManager/res/values/styles.xml b/packages/CompanionDeviceManager/res/values/styles.xml index 4a267db3ceec..6eaffd4c3cfe 100644 --- a/packages/CompanionDeviceManager/res/values/styles.xml +++ b/packages/CompanionDeviceManager/res/values/styles.xml @@ -65,4 +65,10 @@ <item name="android:background">@drawable/btn_negative_multiple_devices</item> </style> + <style name="DeviceListBorder"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">1dp</item> + <item name="android:background">@android:color/system_accent1_300</item> + </style> + </resources>
\ No newline at end of file diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java index 0ab126a7dae0..f752b697c4a5 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java @@ -29,6 +29,7 @@ import static com.android.companiondevicemanager.PermissionListAdapter.TYPE_NOTI import static com.android.companiondevicemanager.PermissionListAdapter.TYPE_STORAGE; import static com.android.companiondevicemanager.Utils.getApplicationLabel; import static com.android.companiondevicemanager.Utils.getHtmlFromResources; +import static com.android.companiondevicemanager.Utils.getIcon; import static com.android.companiondevicemanager.Utils.getVendorHeaderIcon; import static com.android.companiondevicemanager.Utils.getVendorHeaderName; import static com.android.companiondevicemanager.Utils.prepareResultReceiverForIpc; @@ -106,6 +107,9 @@ public class CompanionDeviceActivity extends FragmentActivity implements private TextView mTitle; private TextView mSummary; + // Present for single device and multiple device only. + private ImageView mProfileIcon; + // Only present for selfManaged devices. private ImageView mVendorHeaderImage; private TextView mVendorHeaderName; @@ -119,10 +123,11 @@ public class CompanionDeviceActivity extends FragmentActivity implements // regular. private Button mButtonAllow; private Button mButtonNotAllow; - // Present for multiple devices association requests only. + // Present for multiple device association requests only. private Button mButtonNotAllowMultipleDevices; private LinearLayout mAssociationConfirmationDialog; + private LinearLayout mMultipleDeviceList; private RelativeLayout mVendorHeader; // The recycler view is only shown for multiple-device regular association request, after @@ -130,6 +135,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements private @Nullable RecyclerView mDeviceListRecyclerView; private @Nullable DeviceListAdapter mDeviceAdapter; + // The recycler view is only shown for selfManaged association request. private @Nullable RecyclerView mPermissionListRecyclerView; private @Nullable PermissionListAdapter mPermissionListAdapter; @@ -243,12 +249,15 @@ public class CompanionDeviceActivity extends FragmentActivity implements setContentView(R.layout.activity_confirmation); + mMultipleDeviceList = findViewById(R.id.multiple_device_list); mAssociationConfirmationDialog = findViewById(R.id.activity_confirmation); mVendorHeader = findViewById(R.id.vendor_header); mTitle = findViewById(R.id.title); mSummary = findViewById(R.id.summary); + mProfileIcon = findViewById(R.id.profile_icon); + mVendorHeaderImage = findViewById(R.id.vendor_header_image); mVendorHeaderName = findViewById(R.id.vendor_header_name); mVendorHeaderButton = findViewById(R.id.vendor_header_button); @@ -420,6 +429,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements mVendorHeaderName.setText(vendorName); mDeviceListRecyclerView.setVisibility(View.GONE); + mProfileIcon.setVisibility(View.GONE); mVendorHeader.setVisibility(View.VISIBLE); } @@ -447,17 +457,22 @@ public class CompanionDeviceActivity extends FragmentActivity implements final Spanned title = getHtmlFromResources( this, R.string.confirmation_title, appLabel, deviceName); final Spanned summary; + final Drawable profileIcon; if (deviceProfile == null) { summary = getHtmlFromResources(this, R.string.summary_generic); + profileIcon = getIcon(this, R.drawable.ic_device_other); + mSummary.setVisibility(View.GONE); } else if (deviceProfile.equals(DEVICE_PROFILE_WATCH)) { summary = getHtmlFromResources(this, R.string.summary_watch, appLabel, deviceName); + profileIcon = getIcon(this, R.drawable.ic_watch); } else { throw new RuntimeException("Unsupported profile " + deviceProfile); } mTitle.setText(title); mSummary.setText(summary); + mProfileIcon.setImageDrawable(profileIcon); } private void initUiForMultipleDevices(CharSequence appLabel) { @@ -467,12 +482,16 @@ public class CompanionDeviceActivity extends FragmentActivity implements final String profileName; final Spanned summary; + final Drawable profileIcon; if (deviceProfile == null) { profileName = getString(R.string.profile_name_generic); summary = getHtmlFromResources(this, R.string.summary_generic); + profileIcon = getIcon(this, R.drawable.ic_device_other); + mSummary.setVisibility(View.GONE); } else if (deviceProfile.equals(DEVICE_PROFILE_WATCH)) { profileName = getString(R.string.profile_name_watch); summary = getHtmlFromResources(this, R.string.summary_watch, appLabel); + profileIcon = getIcon(this, R.drawable.ic_watch); } else { throw new RuntimeException("Unsupported profile " + deviceProfile); } @@ -481,6 +500,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements mTitle.setText(title); mSummary.setText(summary); + mProfileIcon.setImageDrawable(profileIcon); mDeviceAdapter = new DeviceListAdapter(this, this::onListItemClick); @@ -496,6 +516,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements mButtonAllow.setVisibility(View.GONE); mButtonNotAllow.setVisibility(View.GONE); mButtonNotAllowMultipleDevices.setVisibility(View.VISIBLE); + mMultipleDeviceList.setVisibility(View.VISIBLE); } private void onListItemClick(int position) { diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java index d5b2f0a748f1..1852e82cb9f9 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.ApplicationInfoFlags; -import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; @@ -124,7 +123,6 @@ class Utils { static @NonNull Drawable getIcon(@NonNull Context context, int resId) { Drawable icon = context.getResources().getDrawable(resId, null); - icon.setTint(Color.DKGRAY); return icon; } diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java index 735c44d5c87e..e385b33447f0 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java @@ -36,6 +36,7 @@ import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRation import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.net.NetworkStats.State; import android.net.NetworkStatsHistory.Entry; import android.os.Binder; import android.service.NetworkStatsCollectionKeyProto; @@ -102,7 +103,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W private ArrayMap<Key, NetworkStatsHistory> mStats = new ArrayMap<>(); - private final long mBucketDuration; + private final long mBucketDurationMillis; private long mStartMillis; private long mEndMillis; @@ -115,8 +116,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W * @param bucketDuration duration of the buckets in this object, in milliseconds. * @hide */ - public NetworkStatsCollection(long bucketDuration) { - mBucketDuration = bucketDuration; + public NetworkStatsCollection(long bucketDurationMillis) { + mBucketDurationMillis = bucketDurationMillis; reset(); } @@ -148,7 +149,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W if (mStartMillis == Long.MAX_VALUE) { return Long.MAX_VALUE; } else { - return mStartMillis + mBucketDuration; + return mStartMillis + mBucketDurationMillis; } } @@ -184,10 +185,10 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W || time == SubscriptionPlan.TIME_UNKNOWN) { return time; } else { - final long mod = time % mBucketDuration; + final long mod = time % mBucketDurationMillis; if (mod > 0) { time -= mod; - time += mBucketDuration; + time += mBucketDurationMillis; } return time; } @@ -200,7 +201,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W || time == SubscriptionPlan.TIME_UNKNOWN) { return time; } else { - final long mod = time % mBucketDuration; + final long mod = time % mBucketDurationMillis; if (mod > 0) { time -= mod; } @@ -247,10 +248,10 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W // 180 days of history should be enough for anyone; if we end up needing // more, we'll dynamically grow the history object. final int bucketEstimate = (int) NetworkStatsUtils.constrain( - ((end - start) / mBucketDuration), 0, - (180 * DateUtils.DAY_IN_MILLIS) / mBucketDuration); + ((end - start) / mBucketDurationMillis), 0, + (180 * DateUtils.DAY_IN_MILLIS) / mBucketDurationMillis); final NetworkStatsHistory combined = new NetworkStatsHistory( - mBucketDuration, bucketEstimate, fields); + mBucketDurationMillis, bucketEstimate, fields); // shortcut when we know stats will be empty if (start == end) return combined; @@ -343,7 +344,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W // Finally we can slice data as originally requested final NetworkStatsHistory sliced = new NetworkStatsHistory( - mBucketDuration, bucketEstimate, fields); + mBucketDurationMillis, bucketEstimate, fields); sliced.recordHistory(combined, start, end); return sliced; } else { @@ -458,9 +459,9 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W // update when no existing, or when bucket duration changed NetworkStatsHistory updated = null; if (existing == null) { - updated = new NetworkStatsHistory(mBucketDuration, 10); - } else if (existing.getBucketDuration() != mBucketDuration) { - updated = new NetworkStatsHistory(existing, mBucketDuration); + updated = new NetworkStatsHistory(mBucketDurationMillis, 10); + } else if (existing.getBucketDuration() != mBucketDurationMillis) { + updated = new NetworkStatsHistory(existing, mBucketDurationMillis); } if (updated != null) { @@ -702,7 +703,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W private int estimateBuckets() { return (int) (Math.min(mEndMillis - mStartMillis, WEEK_IN_MILLIS * 5) - / mBucketDuration); + / mBucketDurationMillis); } private ArrayList<Key> getSortedKeys() { @@ -828,7 +829,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W * Builder class for {@link NetworkStatsCollection}. */ public static final class Builder { - private final long mBucketDuration; + private final long mBucketDurationMillis; private final ArrayMap<Key, NetworkStatsHistory> mEntries = new ArrayMap<>(); /** @@ -836,8 +837,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W * * @param bucketDuration Duration of the buckets of the object, in milliseconds. */ - public Builder(long bucketDuration) { - mBucketDuration = bucketDuration; + public Builder(long bucketDurationMillis) { + mBucketDurationMillis = bucketDurationMillis; } /** @@ -855,7 +856,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W final List<Entry> historyEntries = history.getEntries(); final NetworkStatsHistory.Builder historyBuilder = - new NetworkStatsHistory.Builder(mBucketDuration, historyEntries.size()); + new NetworkStatsHistory.Builder(mBucketDurationMillis, historyEntries.size()); for (Entry entry : historyEntries) { historyBuilder.addEntry(entry); } @@ -871,7 +872,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W */ @NonNull public NetworkStatsCollection build() { - final NetworkStatsCollection collection = new NetworkStatsCollection(mBucketDuration); + final NetworkStatsCollection collection = + new NetworkStatsCollection(mBucketDurationMillis); for (int i = 0; i < mEntries.size(); i++) { collection.recordHistory(mEntries.keyAt(i), mEntries.valueAt(i)); } @@ -883,7 +885,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W * the identifier that associate with the {@link NetworkStatsHistory} object to identify * a certain record in the {@link NetworkStatsCollection} object. */ - public static class Key { + public static final class Key { /** @hide */ public final NetworkIdentitySet ident; /** @hide */ @@ -903,7 +905,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W * @param set Set of the record, see {@code NetworkStats#SET_*}. * @param tag Tag of the record, see {@link TrafficStats#setThreadStatsTag(int)}. */ - public Key(@NonNull Set<NetworkIdentity> ident, int uid, int set, int tag) { + public Key(@NonNull Set<NetworkIdentity> ident, int uid, @State int set, int tag) { this(new NetworkIdentitySet(Objects.requireNonNull(ident)), uid, set, tag); } diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 042fef23cbe6..bd703963fa43 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1293,6 +1293,8 @@ <string name="cancel">Cancel</string> <!-- Button label for generic OK action [CHAR LIMIT=20] --> <string name="okay">OK</string> + <!-- Button label for generic Done action, to be pressed when an action has been completed [CHAR LIMIT=20] --> + <string name="done">Done</string> <!-- Label for the settings activity for controlling apps that can schedule alarms [CHAR LIMIT=30] --> <string name="alarms_and_reminders_label">Alarms and reminders</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java b/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java index 75bb70a123c3..8a1e91b4dcd8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java @@ -106,13 +106,13 @@ public class AvatarPickerActivity extends Activity { FooterButton secondaryButton = new FooterButton.Builder(this) - .setText("Cancel") + .setText(getString(android.R.string.cancel)) .setListener(view -> cancel()) .build(); mDoneButton = new FooterButton.Builder(this) - .setText("Done") + .setText(getString(R.string.done)) .setListener(view -> mAdapter.returnSelectionResult()) .build(); mDoneButton.setEnabled(false); diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index dae63a8b0e3c..e7765e6d01e9 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -538,8 +538,8 @@ <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" /> <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" /> <!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover - P2P external approver API sets require MANAGE_WIFI_AUTO_JOIN permission. --> - <uses-permission android:name="android.permission.MANAGE_WIFI_AUTO_JOIN" /> + P2P external approver API sets require MANAGE_WIFI_NETWORK_SELECTION permission. --> + <uses-permission android:name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" /> <!-- Permission required for CTS tests to enable/disable rate limiting toasts. --> <uses-permission android:name="android.permission.MANAGE_TOAST_RATE_LIMITING" /> @@ -668,6 +668,9 @@ <!-- Permission required for CTS test - CtsTelephonyTestCases --> <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE" /> + <!-- Permission required for CTS test - CtsAppEnumerationTestCases --> + <uses-permission android:name="android.permission.MAKE_UID_VISIBLE" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" diff --git a/packages/SystemUI/res/layout/media_output_list_item.xml b/packages/SystemUI/res/layout/media_output_list_item.xml index 806804f2fc47..eeb37c7b062d 100644 --- a/packages/SystemUI/res/layout/media_output_list_item.xml +++ b/packages/SystemUI/res/layout/media_output_list_item.xml @@ -62,20 +62,22 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical|start" android:layout_marginStart="56dp" + android:layout_marginEnd="56dp" android:ellipsize="end" android:maxLines="1" android:fontFamily="@*android:string/config_headlineFontFamilyMedium" android:textSize="16sp"/> - <RelativeLayout + <LinearLayout android:id="@+id/two_line_layout" + android:orientation="vertical" android:layout_width="wrap_content" android:layout_gravity="center_vertical|start" android:layout_height="48dp" + android:layout_marginEnd="56dp" android:layout_marginStart="56dp"> <TextView android:id="@+id/two_line_title" - android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" @@ -85,18 +87,15 @@ android:textSize="16sp"/> <TextView android:id="@+id/subtitle" - android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_alignParentBottom="true" android:ellipsize="end" android:maxLines="1" android:textColor="@color/media_dialog_inactive_item_main_content" android:textSize="14sp" android:fontFamily="@*android:string/config_bodyFontFamily" android:visibility="gone"/> - </RelativeLayout> + </LinearLayout> <ProgressBar android:id="@+id/volume_indeterminate_progress" diff --git a/packages/SystemUI/res/layout/ongoing_privacy_chip.xml b/packages/SystemUI/res/layout/ongoing_privacy_chip.xml index 812277634d09..ad2bc79a5c96 100644 --- a/packages/SystemUI/res/layout/ongoing_privacy_chip.xml +++ b/packages/SystemUI/res/layout/ongoing_privacy_chip.xml @@ -22,7 +22,10 @@ android:layout_height="match_parent" android:layout_width="wrap_content" android:layout_gravity="center_vertical|end" - android:focusable="true" > + android:focusable="true" + android:clipChildren="false" + android:clipToPadding="false" + > <LinearLayout android:id="@+id/icons_container" @@ -34,5 +37,7 @@ android:layout_gravity="center" android:minWidth="@dimen/ongoing_appops_chip_min_width" android:maxWidth="@dimen/ongoing_appops_chip_max_width" + android:clipChildren="false" + android:clipToPadding="false" /> </com.android.systemui.privacy.OngoingPrivacyChip>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/system_event_animation_window.xml b/packages/SystemUI/res/layout/system_event_animation_window.xml index c92dec9dd643..e6868b34df02 100644 --- a/packages/SystemUI/res/layout/system_event_animation_window.xml +++ b/packages/SystemUI/res/layout/system_event_animation_window.xml @@ -19,17 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_vertical|end" - android:paddingTop="@dimen/status_bar_padding_top" - android:paddingEnd="8dp" + android:clipChildren="false" + android:clipToPadding="false" > - - <ImageView - android:id="@+id/dot_view" - android:layout_width="10dp" - android:layout_height="10dp" - android:layout_gravity="center_vertical|end" - android:src="@drawable/system_animation_ongoing_dot" - android:visibility="invisible" - /> - </FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/values-land/styles.xml b/packages/SystemUI/res/values-land/styles.xml index f3d83645a8e0..89191984b9e8 100644 --- a/packages/SystemUI/res/values-land/styles.xml +++ b/packages/SystemUI/res/values-land/styles.xml @@ -18,15 +18,4 @@ <style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer"> <item name="android:layout_width">360dp</item> </style> - - <style name="DockedDividerBackground"> - <item name="android:layout_width">10dp</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">center_horizontal</item> - </style> - - <style name="DockedDividerMinimizedShadow"> - <item name="android:layout_width">8dp</item> - <item name="android:layout_height">match_parent</item> - </style> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 9f2f1c1978c6..d230f33f4939 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1193,10 +1193,7 @@ <string name="wallet_lockscreen_settings_label">Lock screen settings</string> <!-- QR Code Scanner label, title [CHAR LIMIT=32] --> - <string name="qr_code_scanner_title">QR code</string> - - <!-- QR Code Scanner description [CHAR LIMIT=NONE] --> - <string name="qr_code_scanner_description">Tap to scan</string> + <string name="qr_code_scanner_title">Scan QR code</string> <!-- Name of the work status bar icon. --> <string name="status_bar_work">Work profile</string> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java index db62f88325dc..e38d2bad11b3 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java @@ -17,36 +17,22 @@ package com.android.systemui.shared.system; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import android.app.ActivityOptions; import android.content.Context; import android.os.Handler; -import com.android.systemui.shared.recents.model.Task; - /** * Wrapper around internal ActivityOptions creation. */ public abstract class ActivityOptionsCompat { /** + * @Deprecated * @return ActivityOptions for starting a task in split screen as the primary window. */ public static ActivityOptions makeSplitScreenOptions(boolean dockTopLeft) { - return makeSplitScreenOptions(dockTopLeft, true); - } - - /** - * @return ActivityOptions for starting a task in split screen. - */ - public static ActivityOptions makeSplitScreenOptions(boolean dockTopLeft, boolean isPrimary) { - final ActivityOptions options = ActivityOptions.makeBasic(); - options.setLaunchWindowingMode(isPrimary - ? WINDOWING_MODE_SPLIT_SCREEN_PRIMARY - : WINDOWING_MODE_SPLIT_SCREEN_SECONDARY); - return options; + return ActivityOptions.makeBasic(); } /** diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java index 85d5de0ea4f6..32299f5643db 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java @@ -78,10 +78,6 @@ public class WindowManagerWrapper { public static final int WINDOWING_MODE_MULTI_WINDOW = WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; - public static final int WINDOWING_MODE_SPLIT_SCREEN_PRIMARY = - WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; - public static final int WINDOWING_MODE_SPLIT_SCREEN_SECONDARY = - WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; public static final int WINDOWING_MODE_FREEFORM = WindowConfiguration.WINDOWING_MODE_FREEFORM; public static final int ITYPE_EXTRA_NAVIGATION_BAR = InsetsState.ITYPE_EXTRA_NAVIGATION_BAR; diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaHost.kt b/packages/SystemUI/src/com/android/systemui/media/MediaHost.kt index 0a4b68b501f7..eb209f723cb5 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaHost.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaHost.kt @@ -192,6 +192,14 @@ class MediaHost constructor( } } + override var squishFraction: Float = 1.0f + set(value) { + if (!value.equals(field)) { + field = value + changedListener?.invoke() + } + } + override var showsOnlyActiveMedia: Boolean = false set(value) { if (!value.equals(field)) { @@ -242,6 +250,7 @@ class MediaHost constructor( override fun copy(): MediaHostState { val mediaHostState = MediaHostStateHolder() mediaHostState.expansion = expansion + mediaHostState.squishFraction = squishFraction mediaHostState.showsOnlyActiveMedia = showsOnlyActiveMedia mediaHostState.measurementInput = measurementInput?.copy() mediaHostState.visible = visible @@ -260,6 +269,9 @@ class MediaHost constructor( if (expansion != other.expansion) { return false } + if (squishFraction != other.squishFraction) { + return false + } if (showsOnlyActiveMedia != other.showsOnlyActiveMedia) { return false } @@ -278,6 +290,7 @@ class MediaHost constructor( override fun hashCode(): Int { var result = measurementInput?.hashCode() ?: 0 result = 31 * result + expansion.hashCode() + result = 31 * result + squishFraction.hashCode() result = 31 * result + falsingProtectionNeeded.hashCode() result = 31 * result + showsOnlyActiveMedia.hashCode() result = 31 * result + if (visible) 1 else 2 @@ -318,6 +331,11 @@ interface MediaHostState { var expansion: Float /** + * Fraction of the height animation. + */ + var squishFraction: Float + + /** * Is this host only showing active media or is it showing all of them including resumption? */ var showsOnlyActiveMedia: Boolean diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt index 591aad1014bd..a60016b23a7c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt @@ -18,13 +18,11 @@ package com.android.systemui.media import android.content.Context import android.content.res.Configuration +import androidx.annotation.VisibleForTesting import androidx.constraintlayout.widget.ConstraintSet import com.android.systemui.R import com.android.systemui.statusbar.policy.ConfigurationController -import com.android.systemui.util.animation.MeasurementOutput -import com.android.systemui.util.animation.TransitionLayout -import com.android.systemui.util.animation.TransitionLayoutController -import com.android.systemui.util.animation.TransitionViewState +import com.android.systemui.util.animation.* import javax.inject.Inject /** @@ -270,7 +268,6 @@ class MediaViewController @Inject constructor( TYPE.PLAYER_SESSION -> PlayerSessionViewHolder.gutsIds TYPE.RECOMMENDATION -> RecommendationViewHolder.gutsIds } - controlsIds.forEach { id -> viewState.widgetStates.get(id)?.let { state -> // Make sure to use the unmodified state if guts are not visible. @@ -282,59 +279,79 @@ class MediaViewController @Inject constructor( viewState.widgetStates.get(id)?.alpha = if (isGutsVisible) 1f else 0f viewState.widgetStates.get(id)?.gone = !isGutsVisible } - if (shouldHideGutsSettings) { viewState.widgetStates.get(R.id.settings)?.gone = true } } /** + * Apply squishFraction to a copy of viewState such that the cached version is untouched. + */ + private fun squishViewState(viewState: TransitionViewState, + squishFraction: Float): TransitionViewState { + val squishedViewState = viewState.copy() + squishedViewState.height = (squishedViewState.height * squishFraction).toInt() + val albumArtViewState = viewState.widgetStates.get(R.id.album_art) + if (albumArtViewState != null) { + albumArtViewState.height = squishedViewState.height + } + return squishedViewState; + } + + /** * Obtain a new viewState for a given media state. This usually returns a cached state, but if * it's not available, it will recreate one by measuring, which may be expensive. */ - private fun obtainViewState(state: MediaHostState?): TransitionViewState? { + @VisibleForTesting + public fun obtainViewState(state: MediaHostState?): TransitionViewState? { if (state == null || state.measurementInput == null) { return null } // Only a subset of the state is relevant to get a valid viewState. Let's get the cachekey var cacheKey = getKey(state, isGutsVisible, tmpKey) val viewState = viewStates[cacheKey] + if (viewState != null) { // we already have cached this measurement, let's continue + if (state.squishFraction < 1f) { + return squishViewState(viewState, state.squishFraction); + } return viewState } // Copy the key since this might call recursively into it and we're using tmpKey cacheKey = cacheKey.copy() val result: TransitionViewState? - if (transitionLayout != null) { - // Let's create a new measurement - if (state.expansion == 0.0f || state.expansion == 1.0f) { - result = transitionLayout!!.calculateViewState( - state.measurementInput!!, - constraintSetForExpansion(state.expansion), - TransitionViewState()) - - setGutsViewState(result) - // We don't want to cache interpolated or null states as this could quickly fill up - // our cache. We only cache the start and the end states since the interpolation - // is cheap - viewStates[cacheKey] = result - } else { - // This is an interpolated state - val startState = state.copy().also { it.expansion = 0.0f } - - // Given that we have a measurement and a view, let's get (guaranteed) viewstates - // from the start and end state and interpolate them - val startViewState = obtainViewState(startState) as TransitionViewState - val endState = state.copy().also { it.expansion = 1.0f } - val endViewState = obtainViewState(endState) as TransitionViewState - result = layoutController.getInterpolatedState( - startViewState, - endViewState, - state.expansion) - } + if (transitionLayout == null) { + return null + } + // Not cached. Let's create a new measurement + if (state.expansion == 0.0f || state.expansion == 1.0f) { + result = transitionLayout!!.calculateViewState( + state.measurementInput!!, + constraintSetForExpansion(state.expansion), + TransitionViewState()) + // We don't want to cache interpolated or null states as this could quickly fill up + // our cache. We only cache the start and the end states since the interpolation + // is cheap + setGutsViewState(result) + viewStates[cacheKey] = result } else { - result = null + // This is an interpolated state + val startState = state.copy().also { it.expansion = 0.0f } + + // Given that we have a measurement and a view, let's get (guaranteed) viewstates + // from the start and end state and interpolate them + val startViewState = obtainViewState(startState) as TransitionViewState + val endState = state.copy().also { it.expansion = 1.0f } + + val endViewState = obtainViewState(endState) as TransitionViewState + result = layoutController.getInterpolatedState( + startViewState, + endViewState, + state.expansion) + } + if (state.squishFraction < 1f) { + return squishViewState(result, state.squishFraction); } return result } diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java index c96aca37987b..62d5c8e51005 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java @@ -34,7 +34,6 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; -import android.widget.RelativeLayout; import android.widget.SeekBar; import android.widget.TextView; @@ -129,7 +128,7 @@ public abstract class MediaOutputBaseAdapter extends final ImageView mTitleIcon; final ProgressBar mProgressBar; final SeekBar mSeekBar; - final RelativeLayout mTwoLineLayout; + final LinearLayout mTwoLineLayout; final ImageView mStatusIcon; final CheckBox mCheckBox; private String mDeviceId; diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java index ec6094dd9973..086cca1c2163 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java @@ -47,6 +47,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; +import static com.android.systemui.shared.system.QuickStepContract.isGesturalMode; import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT; import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT; import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE; @@ -61,7 +62,6 @@ import android.app.ActivityTaskManager; import android.app.IActivityTaskManager; import android.app.StatusBarManager; import android.content.BroadcastReceiver; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -107,13 +107,15 @@ import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.LatencyTracker; import com.android.internal.view.AppearanceRegion; +import com.android.systemui.Gefingerpoken; import com.android.systemui.R; -import com.android.systemui.accessibility.AccessibilityButtonModeObserver; import com.android.systemui.assist.AssistManager; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.model.SysUiState; +import com.android.systemui.navigationbar.NavigationModeController.ModeChangedListener; import com.android.systemui.navigationbar.buttons.ButtonDispatcher; +import com.android.systemui.navigationbar.buttons.DeadZone; import com.android.systemui.navigationbar.buttons.KeyButtonView; import com.android.systemui.navigationbar.buttons.RotationContextButton; import com.android.systemui.navigationbar.gestural.QuickswitchOrientedNavHandle; @@ -125,6 +127,7 @@ import com.android.systemui.shared.rotation.RotationButton; import com.android.systemui.shared.rotation.RotationButtonController; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; +import com.android.systemui.shared.system.SysUiStatsLog; import com.android.systemui.statusbar.AutoHideUiElement; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue.Callbacks; @@ -146,15 +149,15 @@ import java.util.Locale; import java.util.Optional; import java.util.function.Consumer; -import javax.inject.Inject; - import dagger.Lazy; +import dagger.assisted.Assisted; +import dagger.assisted.AssistedFactory; +import dagger.assisted.AssistedInject; /** * Contains logic for a navigation bar view. */ -public class NavigationBar implements View.OnAttachStateChangeListener, - Callbacks, NavigationModeController.ModeChangedListener { +public class NavigationBar implements View.OnAttachStateChangeListener, Callbacks { public static final String TAG = "NavigationBar"; private static final boolean DEBUG = false; @@ -181,7 +184,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, private final NotificationRemoteInputManager mNotificationRemoteInputManager; private final OverviewProxyService mOverviewProxyService; private final NavigationModeController mNavigationModeController; - private final AccessibilityButtonModeObserver mAccessibilityButtonModeObserver; private final BroadcastDispatcher mBroadcastDispatcher; private final CommandQueue mCommandQueue; private final Optional<Pip> mPipOptional; @@ -200,8 +202,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, private @WindowVisibleState int mNavigationBarWindowState = WINDOW_STATE_SHOWING; private int mNavigationIconHints = 0; - private @TransitionMode int mNavigationBarMode; - private ContentResolver mContentResolver; + private @TransitionMode int mTransitionMode; private boolean mLongPressHomeEnabled; private int mDisabledFlags1; @@ -255,7 +256,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, private int mCurrentRotation; private ViewTreeObserver.OnGlobalLayoutListener mOrientationHandleGlobalLayoutListener; private boolean mShowOrientedHandleForImmersiveMode; - + private DeadZone mDeadZone; + private boolean mImeVisible; @com.android.internal.annotations.VisibleForTesting public enum NavBarActionEvent implements UiEventLogger.UiEventEnum { @@ -471,7 +473,9 @@ public class NavigationBar implements View.OnAttachStateChangeListener, } }; - private NavigationBar(Context context, + @AssistedInject + NavigationBar( + @Assisted Context context, WindowManager windowManager, Lazy<AssistManager> assistManagerLazy, AccessibilityManager accessibilityManager, @@ -479,7 +483,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, MetricsLogger metricsLogger, OverviewProxyService overviewProxyService, NavigationModeController navigationModeController, - AccessibilityButtonModeObserver accessibilityButtonModeObserver, StatusBarStateController statusBarStateController, SysUiState sysUiFlagsContainer, BroadcastDispatcher broadcastDispatcher, @@ -514,7 +517,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, mNotificationRemoteInputManager = notificationRemoteInputManager; mOverviewProxyService = overviewProxyService; mNavigationModeController = navigationModeController; - mAccessibilityButtonModeObserver = accessibilityButtonModeObserver; mBroadcastDispatcher = broadcastDispatcher; mCommandQueue = commandQueue; mPipOptional = pipOptional; @@ -532,7 +534,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, mTelecomManagerOptional = telecomManagerOptional; mInputMethodManager = inputMethodManager; - mNavBarMode = mNavigationModeController.addListener(this); + mNavBarMode = mNavigationModeController.addListener(mModeChangedListener); } public NavigationBarView getView() { @@ -546,6 +548,11 @@ public class NavigationBar implements View.OnAttachStateChangeListener, R.layout.navigation_bar, mFrame); barView.addOnAttachStateChangeListener(this); mNavigationBarView = barView.findViewById(R.id.navigation_bar_view); + mDeadZone = new DeadZone(mNavigationBarView); + mNavigationBarView.setTouchHandler(mTouchHandler); + mNavigationBarView.setNavBarMode(mNavBarMode); + + mNavigationBarView.updateRotationButton(); mNavigationBarView.setVisibility(initialVisibility ? View.VISIBLE : View.INVISIBLE); @@ -558,7 +565,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, mCommandQueue.addCallback(this); mLongPressHomeEnabled = mNavBarHelper.getLongPressHomeEnabled(); - mContentResolver = mContext.getContentResolver(); mNavBarHelper.init(); mAllowForceNavBarHandleOpaque = mContext.getResources().getBoolean( R.bool.allow_force_nav_bar_handle_opaque); @@ -597,7 +603,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, setAutoHideController(/* autoHideController */ null); mCommandQueue.removeCallback(this); mWindowManager.removeViewImmediate(mNavigationBarView.getRootView()); - mNavigationModeController.removeListener(this); + mNavigationModeController.removeListener(mModeChangedListener); mNavBarHelper.removeNavTaskStateUpdater(mNavbarTaskbarStateUpdater); mNavBarHelper.destroy(); @@ -612,15 +618,16 @@ public class NavigationBar implements View.OnAttachStateChangeListener, final Display display = v.getDisplay(); mNavigationBarView.setComponents(mRecentsOptional); mNavigationBarView.setComponents(mCentralSurfacesOptionalLazy.get().get().getPanelController()); - mNavigationBarView.setDisabledFlags(mDisabledFlags1); + mNavigationBarView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer); mNavigationBarView.setOnVerticalChangedListener(this::onVerticalChanged); mNavigationBarView.setOnTouchListener(this::onNavigationTouch); if (mSavedState != null) { mNavigationBarView.getLightTransitionsController().restoreState(mSavedState); } - mNavigationBarView.setNavigationIconHints(mNavigationIconHints); + setNavigationIconHints(mNavigationIconHints); mNavigationBarView.setWindowVisible(isNavBarWindowVisible()); mNavigationBarView.setBehavior(mBehavior); + mNavigationBarView.setNavBarMode(mNavBarMode); mNavBarHelper.registerNavTaskStateUpdater(mNavbarTaskbarStateUpdater); @@ -865,8 +872,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, pw.println(" mLongPressHomeEnabled=" + mLongPressHomeEnabled); pw.println(" mNavigationBarWindowState=" + windowStateToString(mNavigationBarWindowState)); - pw.println(" mNavigationBarMode=" - + BarTransitions.modeToString(mNavigationBarMode)); + pw.println(" mTransitionMode=" + + BarTransitions.modeToString(mTransitionMode)); pw.println(" mTransientShown=" + mTransientShown); pw.println(" mTransientShownFromGestureOnSystemBar=" + mTransientShownFromGestureOnSystemBar); @@ -888,11 +895,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, imeShown, showImeSwitcher); if (hints == mNavigationIconHints) return; - mNavigationIconHints = hints; - if (!isTablet(mContext)) { - // All IME functions handled by launcher via Sysui flags for large screen - mNavigationBarView.setNavigationIconHints(hints); - } + setNavigationIconHints(hints); checkBarModes(); updateSystemUiStateFlags(); } @@ -952,15 +955,15 @@ public class NavigationBar implements View.OnAttachStateChangeListener, /** Restores the appearance and the transient saved state to {@link NavigationBar}. */ public void restoreAppearanceAndTransientState() { - final int barMode = barMode(mTransientShown, mAppearance); - mNavigationBarMode = barMode; + final int transitionMode = transitionMode(mTransientShown, mAppearance); + mTransitionMode = transitionMode; checkNavBarModes(); if (mAutoHideController != null) { mAutoHideController.touchAutoHide(); } if (mLightBarController != null) { mLightBarController.onNavigationBarAppearanceChanged(mAppearance, - true /* nbModeChanged */, barMode, false /* navbarColorManagedByIme */); + true /* nbModeChanged */, transitionMode, false /* navbarColorManagedByIme */); } } @@ -974,11 +977,11 @@ public class NavigationBar implements View.OnAttachStateChangeListener, boolean nbModeChanged = false; if (mAppearance != appearance) { mAppearance = appearance; - nbModeChanged = updateBarMode(barMode(mTransientShown, appearance)); + nbModeChanged = updateTransitionMode(transitionMode(mTransientShown, appearance)); } if (mLightBarController != null) { mLightBarController.onNavigationBarAppearanceChanged(appearance, nbModeChanged, - mNavigationBarMode, navbarColorManagedByIme); + mTransitionMode, navbarColorManagedByIme); } if (mBehavior != behavior) { mBehavior = behavior; @@ -1025,16 +1028,16 @@ public class NavigationBar implements View.OnAttachStateChangeListener, private void handleTransientChanged() { mNavigationBarView.onTransientStateChanged(mTransientShown, mTransientShownFromGestureOnSystemBar); - final int barMode = barMode(mTransientShown, mAppearance); - if (updateBarMode(barMode) && mLightBarController != null) { - mLightBarController.onNavigationBarModeChanged(barMode); + final int transitionMode = transitionMode(mTransientShown, mAppearance); + if (updateTransitionMode(transitionMode) && mLightBarController != null) { + mLightBarController.onNavigationBarModeChanged(transitionMode); } } // Returns true if the bar mode is changed. - private boolean updateBarMode(int barMode) { - if (mNavigationBarMode != barMode) { - mNavigationBarMode = barMode; + private boolean updateTransitionMode(int barMode) { + if (mTransitionMode != barMode) { + mTransitionMode = barMode; checkNavBarModes(); if (mAutoHideController != null) { mAutoHideController.touchAutoHide(); @@ -1044,7 +1047,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, return false; } - private static @TransitionMode int barMode(boolean isTransient, int appearance) { + private static @TransitionMode int transitionMode(boolean isTransient, int appearance) { final int lightsOutOpaque = APPEARANCE_LOW_PROFILE_BARS | APPEARANCE_OPAQUE_NAVIGATION_BARS; if (isTransient) { return MODE_SEMI_TRANSPARENT; @@ -1073,7 +1076,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, | StatusBarManager.DISABLE_SEARCH); if (masked != mDisabledFlags1) { mDisabledFlags1 = masked; - mNavigationBarView.setDisabledFlags(state1); + mNavigationBarView.setDisabledFlags(state1, mSysUiFlagsContainer); updateScreenPinningGestures(); } @@ -1455,24 +1458,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, mCentralSurfacesOptionalLazy.get().map(CentralSurfaces::isDeviceInteractive) .orElse(false) && mNavigationBarWindowState != WINDOW_STATE_HIDDEN; - mNavigationBarView.getBarTransitions().transitionTo(mNavigationBarMode, anim); - } - - @Override - public void onNavigationModeChanged(int mode) { - mNavBarMode = mode; - - if (!QuickStepContract.isGesturalMode(mode)) { - // Reset the override alpha - if (getBarTransitions() != null) { - getBarTransitions().setBackgroundOverrideAlpha(1f); - } - } - updateScreenPinningGestures(); - - if (!canShowSecondaryHandle()) { - resetSecondaryHandle(); - } + mNavigationBarView.getBarTransitions().transitionTo(mTransitionMode, anim); } public void disableAnimationsDuringHide(long delay) { @@ -1613,114 +1599,102 @@ public class NavigationBar implements View.OnAttachStateChangeListener, return mNavigationIconHints; } + private void setNavigationIconHints(int hints) { + if (hints == mNavigationIconHints) return; + if (!isTablet(mContext)) { + // All IME functions handled by launcher via Sysui flags for large screen + final boolean newBackAlt = (hints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0; + final boolean oldBackAlt = + (mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0; + if (newBackAlt != oldBackAlt) { + mNavigationBarView.onImeVisibilityChanged(newBackAlt); + mImeVisible = newBackAlt; + } + + mNavigationBarView.setNavigationIconHints(hints); + } + if (DEBUG) { + android.widget.Toast.makeText(mContext, + "Navigation icon hints = " + hints, + 500).show(); + } + mNavigationIconHints = hints; + } + + private final ModeChangedListener mModeChangedListener = new ModeChangedListener() { + @Override + public void onNavigationModeChanged(int mode) { + mNavBarMode = mode; + + if (!QuickStepContract.isGesturalMode(mode)) { + // Reset the override alpha + if (getBarTransitions() != null) { + getBarTransitions().setBackgroundOverrideAlpha(1f); + } + } + updateScreenPinningGestures(); + + if (!canShowSecondaryHandle()) { + resetSecondaryHandle(); + } + if (mNavigationBarView != null) { + mNavigationBarView.setNavBarMode(mode); + } + } + }; + + private final Gefingerpoken mTouchHandler = new Gefingerpoken() { + private boolean mDeadZoneConsuming; + + @Override + public boolean onInterceptTouchEvent(MotionEvent ev) { + if (isGesturalMode(mNavBarMode) && mImeVisible + && ev.getAction() == MotionEvent.ACTION_DOWN) { + SysUiStatsLog.write(SysUiStatsLog.IME_TOUCH_REPORTED, + (int) ev.getX(), (int) ev.getY()); + } + return shouldDeadZoneConsumeTouchEvents(ev); + } + + @Override + public boolean onTouchEvent(MotionEvent ev) { + shouldDeadZoneConsumeTouchEvents(ev); + return false; + } + + private boolean shouldDeadZoneConsumeTouchEvents(MotionEvent event) { + int action = event.getActionMasked(); + if (action == MotionEvent.ACTION_DOWN) { + mDeadZoneConsuming = false; + } + if (mDeadZone.onTouchEvent(event) || mDeadZoneConsuming) { + switch (action) { + case MotionEvent.ACTION_DOWN: + // Allow gestures starting in the deadzone to be slippery + mNavigationBarView.setSlippery(true); + mDeadZoneConsuming = true; + break; + case MotionEvent.ACTION_CANCEL: + case MotionEvent.ACTION_UP: + // When a gesture started in the deadzone is finished, restore + // slippery state + mNavigationBarView.updateSlippery(); + mDeadZoneConsuming = false; + break; + } + return true; + } + return false; + } + }; + + /** * Injectable factory for construction a {@link NavigationBar}. */ - public static class Factory { - private final Lazy<AssistManager> mAssistManagerLazy; - private final AccessibilityManager mAccessibilityManager; - private final DeviceProvisionedController mDeviceProvisionedController; - private final MetricsLogger mMetricsLogger; - private final OverviewProxyService mOverviewProxyService; - private final NavigationModeController mNavigationModeController; - private final AccessibilityButtonModeObserver mAccessibilityButtonModeObserver; - private final StatusBarStateController mStatusBarStateController; - private final SysUiState mSysUiFlagsContainer; - private final BroadcastDispatcher mBroadcastDispatcher; - private final CommandQueue mCommandQueue; - private final Optional<Pip> mPipOptional; - private final Optional<Recents> mRecentsOptional; - private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy; - private final ShadeController mShadeController; - private final NotificationRemoteInputManager mNotificationRemoteInputManager; - private final NotificationShadeDepthController mNotificationShadeDepthController; - private final Handler mMainHandler; - private final NavigationBarOverlayController mNavbarOverlayController; - private final UiEventLogger mUiEventLogger; - private final NavBarHelper mNavBarHelper; - private final LightBarController mMainLightBarController; - private final LightBarController.Factory mLightBarControllerFactory; - private final AutoHideController mMainAutoHideController; - private final AutoHideController.Factory mAutoHideControllerFactory; - private final Optional<TelecomManager> mTelecomManagerOptional; - private final InputMethodManager mInputMethodManager; - private final Optional<BackAnimation> mBackAnimation; - - @Inject - public Factory( - Lazy<AssistManager> assistManagerLazy, - AccessibilityManager accessibilityManager, - DeviceProvisionedController deviceProvisionedController, - MetricsLogger metricsLogger, - OverviewProxyService overviewProxyService, - NavigationModeController navigationModeController, - AccessibilityButtonModeObserver accessibilityButtonModeObserver, - StatusBarStateController statusBarStateController, - SysUiState sysUiFlagsContainer, - BroadcastDispatcher broadcastDispatcher, - CommandQueue commandQueue, - Optional<Pip> pipOptional, - Optional<Recents> recentsOptional, - Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy, - ShadeController shadeController, - NotificationRemoteInputManager notificationRemoteInputManager, - NotificationShadeDepthController notificationShadeDepthController, - @Main Handler mainHandler, - NavigationBarOverlayController navbarOverlayController, - UiEventLogger uiEventLogger, - NavBarHelper navBarHelper, - LightBarController mainLightBarController, - LightBarController.Factory lightBarControllerFactory, - AutoHideController mainAutoHideController, - AutoHideController.Factory autoHideControllerFactory, - Optional<TelecomManager> telecomManagerOptional, - InputMethodManager inputMethodManager, - Optional<BackAnimation> backAnimation) { - mAssistManagerLazy = assistManagerLazy; - mAccessibilityManager = accessibilityManager; - mDeviceProvisionedController = deviceProvisionedController; - mMetricsLogger = metricsLogger; - mOverviewProxyService = overviewProxyService; - mNavigationModeController = navigationModeController; - mAccessibilityButtonModeObserver = accessibilityButtonModeObserver; - mStatusBarStateController = statusBarStateController; - mSysUiFlagsContainer = sysUiFlagsContainer; - mBroadcastDispatcher = broadcastDispatcher; - mCommandQueue = commandQueue; - mPipOptional = pipOptional; - mRecentsOptional = recentsOptional; - mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy; - mShadeController = shadeController; - mNotificationRemoteInputManager = notificationRemoteInputManager; - mNotificationShadeDepthController = notificationShadeDepthController; - mMainHandler = mainHandler; - mNavbarOverlayController = navbarOverlayController; - mUiEventLogger = uiEventLogger; - mNavBarHelper = navBarHelper; - mMainLightBarController = mainLightBarController; - mLightBarControllerFactory = lightBarControllerFactory; - mMainAutoHideController = mainAutoHideController; - mAutoHideControllerFactory = autoHideControllerFactory; - mTelecomManagerOptional = telecomManagerOptional; - mInputMethodManager = inputMethodManager; - mBackAnimation = backAnimation; - } - + @AssistedFactory + public interface Factory { /** Construct a {@link NavigationBar} */ - public NavigationBar create(Context context) { - final WindowManager wm = context.getSystemService(WindowManager.class); - return new NavigationBar(context, wm, mAssistManagerLazy, - mAccessibilityManager, mDeviceProvisionedController, mMetricsLogger, - mOverviewProxyService, mNavigationModeController, - mAccessibilityButtonModeObserver, mStatusBarStateController, - mSysUiFlagsContainer, mBroadcastDispatcher, mCommandQueue, mPipOptional, - mRecentsOptional, mCentralSurfacesOptionalLazy, - mShadeController, mNotificationRemoteInputManager, - mNotificationShadeDepthController, mMainHandler, - mNavbarOverlayController, mUiEventLogger, mNavBarHelper, - mMainLightBarController, mLightBarControllerFactory, - mMainAutoHideController, mAutoHideControllerFactory, mTelecomManagerOptional, - mInputMethodManager, mBackAnimation); - } + NavigationBar create(Context context); } } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java index 017bbdffdc4f..f5abe28914c3 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java @@ -65,6 +65,7 @@ import android.widget.FrameLayout; import com.android.internal.annotations.VisibleForTesting; import com.android.settingslib.Utils; import com.android.systemui.Dependency; +import com.android.systemui.Gefingerpoken; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; import com.android.systemui.model.SysUiState; @@ -84,13 +85,12 @@ import com.android.systemui.shared.rotation.RotationButton.RotationButtonUpdates import com.android.systemui.shared.rotation.RotationButtonController; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; -import com.android.systemui.shared.system.SysUiStatsLog; import com.android.systemui.shared.system.WindowManagerWrapper; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.AutoHideController; +import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.LightBarTransitionsController; import com.android.systemui.statusbar.phone.NotificationPanelViewController; -import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.wm.shell.back.BackAnimation; import com.android.wm.shell.pip.Pip; @@ -101,15 +101,14 @@ import java.util.Optional; import java.util.concurrent.Executor; import java.util.function.Consumer; -public class NavigationBarView extends FrameLayout implements - NavigationModeController.ModeChangedListener { +/** */ +public class NavigationBarView extends FrameLayout { final static boolean DEBUG = false; final static String TAG = "NavBarView"; final static boolean ALTERNATE_CAR_MODE_UI = false; private final RegionSamplingHelper mRegionSamplingHelper; private final int mNavColorSampleMargin; - private final SysUiState mSysUiFlagContainer; // The current view is one of mHorizontal or mVertical depending on the current configuration View mCurrentView = null; @@ -197,6 +196,7 @@ public class NavigationBarView extends FrameLayout implements * <p>Cache the value here for better performance.</p> */ private final boolean mImeCanRenderGesturalNavButtons = canImeRenderGesturalNavButtons(); + private Gefingerpoken mTouchHandler; private class NavTransitionListener implements TransitionListener { private boolean mBackTransitioning; @@ -333,10 +333,8 @@ public class NavigationBarView extends FrameLayout implements mDarkIconColor = Utils.getColorAttrDefaultColor(darkContext, R.attr.singleToneColor); mIsVertical = false; mLongClickableAccessibilityButton = false; - mNavBarMode = Dependency.get(NavigationModeController.class).addListener(this); mImeDrawsImeNavBar = Dependency.get(NavigationModeController.class).getImeDrawsImeNavBar(); - mSysUiFlagContainer = Dependency.get(SysUiState.class); // Set up the context group of buttons mContextualButtonGroup = new ContextualButtonGroup(R.id.menu_container); final ContextualButton imeSwitcherButton = new ContextualButton(R.id.ime_switcher, @@ -365,8 +363,6 @@ public class NavigationBarView extends FrameLayout implements R.drawable.ic_sysbar_rotate_button_cw_start_90, () -> getDisplay().getRotation()); - updateRotationButton(); - mOverviewProxyService = Dependency.get(OverviewProxyService.class); mConfiguration = new Configuration(); @@ -448,19 +444,18 @@ public class NavigationBarView extends FrameLayout implements notifyVerticalChangedListener(mIsVertical); } + public void setTouchHandler(Gefingerpoken touchHandler) { + mTouchHandler = touchHandler; + } + @Override public boolean onInterceptTouchEvent(MotionEvent event) { - if (isGesturalMode(mNavBarMode) && mImeVisible - && event.getAction() == MotionEvent.ACTION_DOWN) { - SysUiStatsLog.write(SysUiStatsLog.IME_TOUCH_REPORTED, - (int) event.getX(), (int) event.getY()); - } - return shouldDeadZoneConsumeTouchEvents(event) || super.onInterceptTouchEvent(event); + return mTouchHandler.onInterceptTouchEvent(event) || super.onInterceptTouchEvent(event); } @Override public boolean onTouchEvent(MotionEvent event) { - shouldDeadZoneConsumeTouchEvents(event); + mTouchHandler.onTouchEvent(event); return super.onTouchEvent(event); } @@ -497,30 +492,6 @@ public class NavigationBarView extends FrameLayout implements } } - private boolean shouldDeadZoneConsumeTouchEvents(MotionEvent event) { - int action = event.getActionMasked(); - if (action == MotionEvent.ACTION_DOWN) { - mDeadZoneConsuming = false; - } - if (mDeadZone.onTouchEvent(event) || mDeadZoneConsuming) { - switch (action) { - case MotionEvent.ACTION_DOWN: - // Allow gestures starting in the deadzone to be slippery - setSlippery(true); - mDeadZoneConsuming = true; - break; - case MotionEvent.ACTION_CANCEL: - case MotionEvent.ACTION_UP: - // When a gesture started in the deadzone is finished, restore slippery state - updateSlippery(); - mDeadZoneConsuming = false; - break; - } - return true; - } - return false; - } - public void abortCurrentGesture() { getHomeButton().abortCurrentGesture(); } @@ -589,7 +560,7 @@ public class NavigationBarView extends FrameLayout implements return (mDisabledFlags & View.STATUS_BAR_DISABLE_RECENT) == 0; } - public boolean isQuickStepSwipeUpEnabled() { + private boolean isQuickStepSwipeUpEnabled() { return mOverviewProxyService.shouldShowSwipeUpUI() && isOverviewEnabled(); } @@ -618,7 +589,7 @@ public class NavigationBarView extends FrameLayout implements /** * Updates the rotation button based on the current navigation mode. */ - private void updateRotationButton() { + void updateRotationButton() { if (isGesturalMode(mNavBarMode)) { mContextualButtonGroup.removeButton(R.id.rotate_suggestion); mButtonDispatchers.remove(R.id.rotate_suggestion); @@ -722,25 +693,13 @@ public class NavigationBarView extends FrameLayout implements super.setLayoutDirection(layoutDirection); } - public void setNavigationIconHints(int hints) { + void setNavigationIconHints(int hints) { if (hints == mNavigationIconHints) return; - final boolean newBackAlt = (hints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0; - final boolean oldBackAlt = - (mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0; - if (newBackAlt != oldBackAlt) { - onImeVisibilityChanged(newBackAlt); - } - - if (DEBUG) { - android.widget.Toast.makeText(getContext(), - "Navigation icon hints = " + hints, - 500).show(); - } mNavigationIconHints = hints; updateNavButtonIcons(); } - private void onImeVisibilityChanged(boolean visible) { + void onImeVisibilityChanged(boolean visible) { if (!visible) { mTransitionListener.onBackAltCleared(); } @@ -751,7 +710,7 @@ public class NavigationBarView extends FrameLayout implements } } - public void setDisabledFlags(int disabledFlags) { + void setDisabledFlags(int disabledFlags, SysUiState sysUiState) { if (mDisabledFlags == disabledFlags) return; final boolean overviewEnabledBefore = isOverviewEnabled(); @@ -764,7 +723,7 @@ public class NavigationBarView extends FrameLayout implements updateNavButtonIcons(); updateSlippery(); - updateDisabledSystemUiStateFlags(); + updateDisabledSystemUiStateFlags(sysUiState); } public void updateNavButtonIcons() { @@ -907,10 +866,11 @@ public class NavigationBarView extends FrameLayout implements updateSlippery(); } - public void updateDisabledSystemUiStateFlags() { + /** */ + public void updateDisabledSystemUiStateFlags(SysUiState sysUiState) { int displayId = mContext.getDisplayId(); - mSysUiFlagContainer.setFlag(SYSUI_STATE_SCREEN_PINNING, + sysUiState.setFlag(SYSUI_STATE_SCREEN_PINNING, ActivityManagerWrapper.getInstance().isScreenPinningActive()) .setFlag(SYSUI_STATE_OVERVIEW_DISABLED, (mDisabledFlags & View.STATUS_BAR_DISABLE_RECENT) != 0) @@ -952,12 +912,12 @@ public class NavigationBarView extends FrameLayout implements * slippery is enabled, touch events will leave the nav bar window and enter into the fullscreen * app/home window, if not nav bar will receive a cancelled touch event once gesture leaves bar. */ - public void updateSlippery() { + void updateSlippery() { setSlippery(!isQuickStepSwipeUpEnabled() || (mPanelView != null && mPanelView.isFullyExpanded() && !mPanelView.isCollapsing())); } - private void setSlippery(boolean slippery) { + void setSlippery(boolean slippery) { setWindowFlag(WindowManager.LayoutParams.FLAG_SLIPPERY, slippery); } @@ -979,8 +939,7 @@ public class NavigationBarView extends FrameLayout implements wm.updateViewLayout(navbarView, lp); } - @Override - public void onNavigationModeChanged(int mode) { + void setNavBarMode(int mode) { mNavBarMode = mode; mImeDrawsImeNavBar = Dependency.get(NavigationModeController.class).getImeDrawsImeNavBar(); mBarTransitions.onNavigationModeChanged(mNavBarMode); @@ -1323,7 +1282,6 @@ public class NavigationBarView extends FrameLayout implements mEdgeBackGestureHandler.onNavBarAttached(); requestApplyInsets(); reorient(); - onNavigationModeChanged(mNavBarMode); if (mRotationButtonController != null) { mRotationButtonController.registerListeners(); } @@ -1338,7 +1296,6 @@ public class NavigationBarView extends FrameLayout implements @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - Dependency.get(NavigationModeController.class).removeListener(this); for (int i = 0; i < mButtonDispatchers.size(); ++i) { mButtonDispatchers.valueAt(i).onDestroy(); } diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt index 9cd97ff8e343..2a6ca1acb38e 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt @@ -22,13 +22,14 @@ import android.widget.ImageView import android.widget.LinearLayout import com.android.settingslib.Utils import com.android.systemui.R +import com.android.systemui.statusbar.events.BackgroundAnimatableView class OngoingPrivacyChip @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttrs: Int = 0, defStyleRes: Int = 0 -) : FrameLayout(context, attrs, defStyleAttrs, defStyleRes) { +) : FrameLayout(context, attrs, defStyleAttrs, defStyleRes), BackgroundAnimatableView { private var iconMargin = 0 private var iconSize = 0 @@ -50,6 +51,16 @@ class OngoingPrivacyChip @JvmOverloads constructor( updateResources() } + /** + * When animating as a chip in the status bar, we want to animate the width for the container + * of the privacy items. We have to subtract our own top and left offset because the bounds + * come to us as absolute on-screen bounds, and `iconsContainer` is laid out relative to the + * frame layout's bounds. + */ + override fun setBoundsForAnimation(l: Int, t: Int, r: Int, b: Int) { + iconsContainer.setLeftTopRightBottom(l - left, t - top, r - left, b - top) + } + // Should only be called if the builder icons or app changed private fun updateView(builder: PrivacyChipBuilder) { fun setIcons(chipBuilder: PrivacyChipBuilder, iconsContainer: ViewGroup) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index 3ef72202a591..fe8c309ad2f3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -573,6 +573,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca if (mQSAnimator != null) { mQSAnimator.setPosition(expansion); } + mQqsMediaHost.setSquishFraction(mSquishinessFraction); updateMediaPositions(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index 8c08873b9ab6..f2dd7700e65e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -102,7 +102,7 @@ public class QuickStatusBarHeader extends FrameLayout { private int mTopViewMeasureHeight; @NonNull - private List<String> mRssiIgnoredSlots; + private List<String> mRssiIgnoredSlots = List.of(); private boolean mIsSingleCarrier; private boolean mHasCenterCutout; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java index b65802506cbf..b41502213555 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java @@ -117,7 +117,6 @@ public class QRCodeScannerTile extends QSTileImpl<QSTile.State> { state.icon = ResourceIcon.get(R.drawable.ic_qr_code_scanner); state.state = mQRCodeScannerController.isEnabledForQuickSettings() ? Tile.STATE_ACTIVE : Tile.STATE_UNAVAILABLE; - state.secondaryLabel = mContext.getString(R.string.qr_code_scanner_description); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index a3dea1c68b14..53a27ff4e08b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -101,8 +101,8 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationShadeWindowController; -import com.android.systemui.statusbar.phone.NotificationPanelViewController; import com.android.systemui.statusbar.phone.CentralSurfaces; +import com.android.systemui.statusbar.phone.NotificationPanelViewController; import com.android.systemui.statusbar.phone.StatusBarWindowCallback; import com.android.systemui.statusbar.policy.CallbackController; import com.android.wm.shell.back.BackAnimation; @@ -675,7 +675,7 @@ public class OverviewProxyService extends CurrentUserTracker implements navBarFragment.updateSystemUiStateFlags(); } if (navBarView != null) { - navBarView.updateDisabledSystemUiStateFlags(); + navBarView.updateDisabledSystemUiStateFlags(mSysUiState); } if (panelController != null) { panelController.updateSystemUiStateFlags(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/StatusEvent.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/StatusEvent.kt index d4d84c138b20..4e1404d0637b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/events/StatusEvent.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/StatusEvent.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.events +import android.annotation.SuppressLint import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -27,13 +28,15 @@ import com.android.systemui.R import com.android.systemui.privacy.OngoingPrivacyChip import com.android.systemui.privacy.PrivacyItem +typealias ViewCreator = (context: Context) -> BackgroundAnimatableView + interface StatusEvent { val priority: Int // Whether or not to force the status bar open and show a dot val forceVisible: Boolean // Whether or not to show an animation for this event val showAnimation: Boolean - val viewCreator: (context: Context) -> View + val viewCreator: ViewCreator var contentDescription: String? // Update this event with values from another event. @@ -47,14 +50,37 @@ interface StatusEvent { } } +class BGView( + context: Context +) : View(context), BackgroundAnimatableView { + override val view: View + get() = this + + override fun setBoundsForAnimation(l: Int, t: Int, r: Int, b: Int) { + setLeftTopRightBottom(l, t, r, b) + } +} + +@SuppressLint("AppCompatCustomView") +class BGImageView( + context: Context +) : ImageView(context), BackgroundAnimatableView { + override val view: View + get() = this + + override fun setBoundsForAnimation(l: Int, t: Int, r: Int, b: Int) { + setLeftTopRightBottom(l, t, r, b) + } +} + class BatteryEvent : StatusEvent { override val priority = 50 override val forceVisible = false override val showAnimation = true override var contentDescription: String? = "" - override val viewCreator: (context: Context) -> View = { context -> - val iv = ImageView(context) + override val viewCreator: (context: Context) -> BGImageView = { context -> + val iv = BGImageView(context) iv.setImageDrawable(ThemedBatteryDrawable(context, Color.WHITE)) iv.setBackgroundDrawable(ColorDrawable(Color.GREEN)) iv @@ -72,7 +98,7 @@ class PrivacyEvent(override val showAnimation: Boolean = true) : StatusEvent { var privacyItems: List<PrivacyItem> = listOf() private var privacyChip: OngoingPrivacyChip? = null - override val viewCreator: (context: Context) -> View = { context -> + override val viewCreator: ViewCreator = { context -> val v = LayoutInflater.from(context) .inflate(R.layout.ongoing_privacy_chip, null) as OngoingPrivacyChip v.privacyList = privacyItems @@ -82,7 +108,7 @@ class PrivacyEvent(override val showAnimation: Boolean = true) : StatusEvent { } override fun toString(): String { - return javaClass.simpleName + return "${javaClass.simpleName}(forceVisible=$forceVisible, privacyItems=$privacyItems)" } override fun shouldUpdateFromEvent(other: StatusEvent?): Boolean { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt index d5a0467c9b9e..9795dcf1fcd8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt @@ -18,14 +18,16 @@ package com.android.systemui.statusbar.events import android.animation.ValueAnimator import android.content.Context +import android.graphics.Point import android.view.Gravity import android.view.LayoutInflater import android.view.View +import android.view.View.MeasureSpec.AT_MOST import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.view.ViewGroup.LayoutParams.WRAP_CONTENT import android.widget.FrameLayout import com.android.systemui.R -import com.android.systemui.statusbar.phone.StatusBarLocationPublisher +import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider import com.android.systemui.statusbar.window.StatusBarWindowController import javax.inject.Inject @@ -35,44 +37,73 @@ import javax.inject.Inject class SystemEventChipAnimationController @Inject constructor( private val context: Context, private val statusBarWindowController: StatusBarWindowController, - private val locationPublisher: StatusBarLocationPublisher + private val contentInsetsProvider: StatusBarContentInsetsProvider ) : SystemStatusChipAnimationCallback { - var showPersistentDot = false - set(value) { - field = value - statusBarWindowController.setForceStatusBarVisible(value) - maybeUpdateShowDot() - } private lateinit var animationWindowView: FrameLayout - private lateinit var animationDotView: View - private var currentAnimatedView: View? = null + + private var currentAnimatedView: BackgroundAnimatableView? = null + + // Left for LTR, Right for RTL + private var animationDirection = LEFT + private var chipRight = 0 + private var chipLeft = 0 + private var chipWidth = 0 + private var dotCenter = Point(0, 0) + private var dotSize = context.resources.getDimensionPixelSize( + R.dimen.ongoing_appops_dot_diameter) + // If the chip animates away to a persistent dot, then we modify the CHIP_OUT animation + private var isAnimatingToDot = false // TODO: move to dagger private var initialized = false override fun onChipAnimationStart( - viewCreator: (context: Context) -> View, + viewCreator: ViewCreator, @SystemAnimationState state: Int ) { if (!initialized) init() if (state == ANIMATING_IN) { - currentAnimatedView = viewCreator(context) - animationWindowView.addView(currentAnimatedView, layoutParamsDefault()) + animationDirection = if (animationWindowView.isLayoutRtl) RIGHT else LEFT + + // Initialize the animated view + val insets = contentInsetsProvider.getStatusBarContentInsetsForCurrentRotation() + currentAnimatedView = viewCreator(context).also { + animationWindowView.addView( + it.view, + layoutParamsDefault( + if (animationWindowView.isLayoutRtl) insets.first + else insets.second)) + it.view.alpha = 0f + // For some reason, the window view's measured width is always 0 here, so use the + // parent (status bar) + it.view.measure( + View.MeasureSpec.makeMeasureSpec( + (animationWindowView.parent as View).width, AT_MOST), + View.MeasureSpec.makeMeasureSpec(animationWindowView.height, AT_MOST)) + chipWidth = it.chipWidth + } + + // decide which direction we're animating from, and then set some screen coordinates + val contentRect = contentInsetsProvider.getStatusBarContentAreaForCurrentRotation() + when (animationDirection) { + LEFT -> { + chipRight = contentRect.right + chipLeft = contentRect.right - chipWidth + } + else /* RIGHT */ -> { + chipLeft = contentRect.left + chipRight = contentRect.left + chipWidth + } + } - // We are animating IN; chip comes in from View.END currentAnimatedView?.apply { - val translation = width.toFloat() - translationX = if (isLayoutRtl) -translation else translation - alpha = 0f - visibility = View.VISIBLE - setPadding(locationPublisher.marginLeft, 0, locationPublisher.marginRight, 0) + updateAnimatedViewBoundsForAmount(0.1f, this) } } else { // We are animating away - currentAnimatedView?.apply { - translationX = 0f + currentAnimatedView!!.view.apply { alpha = 1f } } @@ -82,15 +113,14 @@ class SystemEventChipAnimationController @Inject constructor( if (state == ANIMATING_IN) { // Finished animating in currentAnimatedView?.apply { - translationX = 0f - alpha = 1f + updateAnimatedViewBoundsForAmount(1f, this) } } else { // Finished animating away - currentAnimatedView?.apply { + currentAnimatedView!!.view.apply { visibility = View.INVISIBLE } - animationWindowView.removeView(currentAnimatedView) + animationWindowView.removeView(currentAnimatedView!!.view) } } @@ -98,22 +128,10 @@ class SystemEventChipAnimationController @Inject constructor( animator: ValueAnimator, @SystemAnimationState state: Int ) { - // Alpha is parameterized 0,1, and translation from (width, 0) currentAnimatedView?.apply { - val amt = animator.animatedValue as Float - - alpha = amt - - val w = width - val translation = (1 - amt) * w - translationX = if (isLayoutRtl) -translation else translation - } - } - - private fun maybeUpdateShowDot() { - if (!initialized) return - if (!showPersistentDot && currentAnimatedView == null) { - animationDotView.visibility = View.INVISIBLE + val amt = (animator.animatedValue as Float).amt() + view.alpha = (animator.animatedValue as Float) + updateAnimatedViewBoundsForAmount(amt, this) } } @@ -121,19 +139,56 @@ class SystemEventChipAnimationController @Inject constructor( initialized = true animationWindowView = LayoutInflater.from(context) .inflate(R.layout.system_event_animation_window, null) as FrameLayout - animationDotView = animationWindowView.findViewById(R.id.dot_view) val lp = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT) lp.gravity = Gravity.END or Gravity.CENTER_VERTICAL statusBarWindowController.addViewToWindow(animationWindowView, lp) + animationWindowView.clipToPadding = false + animationWindowView.clipChildren = false + animationWindowView.measureAllChildren = true } - private fun start() = if (animationWindowView.isLayoutRtl) right() else left() - private fun right() = locationPublisher.marginRight - private fun left() = locationPublisher.marginLeft + private fun layoutParamsDefault(marginEnd: Int): FrameLayout.LayoutParams = + FrameLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).also { + it.gravity = Gravity.END or Gravity.CENTER_VERTICAL + it.marginEnd = marginEnd + } - private fun layoutParamsDefault(): FrameLayout.LayoutParams = - FrameLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).also { - it.gravity = Gravity.END or Gravity.CENTER_VERTICAL - it.marginStart = start() + private fun updateAnimatedViewBoundsForAmount(amt: Float, chip: BackgroundAnimatableView) { + when (animationDirection) { + LEFT -> { + chip.setBoundsForAnimation( + (chipRight - (chipWidth * amt)).toInt(), + chip.view.top, + chipRight, + chip.view.bottom) + } + else /* RIGHT */ -> { + chip.setBoundsForAnimation( + chipLeft, + chip.view.top, + (chipLeft + (chipWidth * amt)).toInt(), + chip.view.bottom) + } + } } + + private fun start() = if (animationWindowView.isLayoutRtl) right() else left() + private fun right() = contentInsetsProvider.getStatusBarContentAreaForCurrentRotation().right + private fun left() = contentInsetsProvider.getStatusBarContentAreaForCurrentRotation().left + private fun Float.amt() = 0.01f.coerceAtLeast(this) +} + +/** + * Chips should provide a view that can be animated with something better than a fade-in + */ +interface BackgroundAnimatableView { + val view: View // Since this can't extend View, add a view prop + get() = this as View + val chipWidth: Int + get() = view.measuredWidth + fun setBoundsForAnimation(l: Int, t: Int, r: Int, b: Int) } + +// Animation directions +private const val LEFT = 1 +private const val RIGHT = 2 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt index 04f7492e8562..fde5d39db7e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt @@ -70,11 +70,11 @@ class SystemEventCoordinator @Inject constructor( fun notifyPrivacyItemsChanged(showAnimation: Boolean = true) { val event = PrivacyEvent(showAnimation) event.privacyItems = privacyStateListener.currentPrivacyItems - event.contentDescription = { + event.contentDescription = run { val items = PrivacyChipBuilder(context, event.privacyItems).joinTypes() context.getString( R.string.ongoing_privacy_chip_content_multiple_apps, items) - }() + } scheduler.onStatusEvent(event) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt index 5a273294e87c..947f3eb2ee12 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt @@ -21,12 +21,12 @@ import android.animation.AnimatorListenerAdapter import android.animation.AnimatorSet import android.animation.ValueAnimator import android.annotation.IntDef -import android.content.Context import android.os.Process import android.provider.DeviceConfig import android.util.Log -import android.view.View import com.android.systemui.Dumpable +import com.android.systemui.animation.Interpolators.STANDARD_ACCELERATE +import com.android.systemui.animation.Interpolators.STANDARD_DECELERATE import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main @@ -45,7 +45,7 @@ import javax.inject.Inject * Dead-simple scheduler for system status events. Obeys the following principles (all values TBD): * - Avoiding log spam by only allowing 12 events per minute (1event/5s) * - Waits 100ms to schedule any event for debouncing/prioritization - * - Simple prioritization: Privacy > Battery > connectivity (encoded in StatusEvent) + * - Simple prioritization: Privacy > Battery > connectivity (encoded in [StatusEvent]) * - Only schedules a single event, and throws away lowest priority events * * There are 4 basic stages of animation at play here: @@ -111,7 +111,7 @@ class SystemStatusAnimationScheduler @Inject constructor( scheduleEvent(event) } else if (scheduledEvent?.shouldUpdateFromEvent(event) == true) { if (DEBUG) { - Log.d(TAG, "updating current event from: $event") + Log.d(TAG, "updating current event from: $event. animationState=$animationState") } scheduledEvent?.updateFromEvent(event) if (event.forceVisible) { @@ -172,12 +172,14 @@ class SystemStatusAnimationScheduler @Inject constructor( entranceAnimator.duration = ENTRANCE_ANIM_LENGTH entranceAnimator.addListener(systemAnimatorAdapter) entranceAnimator.addUpdateListener(systemUpdateListener) + entranceAnimator.interpolator = STANDARD_ACCELERATE val chipAnimator = ValueAnimator.ofFloat(0f, 1f) chipAnimator.duration = CHIP_ANIM_LENGTH chipAnimator.addListener( ChipAnimatorAdapter(RUNNING_CHIP_ANIM, scheduledEvent!!.viewCreator)) chipAnimator.addUpdateListener(chipUpdateListener) + chipAnimator.interpolator = STANDARD_DECELERATE val aSet2 = AnimatorSet() aSet2.playSequentially(entranceAnimator, chipAnimator) @@ -190,6 +192,12 @@ class SystemStatusAnimationScheduler @Inject constructor( systemAnimator.duration = ENTRANCE_ANIM_LENGTH systemAnimator.addListener(systemAnimatorAdapter) systemAnimator.addUpdateListener(systemUpdateListener) + systemAnimator.interpolator = STANDARD_DECELERATE + systemAnimator.addListener(object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator?) { + statusBarWindowController.setForceStatusBarVisible(false) + } + }) val chipAnimator = ValueAnimator.ofFloat(1f, 0f) chipAnimator.duration = CHIP_ANIM_LENGTH @@ -201,6 +209,7 @@ class SystemStatusAnimationScheduler @Inject constructor( chipAnimator.addListener( ChipAnimatorAdapter(endState, scheduledEvent!!.viewCreator)) chipAnimator.addUpdateListener(chipUpdateListener) + chipAnimator.interpolator = STANDARD_ACCELERATE val aSet2 = AnimatorSet() @@ -212,7 +221,6 @@ class SystemStatusAnimationScheduler @Inject constructor( aSet2.start() - statusBarWindowController.setForceStatusBarVisible(false) scheduledEvent = null }, DISPLAY_LENGTH) }, DELAY) @@ -313,7 +321,7 @@ class SystemStatusAnimationScheduler @Inject constructor( inner class ChipAnimatorAdapter( @SystemAnimationState val endState: Int, - val viewCreator: (context: Context) -> View + val viewCreator: ViewCreator ) : AnimatorListenerAdapter() { override fun onAnimationEnd(p0: Animator?) { chipAnimationController.onChipAnimationEnd(animationState) @@ -359,7 +367,7 @@ interface SystemStatusChipAnimationCallback { fun onChipAnimationUpdate(animator: ValueAnimator, @SystemAnimationState state: Int) {} fun onChipAnimationStart( - viewCreator: (context: Context) -> View, + viewCreator: ViewCreator, @SystemAnimationState state: Int ) {} @@ -371,7 +379,7 @@ interface SystemStatusChipAnimationCallback { @Retention(AnnotationRetention.SOURCE) @IntDef( value = [ - IDLE, ANIMATING_IN, RUNNING_CHIP_ANIM, ANIMATING_OUT + IDLE, ANIMATING_IN, RUNNING_CHIP_ANIM, ANIMATING_OUT, SHOWING_PERSISTENT_DOT ] ) annotation class SystemAnimationState diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java index 5b7d90bfca44..df412ed93f55 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java @@ -16,11 +16,9 @@ package com.android.systemui.statusbar.notification; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import android.annotation.NonNull; import android.annotation.Nullable; @@ -182,25 +180,6 @@ public class InstantAppNotifier extends CoreStartable } /** - * Posts an instant app notification if the top activity of the primary container in the - * splitted screen is an instant app and the corresponding instant app notification is not - * posted yet. If the notification already exists, this method removes it from {@code - * notifs} in the arguments. - */ - private void checkAndPostForPrimaryScreen( - @NonNull ArraySet<Pair<String, Integer>> notifs, - @NonNull NotificationManager noMan, - @NonNull IPackageManager pm) { - try { - final RootTaskInfo info = ActivityTaskManager.getService().getRootTaskInfo( - WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_UNDEFINED); - checkAndPostForStack(info, notifs, noMan, pm); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); - } - } - - /** * Posts an instant app notification if the top activity of the given stack is an instant app * and the corresponding instant app notification is not posted yet. If the notification already * exists, this method removes it from {@code notifs} in the arguments. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 5b9dbd0f3361..be1aa10c5f80 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -1332,12 +1332,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable */ @ShadeViewRefactor(RefactorComponent.COORDINATOR) public void setExpandedHeight(float height) { - final float shadeBottom = getHeight() - getEmptyBottomMargin(); final boolean skipHeightUpdate = shouldSkipHeightUpdate(); - if (!skipHeightUpdate) { - final float expansionFraction = MathUtils.saturate(height / shadeBottom); - mAmbientState.setExpansionFraction(expansionFraction); - } updateStackPosition(); if (!skipHeightUpdate) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index cbdf5c8017c6..1891ab017ef8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -3009,9 +3009,7 @@ public class NotificationPanelViewController extends PanelViewController { } private int calculatePanelHeightShade() { - int emptyBottomMargin = mNotificationStackScrollLayoutController.getEmptyBottomMargin(); - int maxHeight = mNotificationStackScrollLayoutController.getHeight() - emptyBottomMargin; - + final int maxHeight = mNotificationStackScrollLayoutController.getHeight(); if (mBarState == KEYGUARD) { int minKeyguardPanelBottom = mClockPositionAlgorithm.getLockscreenStatusViewHeight() + mNotificationStackScrollLayoutController.getIntrinsicContentHeight(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java index 942aab58763e..24f5ff86a794 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java @@ -796,6 +796,7 @@ public abstract class PanelViewController { } mExpandedFraction = Math.min(1f, maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight); + mAmbientState.setExpansionFraction(mExpandedFraction); onHeightUpdated(mExpandedHeight); updatePanelExpansionAndVisibility(); }); diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaViewControllerTest.kt new file mode 100644 index 000000000000..b7d5ba170e6d --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaViewControllerTest.kt @@ -0,0 +1,55 @@ +package com.android.systemui.media + +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import android.view.View +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.util.animation.MeasurementInput +import com.android.systemui.util.animation.TransitionLayout +import com.android.systemui.util.animation.TransitionViewState +import junit.framework.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Tests for {@link MediaViewController}. + */ +@SmallTest +@RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper +class MediaViewControllerTest : SysuiTestCase() { + private val configurationController = + com.android.systemui.statusbar.phone.ConfigurationControllerImpl(context) + private val mediaHostStatesManager = MediaHostStatesManager() + private val mediaViewController = + MediaViewController(context, configurationController, mediaHostStatesManager) + private val mediaHostStateHolder = MediaHost.MediaHostStateHolder() + private var transitionLayout = TransitionLayout(context, /* attrs */ null, /* defStyleAttr */ 0) + + @Before + fun setUp() { + mediaViewController.attach(transitionLayout, MediaViewController.TYPE.PLAYER) + } + + @Test + fun testObtainViewState_applySquishFraction_toTransitionViewState_height() { + transitionLayout.measureState = TransitionViewState().apply { + this.height = 100 + } + mediaHostStateHolder.expansion = 1f + val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY) + val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY) + mediaHostStateHolder.measurementInput = + MeasurementInput(widthMeasureSpec, heightMeasureSpec) + + // Test no squish + mediaHostStateHolder.squishFraction = 1f + assertTrue(mediaViewController.obtainViewState(mediaHostStateHolder)!!.height == 100) + + // Test half squish + mediaHostStateHolder.squishFraction = 0.5f + assertTrue(mediaViewController.obtainViewState(mediaHostStateHolder)!!.height == 50) + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java index eb1e1a2e3d04..a0aa267e850e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java @@ -91,10 +91,10 @@ import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.NotificationShadeDepthController; import com.android.systemui.statusbar.phone.AutoHideController; +import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.LightBarController; import com.android.systemui.statusbar.phone.NotificationShadeWindowView; import com.android.systemui.statusbar.phone.ShadeController; -import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.utils.leaks.LeakCheckedTest; @@ -387,14 +387,14 @@ public class NavigationBarTest extends SysuiTestCase { DeviceProvisionedController deviceProvisionedController = mock(DeviceProvisionedController.class); when(deviceProvisionedController.isDeviceProvisioned()).thenReturn(true); - NavigationBar.Factory factory = new NavigationBar.Factory( + return spy(new NavigationBar(context, + mWindowManager, () -> mAssistManager, mock(AccessibilityManager.class), deviceProvisionedController, new MetricsLogger(), mOverviewProxyService, mNavigationModeController, - mock(AccessibilityButtonModeObserver.class), mStatusBarStateController, mMockSysUiState, mBroadcastDispatcher, @@ -415,8 +415,7 @@ public class NavigationBarTest extends SysuiTestCase { mAutoHideControllerFactory, Optional.of(mTelecomManager), mInputMethodManager, - Optional.of(mock(BackAnimation.class))); - return spy(factory.create(context)); + Optional.of(mock(BackAnimation.class)))); } private void processAllMessages() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java index 8297850d21a1..b652aee0f6aa 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java @@ -104,8 +104,6 @@ public class QRCodeScannerTileTest extends SysuiTestCase { assertEquals(state.label, mContext.getString(R.string.qr_code_scanner_title)); assertEquals(state.contentDescription, mContext.getString(R.string.qr_code_scanner_title)); assertEquals(state.icon, QSTileImpl.ResourceIcon.get(R.drawable.ic_qr_code_scanner)); - assertEquals(state.secondaryLabel, - mContext.getString(R.string.qr_code_scanner_description)); } @Test diff --git a/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java b/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java index b991ba87eef4..3a26c4611629 100644 --- a/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java +++ b/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java @@ -22,6 +22,7 @@ import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTE import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.WindowConfiguration; import android.app.compat.CompatChanges; import android.companion.virtual.VirtualDeviceManager.ActivityListener; import android.companion.virtual.VirtualDeviceParams; @@ -119,6 +120,7 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController @ActivityPolicy int defaultActivityPolicy, @NonNull ActivityListener activityListener, @NonNull Consumer<ActivityInfo> activityBlockedCallback) { + super(); mAllowedUsers = allowedUsers; mAllowedActivities = new ArraySet<>(allowedActivities); mBlockedActivities = new ArraySet<>(blockedActivities); @@ -134,7 +136,11 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController } @Override - public boolean canContainActivities(@NonNull List<ActivityInfo> activities) { + public boolean canContainActivities(@NonNull List<ActivityInfo> activities, + @WindowConfiguration.WindowingMode int windowingMode) { + if (!isWindowingModeSupported(windowingMode)) { + return false; + } // Can't display all the activities if any of them don't want to be displayed. final int activityCount = activities.size(); for (int i = 0; i < activityCount; i++) { diff --git a/services/core/java/android/content/pm/PackageManagerInternal.java b/services/core/java/android/content/pm/PackageManagerInternal.java index 2068e6d380b7..68cd28809fd0 100644 --- a/services/core/java/android/content/pm/PackageManagerInternal.java +++ b/services/core/java/android/content/pm/PackageManagerInternal.java @@ -48,7 +48,6 @@ import com.android.server.pm.PackageSetting; import com.android.server.pm.dex.DynamicCodeLogger; import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.pm.pkg.AndroidPackageApi; -import com.android.server.pm.pkg.PackageState; import com.android.server.pm.pkg.PackageStateInternal; import com.android.server.pm.pkg.SharedUserApi; import com.android.server.pm.pkg.component.ParsedMainComponent; @@ -690,8 +689,6 @@ public abstract class PackageManagerInternal { @Nullable public abstract PackageStateInternal getPackageStateInternal(@NonNull String packageName); - public abstract @Nullable PackageState getPackageState(@NonNull String packageName); - @NonNull public abstract ArrayMap<String, ? extends PackageStateInternal> getPackageStates(); diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 58fa9fb28a78..839cdc6eaca3 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -91,7 +91,7 @@ import android.util.Pair; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IBatteryStats; -import com.android.internal.telephony.ICarrierPrivilegesListener; +import com.android.internal.telephony.ICarrierPrivilegesCallback; import com.android.internal.telephony.IOnSubscriptionsChangedListener; import com.android.internal.telephony.IPhoneStateListener; import com.android.internal.telephony.ITelephonyRegistry; @@ -153,7 +153,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { IPhoneStateListener callback; IOnSubscriptionsChangedListener onSubscriptionsChangedListenerCallback; IOnSubscriptionsChangedListener onOpportunisticSubscriptionsChangedListenerCallback; - ICarrierPrivilegesListener carrierPrivilegesListener; + ICarrierPrivilegesCallback carrierPrivilegesCallback; int callerUid; int callerPid; @@ -178,8 +178,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { return (onOpportunisticSubscriptionsChangedListenerCallback != null); } - boolean matchCarrierPrivilegesListener() { - return carrierPrivilegesListener != null; + boolean matchCarrierPrivilegesCallback() { + return carrierPrivilegesCallback != null; } boolean canReadCallLog() { @@ -199,7 +199,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { + onSubscriptionsChangedListenerCallback + " onOpportunisticSubscriptionsChangedListenererCallback=" + onOpportunisticSubscriptionsChangedListenerCallback - + " carrierPrivilegesListener=" + carrierPrivilegesListener + + " carrierPrivilegesCallback=" + carrierPrivilegesCallback + " subId=" + subId + " phoneId=" + phoneId + " events=" + eventList + "}"; } } @@ -414,7 +414,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { mPreciseDataConnectionStates; /** Per-phoneId snapshot of privileged packages (names + UIDs). */ - private List<Pair<List<String>, int[]>> mCarrierPrivilegeStates; + @NonNull private List<Pair<List<String>, int[]>> mCarrierPrivilegeStates; + /** Per-phoneId of CarrierService (PackageName, UID) pair. */ + @NonNull private List<Pair<String, Integer>> mCarrierServiceStates; /** * Support backward compatibility for {@link android.telephony.TelephonyDisplayInfo}. @@ -705,6 +707,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { cutListToSize(mPhysicalChannelConfigs, mNumPhones); cutListToSize(mLinkCapacityEstimateLists, mNumPhones); cutListToSize(mCarrierPrivilegeStates, mNumPhones); + cutListToSize(mCarrierServiceStates, mNumPhones); return; } @@ -746,6 +749,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { mAllowedNetworkTypeValue[i] = -1; mLinkCapacityEstimateLists.add(i, INVALID_LCE_LIST); mCarrierPrivilegeStates.add(i, new Pair<>(Collections.emptyList(), new int[0])); + mCarrierServiceStates.add(i, new Pair<>(null, Process.INVALID_UID)); } } } @@ -813,6 +817,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { mDataEnabledReason = new int[numPhones]; mLinkCapacityEstimateLists = new ArrayList<>(); mCarrierPrivilegeStates = new ArrayList<>(); + mCarrierServiceStates = new ArrayList<>(); for (int i = 0; i < numPhones; i++) { mCallState[i] = TelephonyManager.CALL_STATE_IDLE; @@ -851,6 +856,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { mAllowedNetworkTypeValue[i] = -1; mLinkCapacityEstimateLists.add(i, INVALID_LCE_LIST); mCarrierPrivilegeStates.add(i, new Pair<>(Collections.emptyList(), new int[0])); + mCarrierServiceStates.add(i, new Pair<>(null, Process.INVALID_UID)); } mAppOps = mContext.getSystemService(AppOpsManager.class); @@ -2784,16 +2790,16 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } @Override - public void addCarrierPrivilegesListener( + public void addCarrierPrivilegesCallback( int phoneId, - ICarrierPrivilegesListener callback, - String callingPackage, - String callingFeatureId) { + @NonNull ICarrierPrivilegesCallback callback, + @NonNull String callingPackage, + @NonNull String callingFeatureId) { int callerUserId = UserHandle.getCallingUserId(); mAppOps.checkPackage(Binder.getCallingUid(), callingPackage); mContext.enforceCallingOrSelfPermission( android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, - "addCarrierPrivilegesListener"); + "addCarrierPrivilegesCallback"); if (VDBG) { log( "listen carrier privs: E pkg=" + pii(callingPackage) + " phoneId=" + phoneId @@ -2813,7 +2819,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { if (r == null) return; r.context = mContext; - r.carrierPrivilegesListener = callback; + r.carrierPrivilegesCallback = callback; r.callingPackage = callingPackage; r.callingFeatureId = callingFeatureId; r.callerUid = Binder.getCallingUid(); @@ -2825,10 +2831,18 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } Pair<List<String>, int[]> state = mCarrierPrivilegeStates.get(phoneId); + Pair<String, Integer> carrierServiceState = mCarrierServiceStates.get(phoneId); try { - r.carrierPrivilegesListener.onCarrierPrivilegesChanged( - Collections.unmodifiableList(state.first), - Arrays.copyOf(state.second, state.second.length)); + if (r.matchCarrierPrivilegesCallback()) { + // Here, two callbacks are triggered in quick succession on the same binder. + // In typical case, we expect the callers to care about only one or the other. + r.carrierPrivilegesCallback.onCarrierPrivilegesChanged( + Collections.unmodifiableList(state.first), + Arrays.copyOf(state.second, state.second.length)); + + r.carrierPrivilegesCallback.onCarrierServiceChanged(carrierServiceState.first, + carrierServiceState.second); + } } catch (RemoteException ex) { remove(r.binder); } @@ -2836,12 +2850,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } @Override - public void removeCarrierPrivilegesListener( - ICarrierPrivilegesListener callback, String callingPackage) { + public void removeCarrierPrivilegesCallback( + @NonNull ICarrierPrivilegesCallback callback, @NonNull String callingPackage) { mAppOps.checkPackage(Binder.getCallingUid(), callingPackage); mContext.enforceCallingOrSelfPermission( android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, - "removeCarrierPrivilegesListener"); + "removeCarrierPrivilegesCallback"); remove(callback.asBinder()); } @@ -2866,13 +2880,13 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { for (Record r : mRecords) { // Listeners are per-slot, not per-subscription. This is to provide a stable // view across SIM profile switches. - if (!r.matchCarrierPrivilegesListener() + if (!r.matchCarrierPrivilegesCallback() || !idMatch(r, SubscriptionManager.INVALID_SUBSCRIPTION_ID, phoneId)) { continue; } try { // Make sure even in-process listeners can't modify the values. - r.carrierPrivilegesListener.onCarrierPrivilegesChanged( + r.carrierPrivilegesCallback.onCarrierPrivilegesChanged( Collections.unmodifiableList(privilegedPackageNames), Arrays.copyOf(privilegedUids, privilegedUids.length)); } catch (RemoteException ex) { @@ -2883,6 +2897,34 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { } } + @Override + public void notifyCarrierServiceChanged(int phoneId, @Nullable String packageName, int uid) { + if (!checkNotifyPermission("notifyCarrierServiceChanged")) return; + if (!validatePhoneId(phoneId)) return; + if (VDBG) { + log("notifyCarrierServiceChanged: phoneId=" + phoneId + + ", package=" + pii(packageName) + ", uid=" + uid); + } + + synchronized (mRecords) { + mCarrierServiceStates.set( + phoneId, new Pair<>(packageName, uid)); + for (Record r : mRecords) { + // Listeners are per-slot, not per-subscription. + if (!r.matchCarrierPrivilegesCallback() + || !idMatch(r, SubscriptionManager.INVALID_SUBSCRIPTION_ID, phoneId)) { + continue; + } + try { + r.carrierPrivilegesCallback.onCarrierServiceChanged(packageName, uid); + } catch (RemoteException ex) { + mRemoveList.add(r.binder); + } + } + handleRemoveListLocked(); + } + } + @NeverCompile // Avoid size overhead of debugging code. @Override public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { @@ -2938,6 +2980,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { pw.println( "mCarrierPrivilegeState=<packages=" + pii(carrierPrivilegeState.first) + ", uids=" + Arrays.toString(carrierPrivilegeState.second) + ">"); + Pair<String, Integer> carrierServiceState = mCarrierServiceStates.get(i); + pw.println("mCarrierServiceState=<package=" + pii(carrierServiceState.first) + + ", uid=" + carrierServiceState.second + ">"); pw.decreaseIndent(); } diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java index 18e0155cfd34..c42666247e98 100644 --- a/services/core/java/com/android/server/am/ActivityManagerConstants.java +++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java @@ -127,7 +127,15 @@ final class ActivityManagerConstants extends ContentObserver { static final String KEY_KILL_BG_RESTRICTED_CACHED_IDLE = "kill_bg_restricted_cached_idle"; static final String KEY_KILL_BG_RESTRICTED_CACHED_IDLE_SETTLE_TIME = "kill_bg_restricted_cached_idle_settle_time"; + /** + * Note this key is on {@link DeviceConfig#NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS}. + * @see #mEnableComponentAlias + */ static final String KEY_ENABLE_COMPONENT_ALIAS = "enable_experimental_component_alias"; + /** + * Note this key is on {@link DeviceConfig#NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS}. + * @see #mComponentAliasOverrides + */ static final String KEY_COMPONENT_ALIAS_OVERRIDES = "component_alias_overrides"; private static final int DEFAULT_MAX_CACHED_PROCESSES = 32; @@ -899,10 +907,6 @@ final class ActivityManagerConstants extends ContentObserver { case KEY_ENABLE_EXTRA_SERVICE_RESTART_DELAY_ON_MEM_PRESSURE: updateEnableExtraServiceRestartDelayOnMemPressure(); break; - case KEY_ENABLE_COMPONENT_ALIAS: - case KEY_COMPONENT_ALIAS_OVERRIDES: - updateComponentAliases(); - break; case KEY_PROCESS_KILL_TIMEOUT: updateProcessKillTimeout(); break; @@ -925,6 +929,26 @@ final class ActivityManagerConstants extends ContentObserver { } }; + private final OnPropertiesChangedListener mOnDeviceConfigChangedForComponentAliasListener = + new OnPropertiesChangedListener() { + @Override + public void onPropertiesChanged(Properties properties) { + for (String name : properties.getKeyset()) { + if (name == null) { + return; + } + switch (name) { + case KEY_ENABLE_COMPONENT_ALIAS: + case KEY_COMPONENT_ALIAS_OVERRIDES: + updateComponentAliases(); + break; + default: + break; + } + } + } + }; + ActivityManagerConstants(Context context, ActivityManagerService service, Handler handler) { super(handler); mService = service; @@ -991,6 +1015,10 @@ final class ActivityManagerConstants extends ContentObserver { DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, ActivityThread.currentApplication().getMainExecutor(), mOnDeviceConfigChangedListener); + DeviceConfig.addOnPropertiesChangedListener( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS, + ActivityThread.currentApplication().getMainExecutor(), + mOnDeviceConfigChangedForComponentAliasListener); loadDeviceConfigConstants(); // The following read from Settings. updateActivityStartsLoggingEnabled(); @@ -1000,6 +1028,9 @@ final class ActivityManagerConstants extends ContentObserver { private void loadDeviceConfigConstants() { mOnDeviceConfigChangedListener.onPropertiesChanged( DeviceConfig.getProperties(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER)); + mOnDeviceConfigChangedForComponentAliasListener.onPropertiesChanged( + DeviceConfig.getProperties( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS)); } public void setOverrideMaxCachedProcesses(int value) { @@ -1379,11 +1410,11 @@ final class ActivityManagerConstants extends ContentObserver { private void updateComponentAliases() { mEnableComponentAlias = DeviceConfig.getBoolean( - DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS, KEY_ENABLE_COMPONENT_ALIAS, DEFAULT_ENABLE_COMPONENT_ALIAS); mComponentAliasOverrides = DeviceConfig.getString( - DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS, KEY_COMPONENT_ALIAS_OVERRIDES, DEFAULT_COMPONENT_ALIAS_OVERRIDES); mService.mComponentAliasResolver.update(mEnableComponentAlias, mComponentAliasOverrides); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index bd000e20fc64..0735648c1069 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5755,6 +5755,18 @@ public class ActivityManagerService extends IActivityManager.Stub owningUid, exported); } + private void enforceDebuggable(ProcessRecord proc) { + if (!Build.IS_DEBUGGABLE && !proc.isDebuggable()) { + throw new SecurityException("Process not debuggable: " + proc.info.packageName); + } + } + + private void enforceDebuggable(ApplicationInfo info) { + if (!Build.IS_DEBUGGABLE && (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) == 0) { + throw new SecurityException("Process not debuggable: " + info.packageName); + } + } + /** * As the only public entry point for permissions checking, this method * can enforce the semantic that requesting a check on a null global @@ -6792,22 +6804,25 @@ public class ActivityManagerService extends IActivityManager.Stub } void setTrackAllocationApp(ApplicationInfo app, String processName) { - if (!Build.IS_DEBUGGABLE) { - if ((app.flags & ApplicationInfo.FLAG_DEBUGGABLE) == 0) { - throw new SecurityException("Process not debuggable: " + app.packageName); - } - } + enforceDebuggable(app); synchronized (mProcLock) { mTrackAllocationApp = processName; } } - void setProfileApp(ApplicationInfo app, String processName, ProfilerInfo profilerInfo) { + void setProfileApp(ApplicationInfo app, String processName, ProfilerInfo profilerInfo, + ApplicationInfo sdkSandboxClientApp) { synchronized (mAppProfiler.mProfilerLock) { if (!Build.IS_DEBUGGABLE) { boolean isAppDebuggable = (app.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; boolean isAppProfileable = app.isProfileableByShell(); + + if (sdkSandboxClientApp != null) { + isAppDebuggable |= + (sdkSandboxClientApp.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; + isAppProfileable |= sdkSandboxClientApp.isProfileableByShell(); + } if (!isAppDebuggable && !isAppProfileable) { throw new SecurityException("Process not debuggable, " + "and not profileable by shell: " + app.packageName); @@ -6818,11 +6833,7 @@ public class ActivityManagerService extends IActivityManager.Stub } void setNativeDebuggingAppLocked(ApplicationInfo app, String processName) { - if (!Build.IS_DEBUGGABLE) { - if ((app.flags & ApplicationInfo.FLAG_DEBUGGABLE) == 0) { - throw new SecurityException("Process not debuggable: " + app.packageName); - } - } + enforceDebuggable(app); mNativeDebuggingApp = processName; } @@ -15568,12 +15579,7 @@ public class ActivityManagerService extends IActivityManager.Stub throw new IllegalArgumentException("Unknown process: " + process); } - boolean isDebuggable = Build.IS_DEBUGGABLE; - if (!isDebuggable) { - if ((proc.info.flags&ApplicationInfo.FLAG_DEBUGGABLE) == 0) { - throw new SecurityException("Process not debuggable: " + proc); - } - } + enforceDebuggable(proc); mOomAdjuster.mCachedAppOptimizer.enableFreezer(false); @@ -15676,10 +15682,7 @@ public class ActivityManagerService extends IActivityManager.Stub throw new SecurityException("No process found for calling pid " + Binder.getCallingPid()); } - if (!Build.IS_DEBUGGABLE - && (proc.info.flags&ApplicationInfo.FLAG_DEBUGGABLE) == 0) { - throw new SecurityException("Not running a debuggable build"); - } + enforceDebuggable(proc); processName = proc.processName; uid = proc.uid; if (reportPackage != null && !proc.getPkgList().containsKey(reportPackage)) { @@ -15890,13 +15893,7 @@ public class ActivityManagerService extends IActivityManager.Stub return false; } - if (!Build.IS_DEBUGGABLE) { - if ((process.info.flags&ApplicationInfo.FLAG_DEBUGGABLE) == 0) { - return false; - } - } - - return true; + return Build.IS_DEBUGGABLE || process.isDebuggable(); } public boolean startBinderTracking() throws RemoteException { @@ -16850,7 +16847,7 @@ public class ActivityManagerService extends IActivityManager.Stub } if (profilerInfo != null) { - setProfileApp(aInfo.applicationInfo, aInfo.processName, profilerInfo); + setProfileApp(aInfo.applicationInfo, aInfo.processName, profilerInfo, null); } wmLock.notify(); } @@ -17638,11 +17635,7 @@ public class ActivityManagerService extends IActivityManager.Stub throw new IllegalArgumentException("Unknown process: " + process); } - if (!Build.IS_DEBUGGABLE) { - if ((proc.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) == 0) { - throw new SecurityException("Process not debuggable: " + proc); - } - } + enforceDebuggable(proc); thread.attachAgent(path); } diff --git a/services/core/java/com/android/server/am/AppProfiler.java b/services/core/java/com/android/server/am/AppProfiler.java index ac0e22032b65..16a728386bd6 100644 --- a/services/core/java/com/android/server/am/AppProfiler.java +++ b/services/core/java/com/android/server/am/AppProfiler.java @@ -58,7 +58,6 @@ import android.content.ComponentCallbacks2; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.net.Uri; import android.os.Binder; @@ -608,13 +607,7 @@ public class AppProfiler { if (check != null) { if ((pss * 1024) >= check && profile.getThread() != null && mMemWatchDumpProcName == null) { - boolean isDebuggable = Build.IS_DEBUGGABLE; - if (!isDebuggable) { - if ((proc.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { - isDebuggable = true; - } - } - if (isDebuggable) { + if (Build.IS_DEBUGGABLE || proc.isDebuggable()) { Slog.w(TAG, "Process " + proc + " exceeded pss limit " + check + "; reporting"); startHeapDumpLPf(profile, false); } else { @@ -1702,7 +1695,8 @@ public class AppProfiler { try { if (start) { stopProfilerLPf(null, 0); - mService.setProfileApp(proc.info, proc.processName, profilerInfo); + mService.setProfileApp(proc.info, proc.processName, profilerInfo, + proc.isSdkSandbox ? proc.getClientInfoForSdkSandbox() : null); mProfileData.setProfileProc(proc); mProfileType = profileType; ParcelFileDescriptor fd = profilerInfo.profileFd; @@ -2075,7 +2069,7 @@ public class AppProfiler { if (mAppAgentMap != null && mAppAgentMap.containsKey(processName)) { // We need to do a debuggable check here. See setAgentApp for why the check is // postponed to here. - if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { + if (app.isDebuggable()) { String agent = mAppAgentMap.get(processName); // Do not overwrite already requested agent. if (profilerInfo == null) { @@ -2132,7 +2126,7 @@ public class AppProfiler { if (preBindAgent != null) { thread.attachAgent(preBindAgent); } - if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { + if (app.isDebuggable()) { thread.attachStartupAgents(app.info.dataDir); } return profilerInfo; diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 91822ac353ab..eb7897b2c678 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -799,6 +799,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub final BatteryUsageStatsQuery querySinceReset = new BatteryUsageStatsQuery.Builder() .includeProcessStateData() + .includeVirtualUids() .build(); bus = getBatteryUsageStats(List.of(querySinceReset)).get(0); break; @@ -806,6 +807,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub final BatteryUsageStatsQuery queryPowerProfile = new BatteryUsageStatsQuery.Builder() .includeProcessStateData() + .includeVirtualUids() .powerProfileModeledOnly() .build(); bus = getBatteryUsageStats(List.of(queryPowerProfile)).get(0); @@ -821,6 +823,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub final BatteryUsageStatsQuery queryBeforeReset = new BatteryUsageStatsQuery.Builder() .includeProcessStateData() + .includeVirtualUids() .aggregateSnapshots(sessionStart, sessionEnd) .build(); bus = getBatteryUsageStats(List.of(queryBeforeReset)).get(0); diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 5bb946f3cd50..253686c2602d 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -1718,8 +1718,16 @@ public final class ProcessList { int runtimeFlags = 0; boolean debuggableFlag = (app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; - if (!debuggableFlag && app.isSdkSandbox) { - debuggableFlag = isAppForSdkSandboxDebuggable(app); + boolean isProfileableByShell = app.info.isProfileableByShell(); + boolean isProfileable = app.info.isProfileable(); + + if (app.isSdkSandbox) { + ApplicationInfo clientInfo = app.getClientInfoForSdkSandbox(); + if (clientInfo != null) { + debuggableFlag |= (clientInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; + isProfileableByShell |= clientInfo.isProfileableByShell(); + isProfileable |= clientInfo.isProfileable(); + } } if (debuggableFlag) { @@ -1741,10 +1749,10 @@ public final class ProcessList { if ((app.info.flags & ApplicationInfo.FLAG_VM_SAFE_MODE) != 0 || mService.mSafeMode) { runtimeFlags |= Zygote.DEBUG_ENABLE_SAFEMODE; } - if ((app.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_PROFILEABLE_BY_SHELL) != 0) { + if (isProfileableByShell) { runtimeFlags |= Zygote.PROFILE_FROM_SHELL; } - if (app.info.isProfileable()) { + if (isProfileable) { runtimeFlags |= Zygote.PROFILEABLE; } if ("1".equals(SystemProperties.get("debug.checkjni"))) { @@ -1812,7 +1820,7 @@ public final class ProcessList { } String invokeWith = null; - if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { + if (debuggableFlag) { // Debuggable apps may include a wrapper script with their library directory. String wrapperFileName = app.info.nativeLibraryDir + "/wrap.sh"; StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads(); @@ -1887,24 +1895,6 @@ public final class ProcessList { } } - /** Return true if the client app for the SDK sandbox process is debuggable. */ - private boolean isAppForSdkSandboxDebuggable(ProcessRecord sandboxProcess) { - // TODO (b/221004701) use client app process name - final int appUid = Process.getAppUidForSdkSandboxUid(sandboxProcess.uid); - IPackageManager pm = mService.getPackageManager(); - try { - String[] packages = pm.getPackagesForUid(appUid); - for (String aPackage : packages) { - ApplicationInfo i = pm.getApplicationInfo(aPackage, 0, sandboxProcess.userId); - if ((i.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { - return true; - } - } - } catch (RemoteException e) { - // shouldn't happen - } - return false; - } @GuardedBy("mService") boolean startProcessLocked(HostingRecord hostingRecord, String entryPoint, ProcessRecord app, diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index 4908698a237f..b4ff8709a32f 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -27,6 +27,7 @@ import android.app.ApplicationExitInfo.Reason; import android.app.ApplicationExitInfo.SubReason; import android.app.IApplicationThread; import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManagerInternal; import android.content.pm.ProcessInfo; import android.content.pm.VersionedPackage; import android.content.res.CompatibilityInfo; @@ -865,6 +866,29 @@ class ProcessRecord implements WindowProcessListener { return mDebugging; } + @Nullable + public ApplicationInfo getClientInfoForSdkSandbox() { + if (!isSdkSandbox || sdkSandboxClientAppPackage == null) { + throw new IllegalStateException( + "getClientInfoForSdkSandbox called for non-sandbox process" + ); + } + PackageManagerInternal pm = mService.getPackageManagerInternal(); + return pm.getApplicationInfo( + sdkSandboxClientAppPackage, /* flags */0, Process.SYSTEM_UID, userId); + } + + public boolean isDebuggable() { + if ((info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { + return true; + } + if (isSdkSandbox) { + ApplicationInfo clientInfo = getClientInfoForSdkSandbox(); + return clientInfo != null && (clientInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; + } + return false; + } + @GuardedBy("mService") void setDebugging(boolean debugging) { mDebugging = debugging; diff --git a/services/core/java/com/android/server/ambientcontext/RemoteAmbientContextDetectionService.java b/services/core/java/com/android/server/ambientcontext/RemoteAmbientContextDetectionService.java index f42080d550b7..8aec75226958 100644 --- a/services/core/java/com/android/server/ambientcontext/RemoteAmbientContextDetectionService.java +++ b/services/core/java/com/android/server/ambientcontext/RemoteAmbientContextDetectionService.java @@ -49,6 +49,12 @@ final class RemoteAmbientContextDetectionService connect(); } + @Override + protected long getAutoDisconnectTimeoutMs() { + // Disable automatic unbinding. + return -1; + } + /** * Asks the implementation to start detection. * diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java index cd2ba393f6f2..8407a117be94 100644 --- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java @@ -1184,6 +1184,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements mAlarmManager.cancel(mBatchingAlarm); mBatchingAlarm = null; } + mGnssNative.flushBatch(); mGnssNative.stopBatch(); mBatchingStarted = false; } diff --git a/services/core/java/com/android/server/logcat/LogAccessDialogActivity.java b/services/core/java/com/android/server/logcat/LogAccessDialogActivity.java index 7116ca30c5a9..8be90e0cc622 100644 --- a/services/core/java/com/android/server/logcat/LogAccessDialogActivity.java +++ b/services/core/java/com/android/server/logcat/LogAccessDialogActivity.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -56,7 +57,7 @@ public class LogAccessDialogActivity extends Activity implements private AlertDialog.Builder mAlertDialog; private AlertDialog mAlert; - private static final int DIALOG_TIME_OUT = 300000; + private static final int DIALOG_TIME_OUT = Build.IS_DEBUGGABLE ? 60000 : 300000; private static final int MSG_DISMISS_DIALOG = 0; diff --git a/services/core/java/com/android/server/pm/ApkChecksums.java b/services/core/java/com/android/server/pm/ApkChecksums.java index aa467e782e84..2824585bf5aa 100644 --- a/services/core/java/com/android/server/pm/ApkChecksums.java +++ b/services/core/java/com/android/server/pm/ApkChecksums.java @@ -34,6 +34,7 @@ import android.content.Context; import android.content.pm.ApkChecksum; import android.content.pm.Checksum; import android.content.pm.IOnChecksumsReadyListener; +import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; import android.content.pm.Signature; import android.content.pm.SigningDetails.SignatureSchemeVersion; @@ -62,6 +63,7 @@ import android.util.apk.VerityBuilder; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.security.VerityUtils; +import com.android.server.LocalServices; import com.android.server.pm.parsing.pkg.AndroidPackage; import java.io.ByteArrayOutputStream; diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java index d117967954d3..7b2dc28a396f 100644 --- a/services/core/java/com/android/server/pm/AppsFilter.java +++ b/services/core/java/com/android/server/pm/AppsFilter.java @@ -52,6 +52,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; import com.android.internal.util.function.QuadFunction; import com.android.server.FgThread; +import com.android.server.LocalServices; import com.android.server.compat.CompatChange; import com.android.server.om.OverlayReferenceMapper; import com.android.server.pm.parsing.pkg.AndroidPackage; @@ -486,12 +487,12 @@ public class AppsFilter implements Watchable, Snappable { } /** Builder method for an AppsFilter */ - public static AppsFilter create( - PackageManagerInternal pms, PackageManagerServiceInjector injector) { + public static AppsFilter create(@NonNull PackageManagerServiceInjector injector, + @NonNull PackageManagerInternal pmInt) { final boolean forceSystemAppsQueryable = injector.getContext().getResources() .getBoolean(R.bool.config_forceSystemPackagesQueryable); - final FeatureConfigImpl featureConfig = new FeatureConfigImpl(pms, injector); + final FeatureConfigImpl featureConfig = new FeatureConfigImpl(pmInt, injector); final String[] forcedQueryablePackageNames; if (forceSystemAppsQueryable) { // all system apps already queryable, no need to read and parse individual exceptions @@ -512,7 +513,7 @@ public class AppsFilter implements Watchable, Snappable { }; AppsFilter appsFilter = new AppsFilter(stateProvider, featureConfig, forcedQueryablePackageNames, forceSystemAppsQueryable, null, - injector.getBackgroundExecutor(), pms); + injector.getBackgroundExecutor(), pmInt); featureConfig.setAppsFilter(appsFilter); return appsFilter; } diff --git a/services/core/java/com/android/server/pm/BackgroundDexOptService.java b/services/core/java/com/android/server/pm/BackgroundDexOptService.java index ecbb4a9d45a1..9ff4aab83cff 100644 --- a/services/core/java/com/android/server/pm/BackgroundDexOptService.java +++ b/services/core/java/com/android/server/pm/BackgroundDexOptService.java @@ -19,6 +19,7 @@ package com.android.server.pm; import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.job.JobInfo; import android.app.job.JobParameters; @@ -269,7 +270,7 @@ public final class BackgroundDexOptService { PackageManagerService pm = mInjector.getPackageManagerService(); ArraySet<String> packagesToOptimize; if (packageNames == null) { - packagesToOptimize = mDexOptHelper.getOptimizablePackages(); + packagesToOptimize = mDexOptHelper.getOptimizablePackages(pm.snapshotComputer()); } else { packagesToOptimize = new ArraySet<>(packageNames); } @@ -334,7 +335,7 @@ public final class BackgroundDexOptService { return false; } - ArraySet<String> pkgs = mDexOptHelper.getOptimizablePackages(); + ArraySet<String> pkgs = mDexOptHelper.getOptimizablePackages(pm.snapshotComputer()); if (pkgs.isEmpty()) { Slog.i(TAG, "No packages to optimize"); markPostBootUpdateCompleted(params); @@ -556,8 +557,8 @@ public final class BackgroundDexOptService { } /** Gets the size of a package. */ - private long getPackageSize(PackageManagerService pm, String pkg) { - PackageInfo info = pm.snapshotComputer().getPackageInfo(pkg, 0, UserHandle.USER_SYSTEM); + private long getPackageSize(@NonNull Computer snapshot, String pkg) { + PackageInfo info = snapshot.getPackageInfo(pkg, 0, UserHandle.USER_SYSTEM); long size = 0; if (info != null && info.applicationInfo != null) { File path = Paths.get(info.applicationInfo.sourceDir).toFile(); @@ -605,8 +606,9 @@ public final class BackgroundDexOptService { Slog.d(TAG, "Should Downgrade " + shouldDowngrade); } if (shouldDowngrade) { + final Computer snapshot = pm.snapshotComputer(); Set<String> unusedPackages = - pm.getUnusedPackages(mDowngradeUnusedAppsThresholdInMillis); + snapshot.getUnusedPackages(mDowngradeUnusedAppsThresholdInMillis); if (DEBUG) { Slog.d(TAG, "Unsused Packages " + String.join(",", unusedPackages)); } @@ -618,7 +620,7 @@ public final class BackgroundDexOptService { // Should be aborted by the scheduler. return abortCode; } - @DexOptResult int downgradeResult = downgradePackage(pm, pkg, + @DexOptResult int downgradeResult = downgradePackage(snapshot, pm, pkg, /* isForPrimaryDex= */ true, isPostBootUpdate); if (downgradeResult == PackageDexOptimizer.DEX_OPT_PERFORMED) { updatedPackages.add(pkg); @@ -629,7 +631,7 @@ public final class BackgroundDexOptService { return status; } if (supportSecondaryDex) { - downgradeResult = downgradePackage(pm, pkg, + downgradeResult = downgradePackage(snapshot, pm, pkg, /* isForPrimaryDex= */false, isPostBootUpdate); status = convertPackageDexOptimizerStatusToInternal(downgradeResult); if (status != STATUS_OK) { @@ -696,8 +698,8 @@ public final class BackgroundDexOptService { * @return PackageDexOptimizer.DEX_* */ @DexOptResult - private int downgradePackage(PackageManagerService pm, String pkg, boolean isForPrimaryDex, - boolean isPostBootUpdate) { + private int downgradePackage(@NonNull Computer snapshot, PackageManagerService pm, String pkg, + boolean isForPrimaryDex, boolean isPostBootUpdate) { if (DEBUG) { Slog.d(TAG, "Downgrading " + pkg); } @@ -709,15 +711,15 @@ public final class BackgroundDexOptService { if (!isPostBootUpdate) { dexoptFlags |= DexoptOptions.DEXOPT_IDLE_BACKGROUND_JOB; } - long package_size_before = getPackageSize(pm, pkg); + long package_size_before = getPackageSize(snapshot, pkg); int result = PackageDexOptimizer.DEX_OPT_SKIPPED; if (isForPrimaryDex || PLATFORM_PACKAGE_NAME.equals(pkg)) { // This applies for system apps or if packages location is not a directory, i.e. // monolithic install. - if (!pm.canHaveOatDir(pkg)) { + if (!pm.canHaveOatDir(snapshot, pkg)) { // For apps that don't have the oat directory, instead of downgrading, // remove their compiler artifacts from dalvik cache. - pm.deleteOatArtifactsOfPackage(pkg); + pm.deleteOatArtifactsOfPackage(snapshot, pkg); } else { result = performDexOptPrimary(pkg, reason, dexoptFlags); } @@ -726,8 +728,9 @@ public final class BackgroundDexOptService { } if (result == PackageDexOptimizer.DEX_OPT_PERFORMED) { + final Computer newSnapshot = pm.snapshotComputer(); FrameworkStatsLog.write(FrameworkStatsLog.APP_DOWNGRADED, pkg, package_size_before, - getPackageSize(pm, pkg), /*aggressive=*/ false); + getPackageSize(newSnapshot, pkg), /*aggressive=*/ false); } return result; } diff --git a/services/core/java/com/android/server/pm/Computer.java b/services/core/java/com/android/server/pm/Computer.java index 6103d688e2b1..8e853019de90 100644 --- a/services/core/java/com/android/server/pm/Computer.java +++ b/services/core/java/com/android/server/pm/Computer.java @@ -58,10 +58,6 @@ import com.android.server.utils.WatchedLongSparseArray; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; import java.util.List; import java.util.Set; @@ -92,92 +88,69 @@ import java.util.Set; * and other managers (like PermissionManager) mean deadlock is possible. On the * other hand, not overriding in {@link ComputerLocked} may leave a function walking * unstable data. - * - * To coax developers to consider such issues carefully, all methods in - * {@link Computer} must be annotated with <code>@LiveImplementation(override = - * MANDATORY)</code> or <code>LiveImplementation(locked = NOT_ALLOWED)</code>. A unit - * test verifies the annotation and that the annotation corresponds to the code in - * {@link ComputerEngine} and {@link ComputerLocked}. */ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) public interface Computer extends PackageDataSnapshot { /** - * Every method must be annotated. - */ - @Target({ ElementType.METHOD }) - @Retention(RetentionPolicy.RUNTIME) - @interface LiveImplementation { - // A Computer method must be annotated with one of the following values: - // MANDATORY - the method must be overridden in ComputerEngineLive. The - // format of the override is a call to the super method, wrapped in a - // synchronization block. - // NOT_ALLOWED - the method may not appear in the live computer. It must - // be final in the ComputerEngine. - int MANDATORY = 1; - int NOT_ALLOWED = 2; - int override() default MANDATORY; - String rationale() default ""; - } - - /** * Administrative statistics: record that the snapshot has been used. Every call * to use() increments the usage counter. */ - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) default void use() { } /** * Fetch the snapshot usage counter. * @return The number of times this snapshot was used. */ - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) default int getUsed() { return 0; } - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) @NonNull List<ResolveInfo> queryIntentActivitiesInternal(Intent intent, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, @PackageManagerInternal.PrivateResolveFlags long privateResolveFlags, int filterCallingUid, int userId, boolean resolveForStart, boolean allowDynamicSplits); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) @NonNull List<ResolveInfo> queryIntentActivitiesInternal(Intent intent, String resolvedType, long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) @NonNull List<ResolveInfo> queryIntentServicesInternal(Intent intent, String resolvedType, long flags, int userId, int callingUid, boolean includeInstantApps); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) @NonNull QueryIntentActivitiesResult queryIntentActivitiesInternalBody(Intent intent, String resolvedType, long flags, int filterCallingUid, int userId, boolean resolveForStart, boolean allowDynamicSplits, String pkgName, String instantAppPkgName); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) ActivityInfo getActivityInfo(ComponentName component, long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) + + /** + * Important: The provided filterCallingUid is used exclusively to filter out activities + * that can be seen based on user state. It's typically the original caller uid prior + * to clearing. Because it can only be provided by trusted code, its value can be + * trusted and will be used as-is; unlike userId which will be validated by this method. + */ ActivityInfo getActivityInfoInternal(ComponentName component, long flags, int filterCallingUid, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) AndroidPackage getPackage(String packageName); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) AndroidPackage getPackage(int uid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) ApplicationInfo generateApplicationInfoFromSettings(String packageName, long flags, int filterCallingUid, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) ApplicationInfo getApplicationInfo(String packageName, long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) + + /** + * Important: The provided filterCallingUid is used exclusively to filter out applications + * that can be seen based on user state. It's typically the original caller uid prior + * to clearing. Because it can only be provided by trusted code, its value can be + * trusted and will be used as-is; unlike userId which will be validated by this method. + */ ApplicationInfo getApplicationInfoInternal(String packageName, long flags, int filterCallingUid, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) + + /** + * Report the 'Home' activity which is currently set as "always use this one". If non is set + * then reports the most likely home activity or null if there are more than one. + */ ComponentName getDefaultHomeActivity(int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) ComponentName getHomeActivitiesAsUser(List<ResolveInfo> allHomeCandidates, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) CrossProfileDomainInfo getCrossProfileDomainPreferredLpr(Intent intent, String resolvedType, long flags, int sourceUserId, int parentUserId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) Intent getHomeIntent(); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) List<CrossProfileIntentFilter> getMatchingCrossProfileIntentFilters(Intent intent, String resolvedType, int userId); @@ -192,15 +165,11 @@ public interface Computer extends PackageDataSnapshot { * @param intent * @return A filtered list of resolved activities. */ - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) List<ResolveInfo> applyPostResolutionFilter(@NonNull List<ResolveInfo> resolveInfos, String ephemeralPkgName, boolean allowDynamicSplits, int filterCallingUid, boolean resolveForStart, int userId, Intent intent); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) PackageInfo generatePackageInfo(PackageStateInternal ps, long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) PackageInfo getPackageInfo(String packageName, long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) PackageInfo getPackageInfoInternal(String packageName, long versionCode, long flags, int filterCallingUid, int userId); @@ -209,79 +178,69 @@ public interface Computer extends PackageDataSnapshot { * known {@link PackageState} instances without a {@link PackageState#getAndroidPackage()} * will not be represented. */ - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) String[] getAllAvailablePackageNames(); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) PackageStateInternal getPackageStateInternal(String packageName); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) PackageStateInternal getPackageStateInternal(String packageName, int callingUid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) - @Nullable PackageState getPackageStateCopied(@NonNull String packageName); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) ParceledListSlice<PackageInfo> getInstalledPackages(long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) ResolveInfo createForwardingResolveInfoUnchecked(WatchedIntentFilter filter, int sourceUserId, int targetUserId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) ServiceInfo getServiceInfo(ComponentName component, long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) SharedLibraryInfo getSharedLibraryInfo(String name, long version); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) String getInstantAppPackageName(int callingUid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) String resolveExternalPackageName(AndroidPackage pkg); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) String resolveInternalPackageName(String packageName, long versionCode); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) String[] getPackagesForUid(int uid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) UserInfo getProfileParent(int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean canViewInstantApps(int callingUid, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean filterSharedLibPackage(@Nullable PackageStateInternal ps, int uid, int userId, long flags); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean isCallerSameApp(String packageName, int uid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean isComponentVisibleToInstantApp(@Nullable ComponentName component); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean isComponentVisibleToInstantApp(@Nullable ComponentName component, @PackageManager.ComponentType int type); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) - boolean isImplicitImageCaptureIntentAndNotSetByDpcLocked(Intent intent, int userId, + + /** + * From Android R, camera intents have to match system apps. The only exception to this is if + * the DPC has set the camera persistent preferred activity. This case was introduced + * because it is important that the DPC has the ability to set both system and non-system + * camera persistent preferred activities. + * + * @return {@code true} if the intent is a camera intent and the persistent preferred + * activity was not set by the DPC. + */ + boolean isImplicitImageCaptureIntentAndNotSetByDpc(Intent intent, int userId, String resolvedType, long flags); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean isInstantApp(String packageName, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean isInstantAppInternal(String packageName, @UserIdInt int userId, int callingUid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean isSameProfileGroup(@UserIdInt int callerUserId, @UserIdInt int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean shouldFilterApplication(@Nullable PackageStateInternal ps, int callingUid, @Nullable ComponentName component, @PackageManager.ComponentType int componentType, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean shouldFilterApplication(@Nullable PackageStateInternal ps, int callingUid, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) boolean shouldFilterApplication(@NonNull SharedUserSetting sus, int callingUid, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) int checkUidPermission(String permName, int uid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) int getPackageUidInternal(String packageName, long flags, int userId, int callingUid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) long updateFlagsForApplication(long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) long updateFlagsForComponent(long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) long updateFlagsForPackage(long flags, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) + + /** + * Update given flags when being used to request {@link ResolveInfo}. + * <p>Instant apps are resolved specially, depending upon context. Minimally, + * {@code}flags{@code} must have the {@link PackageManager#MATCH_INSTANT} + * flag set. However, this flag is only honoured in three circumstances: + * <ul> + * <li>when called from a system process</li> + * <li>when the caller holds the permission {@code android.permission.ACCESS_INSTANT_APPS}</li> + * <li>when resolution occurs to start an activity with a {@code android.intent.action.VIEW} + * action and a {@code android.intent.category.BROWSABLE} category</li> + * </ul> + */ long updateFlagsForResolve(long flags, int userId, int callingUid, boolean wantInstantApps, boolean isImplicitImageCaptureIntentAndNotSetByDpc); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) long updateFlagsForResolve(long flags, int userId, int callingUid, boolean wantInstantApps, boolean onlyExposedExplicitly, boolean isImplicitImageCaptureIntentAndNotSetByDpc); @@ -299,117 +258,99 @@ public interface Computer extends PackageDataSnapshot { * @param checkShell whether to prevent shell from access if there's a debugging restriction * @param message the message to log on security exception */ - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) void enforceCrossUserOrProfilePermission(int callingUid, @UserIdInt int userId, boolean requireFullPermission, boolean checkShell, String message); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) + + /** + * Enforces the request is from the system or an app that has INTERACT_ACROSS_USERS + * or INTERACT_ACROSS_USERS_FULL permissions, if the {@code userId} is not for the caller. + * + * @param checkShell whether to prevent shell from access if there's a debugging restriction + * @param message the message to log on security exception + */ void enforceCrossUserPermission(int callingUid, @UserIdInt int userId, boolean requireFullPermission, boolean checkShell, String message); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) void enforceCrossUserPermission(int callingUid, @UserIdInt int userId, boolean requireFullPermission, boolean checkShell, boolean requirePermissionWhenSameUser, String message); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) SigningDetails getSigningDetails(@NonNull String packageName); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) SigningDetails getSigningDetails(int uid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) boolean filterAppAccess(AndroidPackage pkg, int callingUid, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) boolean filterAppAccess(String packageName, int callingUid, int userId); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) boolean filterAppAccess(int uid, int callingUid); - @Computer.LiveImplementation(override = Computer.LiveImplementation.MANDATORY) void dump(int type, FileDescriptor fd, PrintWriter pw, DumpState dumpState); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) PackageManagerService.FindPreferredActivityBodyResult findPreferredActivityInternal( Intent intent, String resolvedType, long flags, List<ResolveInfo> query, boolean always, boolean removeMatches, boolean debug, int userId, boolean queryMayBeFiltered); - @Computer.LiveImplementation(override = Computer.LiveImplementation.NOT_ALLOWED) - ResolveInfo findPersistentPreferredActivityLP(Intent intent, String resolvedType, long flags, + ResolveInfo findPersistentPreferredActivity(Intent intent, String resolvedType, long flags, List<ResolveInfo> query, boolean debug, int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) PreferredIntentResolver getPreferredActivities(@UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull ArrayMap<String, ? extends PackageStateInternal> getPackageStates(); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable String getRenamedPackage(@NonNull String packageName); /** * @return set of packages to notify */ - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull ArraySet<String> getNotifyPackagesForReplacedReceived(@NonNull String[] packages); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @PackageManagerService.PackageStartability int getPackageStartability(boolean safeMode, @NonNull String packageName, int callingUid, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean isPackageAvailable(String packageName, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull String[] currentToCanonicalPackageNames(@NonNull String[] names); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull String[] canonicalToCurrentPackageNames(@NonNull String[] names); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull int[] getPackageGids(@NonNull String packageName, @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) int getTargetSdkVersion(@NonNull String packageName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean activitySupportsIntent(@NonNull ComponentName resolveComponentName, @NonNull ComponentName component, @NonNull Intent intent, String resolvedType); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable ActivityInfo getReceiverInfo(@NonNull ComponentName component, @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable ParceledListSlice<SharedLibraryInfo> getSharedLibraries(@NonNull String packageName, @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean canRequestPackageInstalls(@NonNull String packageName, int callingUid, int userId, boolean throwIfPermNotDeclared); - @Computer.LiveImplementation(override = LiveImplementation.NOT_ALLOWED) + /** + * Returns true if the system or user is explicitly preventing an otherwise valid installer to + * complete an install. This includes checks like unknown sources and user restrictions. + */ boolean isInstallDisabledForPackage(@NonNull String packageName, int uid, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable List<VersionedPackage> getPackagesUsingSharedLibrary(@NonNull SharedLibraryInfo libInfo, @PackageManager.PackageInfoFlagsBits long flags, int callingUid, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable ParceledListSlice<SharedLibraryInfo> getDeclaredSharedLibraries( @NonNull String packageName, @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable ProviderInfo getProviderInfo(@NonNull ComponentName component, @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable String[] getSystemSharedLibraryNames(); @@ -417,136 +358,103 @@ public interface Computer extends PackageDataSnapshot { * @return the state if the given package has a state and isn't filtered by visibility. * Provides no guarantee that the package is in any usable state. */ - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable PackageStateInternal getPackageStateFiltered(@NonNull String packageName, int callingUid, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) int checkSignatures(@NonNull String pkg1, @NonNull String pkg2); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) int checkUidSignatures(int uid1, int uid2); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean hasSigningCertificate(@NonNull String packageName, @NonNull byte[] certificate, @PackageManager.CertificateInputType int type); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean hasUidSigningCertificate(int uid, @NonNull byte[] certificate, @PackageManager.CertificateInputType int type); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull List<String> getAllPackages(); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable String getNameForUid(int uid); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable String[] getNamesForUids(@NonNull int[] uids); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) int getUidForSharedUser(@NonNull String sharedUserName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) int getFlagsForUid(int uid); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) int getPrivateFlagsForUid(int uid); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean isUidPrivileged(int uid); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull String[] getAppOpPermissionPackages(@NonNull String permissionName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(@NonNull String[] permissions, @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull List<ApplicationInfo> getInstalledApplications( @PackageManager.ApplicationInfoFlagsBits long flags, @UserIdInt int userId, int callingUid); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable ProviderInfo resolveContentProvider(@NonNull String name, @PackageManager.ResolveInfoFlagsBits long flags, @UserIdInt int userId, int callingUid); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable ProviderInfo getGrantImplicitAccessProviderInfo(int recipientUid, @NonNull String visibleAuthority); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) void querySyncProviders(boolean safeMode, @NonNull List<String> outNames, @NonNull List<ProviderInfo> outInfo); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull ParceledListSlice<ProviderInfo> queryContentProviders(@Nullable String processName, int uid, @PackageManager.ComponentInfoFlagsBits long flags, @Nullable String metaDataKey); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable InstrumentationInfo getInstrumentationInfo(@NonNull ComponentName component, int flags); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull ParceledListSlice<InstrumentationInfo> queryInstrumentation( @NonNull String targetPackage, int flags); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull List<PackageStateInternal> findSharedNonSystemLibraries( @NonNull PackageStateInternal pkgSetting); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean getApplicationHiddenSettingAsUser(@NonNull String packageName, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean isPackageSuspendedForUser(@NonNull String packageName, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean isSuspendingAnyPackages(@NonNull String suspendingPackage, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull ParceledListSlice<IntentFilter> getAllIntentFilters(@NonNull String packageName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean getBlockUninstallForUser(@NonNull String packageName, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable SparseArray<int[]> getBroadcastAllowList(@NonNull String packageName, @UserIdInt int[] userIds, boolean isInstantApp); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable String getInstallerPackageName(@NonNull String packageName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable InstallSourceInfo getInstallSourceInfo(@NonNull String packageName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @PackageManager.EnabledState int getApplicationEnabledSetting(@NonNull String packageName, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @PackageManager.EnabledState int getComponentEnabledSetting(@NonNull ComponentName component, int callingUid, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @PackageManager.EnabledState int getComponentEnabledSettingInternal(@NonNull ComponentName component, int callingUid, @UserIdInt int userId); @@ -557,25 +465,19 @@ public interface Computer extends PackageDataSnapshot { * are all effectively enabled for the given component. Or if the component cannot be found, * returns false. */ - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean isComponentEffectivelyEnabled(@NonNull ComponentInfo componentInfo, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable KeySet getKeySetByAlias(@NonNull String packageName, @NonNull String alias); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable KeySet getSigningKeySet(@NonNull String packageName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean isPackageSignedByKeySet(@NonNull String packageName, @NonNull KeySet ks); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean isPackageSignedByKeySetExactly(@NonNull String packageName, @NonNull KeySet ks); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable int[] getVisibilityAllowList(@NonNull String packageName, @UserIdInt int userId); @@ -585,49 +487,37 @@ public interface Computer extends PackageDataSnapshot { * package visibility filtering is enabled on it. If the UID is part of a shared user ID, * return {@code true} if any one application belongs to the shared user ID meets the criteria. */ - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean canQueryPackage(int callingUid, @Nullable String targetPackageName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) int getPackageUid(@NonNull String packageName, @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean canAccessComponent(int callingUid, @NonNull ComponentName component, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean isCallerInstallerOfRecord(@NonNull AndroidPackage pkg, int callingUid); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @PackageManager.InstallReason int getInstallReason(@NonNull String packageName, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean canPackageQuery(@NonNull String sourcePackageName, @NonNull String targetPackageName, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean canForwardTo(@NonNull Intent intent, @Nullable String resolvedType, @UserIdInt int sourceUserId, @UserIdInt int targetUserId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull List<ApplicationInfo> getPersistentApplications(boolean safeMode, int flags); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull SparseArray<String> getAppsWithSharedUserIds(); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull String[] getSharedUserPackagesForPackage(@NonNull String packageName, @UserIdInt int userId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull Set<String> getUnusedPackages(long downgradeTimeThresholdMillis); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable CharSequence getHarmfulAppWarning(@NonNull String packageName, @UserIdInt int userId); @@ -638,55 +528,49 @@ public interface Computer extends PackageDataSnapshot { * * @return The filtered packages */ - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull String[] filterOnlySystemPackages(@Nullable String... pkgNames); // The methods in this block should be removed once SettingBase is interface snapshotted - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull List<AndroidPackage> getPackagesForAppId(int appId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) int getUidTargetSdkVersion(int uid); /** * @see PackageManagerInternal#getProcessesForUid(int) */ - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable ArrayMap<String, ProcessInfo> getProcessesForUid(int uid); // End block - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) boolean getBlockUninstall(@UserIdInt int userId, @NonNull String packageName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>> getSharedLibraries(); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable Pair<PackageStateInternal, SharedUserApi> getPackageOrSharedUser(int appId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable SharedUserApi getSharedUser(int sharedUserAppIde); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull ArraySet<PackageStateInternal> getSharedUserPackages(int sharedUserAppId); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @NonNull ComponentResolverApi getComponentResolver(); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable PackageStateInternal getDisabledSystemPackage(@NonNull String packageName); - @Computer.LiveImplementation(override = LiveImplementation.MANDATORY) @Nullable ResolveInfo getInstantAppInstallerInfo(); + + @NonNull + WatchedArrayMap<String, Integer> getFrozenPackages(); + + @Nullable + ComponentName getInstantAppInstallerComponent(); } diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java index 0c9855b2385d..06e827a8897f 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java @@ -466,7 +466,7 @@ public class ComputerEngine implements Computer { flags = updateFlagsForResolve(flags, userId, filterCallingUid, resolveForStart, comp != null || pkgName != null /*onlyExposedExplicitly*/, - isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, userId, resolvedType, + isImplicitImageCaptureIntentAndNotSetByDpc(intent, userId, resolvedType, flags)); List<ResolveInfo> list = Collections.emptyList(); boolean skipPostResolution = false; @@ -1722,15 +1722,6 @@ public class ComputerEngine implements Computer { return mSettings.getPackage(packageName); } - @Nullable - public PackageState getPackageStateCopied(@NonNull String packageName) { - int callingUid = Binder.getCallingUid(); - packageName = resolveInternalPackageNameInternalLocked( - packageName, PackageManager.VERSION_CODE_HIGHEST, callingUid); - PackageStateInternal pkgSetting = mSettings.getPackage(packageName); - return pkgSetting == null ? null : PackageStateImpl.copy(pkgSetting); - } - public final ParceledListSlice<PackageInfo> getInstalledPackages(long flags, int userId) { final int callingUid = Binder.getCallingUid(); if (getInstantAppPackageName(callingUid) != null) { @@ -2468,7 +2459,7 @@ public class ComputerEngine implements Computer { * @return {@code true} if the intent is a camera intent and the persistent preferred * activity was not set by the DPC. */ - public final boolean isImplicitImageCaptureIntentAndNotSetByDpcLocked(Intent intent, + public final boolean isImplicitImageCaptureIntentAndNotSetByDpc(Intent intent, int userId, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags) { return intent.isImplicitImageCaptureIntent() && !isPersistentPreferredActivitySetByDpm( intent, userId, resolvedType, flags); @@ -3228,12 +3219,12 @@ public class ComputerEngine implements Computer { flags = updateFlagsForResolve( flags, userId, callingUid, false /*includeInstantApps*/, - isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, userId, + isImplicitImageCaptureIntentAndNotSetByDpc(intent, userId, resolvedType, flags)); intent = PackageManagerServiceUtils.updateIntentForResolve(intent); // Try to find a matching persistent preferred activity. - result.mPreferredResolveInfo = findPersistentPreferredActivityLP(intent, + result.mPreferredResolveInfo = findPersistentPreferredActivity(intent, resolvedType, flags, query, debug, userId); // If a persistent preferred activity matched, use it. @@ -3444,7 +3435,7 @@ public class ComputerEngine implements Computer { userId, queryMayBeFiltered, callingUid, isDeviceProvisioned); } - public final ResolveInfo findPersistentPreferredActivityLP(Intent intent, + public final ResolveInfo findPersistentPreferredActivity(Intent intent, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, List<ResolveInfo> query, boolean debug, int userId) { final int n = query.size(); @@ -5418,7 +5409,7 @@ public class ComputerEngine implements Computer { } long flags = updateFlagsForResolve(0, parent.id, callingUid, false /*includeInstantApps*/, - isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, parent.id, + isImplicitImageCaptureIntentAndNotSetByDpc(intent, parent.id, resolvedType, 0)); flags |= PackageManager.MATCH_DEFAULT_ONLY; CrossProfileDomainInfo xpDomainInfo = getCrossProfileDomainPreferredLpr( @@ -5694,4 +5685,17 @@ public class ComputerEngine implements Computer { public ResolveInfo getInstantAppInstallerInfo() { return mInstantAppInstallerInfo; } + + @NonNull + @Override + public WatchedArrayMap<String, Integer> getFrozenPackages() { + return mFrozenPackages; + } + + @Nullable + @Override + public ComponentName getInstantAppInstallerComponent() { + return mLocalInstantAppInstallerActivity == null + ? null : mLocalInstantAppInstallerActivity.getComponentName(); + } } diff --git a/services/core/java/com/android/server/pm/ComputerLocked.java b/services/core/java/com/android/server/pm/ComputerLocked.java index 5d89c7daeaf5..af196d51331f 100644 --- a/services/core/java/com/android/server/pm/ComputerLocked.java +++ b/services/core/java/com/android/server/pm/ComputerLocked.java @@ -16,62 +16,21 @@ package com.android.server.pm; -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.annotation.UserIdInt; import android.content.ComponentName; -import android.content.Intent; -import android.content.IntentFilter; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; -import android.content.pm.ComponentInfo; -import android.content.pm.InstallSourceInfo; -import android.content.pm.InstrumentationInfo; -import android.content.pm.KeySet; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.content.pm.ParceledListSlice; -import android.content.pm.ProcessInfo; -import android.content.pm.ProviderInfo; -import android.content.pm.ResolveInfo; -import android.content.pm.ServiceInfo; -import android.content.pm.SharedLibraryInfo; -import android.content.pm.SigningDetails; -import android.content.pm.VersionedPackage; -import android.util.ArrayMap; -import android.util.ArraySet; -import android.util.Pair; -import android.util.SparseArray; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.pm.parsing.pkg.AndroidPackage; -import com.android.server.pm.pkg.PackageState; -import com.android.server.pm.pkg.PackageStateInternal; -import com.android.server.pm.pkg.SharedUserApi; -import com.android.server.pm.resolution.ComponentResolverApi; -import com.android.server.utils.WatchedArrayMap; -import com.android.server.utils.WatchedLongSparseArray; - -import java.io.FileDescriptor; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; /** * This subclass is the external interface to the live computer. Some internal helper - * methods are overridden to fetch live data instead of snapshot data. For each - * Computer interface that is overridden in this class, the override takes the PM lock - * and then delegates to the live computer engine. This is required because there are - * no locks taken in the engine itself. + * methods are overridden to fetch live data instead of snapshot data. */ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) public final class ComputerLocked extends ComputerEngine { - private final Object mLock; ComputerLocked(PackageManagerService.Snapshot args) { super(args); - mLock = mService.mLock; } protected ComponentName resolveComponentName() { @@ -83,814 +42,4 @@ public final class ComputerLocked extends ComputerEngine { protected ApplicationInfo androidApplication() { return mService.getCoreAndroidApplication(); } - - public @NonNull List<ResolveInfo> queryIntentServicesInternalBody(Intent intent, - String resolvedType, int flags, int userId, int callingUid, - String instantAppPkgName) { - synchronized (mLock) { - return super.queryIntentServicesInternalBody(intent, resolvedType, flags, userId, - callingUid, instantAppPkgName); - } - } - public @NonNull QueryIntentActivitiesResult queryIntentActivitiesInternalBody( - Intent intent, String resolvedType, long flags, int filterCallingUid, int userId, - boolean resolveForStart, boolean allowDynamicSplits, String pkgName, - String instantAppPkgName) { - synchronized (mLock) { - return super.queryIntentActivitiesInternalBody(intent, resolvedType, flags, - filterCallingUid, userId, resolveForStart, allowDynamicSplits, pkgName, - instantAppPkgName); - } - } - public ActivityInfo getActivityInfoInternalBody(ComponentName component, int flags, - int filterCallingUid, int userId) { - synchronized (mLock) { - return super.getActivityInfoInternalBody(component, flags, filterCallingUid, - userId); - } - } - public AndroidPackage getPackage(String packageName) { - synchronized (mLock) { - return super.getPackage(packageName); - } - } - public AndroidPackage getPackage(int uid) { - synchronized (mLock) { - return super.getPackage(uid); - } - } - public ApplicationInfo getApplicationInfoInternalBody(String packageName, int flags, - int filterCallingUid, int userId) { - synchronized (mLock) { - return super.getApplicationInfoInternalBody(packageName, flags, filterCallingUid, - userId); - } - } - public ArrayList<ResolveInfo> filterCandidatesWithDomainPreferredActivitiesLPrBody( - Intent intent, int matchFlags, List<ResolveInfo> candidates, - CrossProfileDomainInfo xpDomainInfo, int userId, boolean debug) { - synchronized (mLock) { - return super.filterCandidatesWithDomainPreferredActivitiesLPrBody(intent, - matchFlags, candidates, xpDomainInfo, userId, debug); - } - } - public PackageInfo getPackageInfoInternalBody(String packageName, long versionCode, - int flags, int filterCallingUid, int userId) { - synchronized (mLock) { - return super.getPackageInfoInternalBody(packageName, versionCode, flags, - filterCallingUid, userId); - } - } - - @Override - public String[] getAllAvailablePackageNames() { - synchronized (mLock) { - return super.getAllAvailablePackageNames(); - } - } - - public PackageStateInternal getPackageStateInternal(String packageName, int callingUid) { - synchronized (mLock) { - return super.getPackageStateInternal(packageName, callingUid); - } - } - - @Nullable - public PackageState getPackageStateCopied(@NonNull String packageName) { - synchronized (mLock) { - return super.getPackageStateCopied(packageName); - } - } - - public ParceledListSlice<PackageInfo> getInstalledPackagesBody(int flags, int userId, - int callingUid) { - synchronized (mLock) { - return super.getInstalledPackagesBody(flags, userId, callingUid); - } - } - public ServiceInfo getServiceInfoBody(ComponentName component, int flags, int userId, - int callingUid) { - synchronized (mLock) { - return super.getServiceInfoBody(component, flags, userId, callingUid); - } - } - public String getInstantAppPackageName(int callingUid) { - synchronized (mLock) { - return super.getInstantAppPackageName(callingUid); - } - } - public String[] getPackagesForUidInternalBody(int callingUid, int userId, int appId, - boolean isCallerInstantApp) { - synchronized (mLock) { - return super.getPackagesForUidInternalBody(callingUid, userId, appId, - isCallerInstantApp); - } - } - public boolean isInstantAppInternalBody(String packageName, @UserIdInt int userId, - int callingUid) { - synchronized (mLock) { - return super.isInstantAppInternalBody(packageName, userId, callingUid); - } - } - public boolean isInstantAppResolutionAllowedBody(Intent intent, - List<ResolveInfo> resolvedActivities, int userId, boolean skipPackageCheck, - int flags) { - synchronized (mLock) { - return super.isInstantAppResolutionAllowedBody(intent, resolvedActivities, userId, - skipPackageCheck, flags); - } - } - public int getPackageUidInternal(String packageName, int flags, int userId, - int callingUid) { - synchronized (mLock) { - return super.getPackageUidInternal(packageName, flags, userId, callingUid); - } - } - public SigningDetails getSigningDetails(@NonNull String packageName) { - synchronized (mLock) { - return super.getSigningDetails(packageName); - } - } - public SigningDetails getSigningDetails(int uid) { - synchronized (mLock) { - return super.getSigningDetails(uid); - } - } - public boolean filterAppAccess(AndroidPackage pkg, int callingUid, int userId) { - synchronized (mLock) { - return super.filterAppAccess(pkg, callingUid, userId); - } - } - public boolean filterAppAccess(String packageName, int callingUid, int userId) { - synchronized (mLock) { - return super.filterAppAccess(packageName, callingUid, userId); - } - } - public boolean filterAppAccess(int uid, int callingUid) { - synchronized (mLock) { - return super.filterAppAccess(uid, callingUid); - } - } - public void dump(int type, FileDescriptor fd, PrintWriter pw, DumpState dumpState) { - synchronized (mLock) { - super.dump(type, fd, pw, dumpState); - } - } - public PackageManagerService.FindPreferredActivityBodyResult findPreferredActivityBody( - Intent intent, String resolvedType, int flags, List<ResolveInfo> query, boolean always, - boolean removeMatches, boolean debug, int userId, boolean queryMayBeFiltered, - int callingUid, boolean isDeviceProvisioned) { - synchronized (mLock) { - return super.findPreferredActivityBody(intent, resolvedType, flags, query, always, - removeMatches, debug, userId, queryMayBeFiltered, callingUid, - isDeviceProvisioned); - } - } - - @Override - public PreferredIntentResolver getPreferredActivities(int userId) { - synchronized (mLock) { - return super.getPreferredActivities(userId); - } - } - - @NonNull - @Override - public ArrayMap<String, ? extends PackageStateInternal> getPackageStates() { - synchronized (mLock) { - return super.getPackageStates(); - } - } - - @Nullable - @Override - public String getRenamedPackage(@NonNull String packageName) { - synchronized (mLock) { - return super.getRenamedPackage(packageName); - } - } - - @NonNull - @Override - public ArraySet<String> getNotifyPackagesForReplacedReceived(@NonNull String[] packages) { - synchronized (mLock) { - return super.getNotifyPackagesForReplacedReceived(packages); - } - } - - @Override - public int getPackageStartability(boolean safeMode, @NonNull String packageName, int callingUid, - @UserIdInt int userId) { - synchronized (mLock) { - return super.getPackageStartability(safeMode, packageName, callingUid, userId); - } - } - - @Override - public boolean isPackageAvailable(String packageName, @UserIdInt int userId) { - synchronized (mLock) { - return super.isPackageAvailable(packageName, userId); - } - } - - @Override - public String[] currentToCanonicalPackageNames(String[] names) { - synchronized (mLock) { - return super.currentToCanonicalPackageNames(names); - } - } - - @Override - public String[] canonicalToCurrentPackageNames(String[] names) { - synchronized (mLock) { - return super.canonicalToCurrentPackageNames(names); - } - } - - @Override - public int[] getPackageGids(@NonNull String packageName, - @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId) { - synchronized (mLock) { - return super.getPackageGids(packageName, flags, userId); - } - } - - @Override - public int getTargetSdkVersion(@NonNull String packageName) { - synchronized (mLock) { - return super.getTargetSdkVersion(packageName); - } - } - - @Override - public boolean activitySupportsIntent(@NonNull ComponentName resolveComponentName, - @NonNull ComponentName component, @NonNull Intent intent, String resolvedType) { - synchronized (mLock) { - return super.activitySupportsIntent(resolveComponentName, component, intent, - resolvedType); - } - } - - @Nullable - @Override - public ActivityInfo getReceiverInfo(@NonNull ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId) { - synchronized (mLock) { - return super.getReceiverInfo(component, flags, userId); - } - } - - @Nullable - @Override - public ParceledListSlice<SharedLibraryInfo> getSharedLibraries(@NonNull String packageName, - @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId) { - synchronized (mLock) { - return super.getSharedLibraries(packageName, flags, userId); - } - } - - @Override - public boolean canRequestPackageInstalls(@NonNull String packageName, int callingUid, - @UserIdInt int userId, boolean throwIfPermNotDeclared) { - synchronized (mLock) { - return super.canRequestPackageInstalls(packageName, callingUid, userId, - throwIfPermNotDeclared); - } - } - - @Override - public List<VersionedPackage> getPackagesUsingSharedLibrary(@NonNull SharedLibraryInfo libInfo, - @PackageManager.PackageInfoFlagsBits long flags, int callingUid, - @UserIdInt int userId) { - synchronized (mLock) { - return super.getPackagesUsingSharedLibrary(libInfo, flags, callingUid, userId); - } - } - - @Nullable - @Override - public ParceledListSlice<SharedLibraryInfo> getDeclaredSharedLibraries( - @NonNull String packageName, @PackageManager.PackageInfoFlagsBits long flags, - @UserIdInt int userId) { - synchronized (mLock) { - return super.getDeclaredSharedLibraries(packageName, flags, userId); - } - } - - @Nullable - @Override - public ProviderInfo getProviderInfo(@NonNull ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId) { - synchronized (mLock) { - return super.getProviderInfo(component, flags, userId); - } - } - - @Nullable - @Override - public String[] getSystemSharedLibraryNames() { - synchronized (mLock) { - return super.getSystemSharedLibraryNames(); - } - } - - @Override - public int checkSignatures(@NonNull String pkg1, - @NonNull String pkg2) { - synchronized (mLock) { - return super.checkSignatures(pkg1, pkg2); - } - } - - @Override - public int checkUidSignatures(int uid1, int uid2) { - synchronized (mLock) { - return super.checkUidSignatures(uid1, uid2); - } - } - - @Override - public boolean hasSigningCertificate(@NonNull String packageName, @NonNull byte[] certificate, - int type) { - synchronized (mLock) { - return super.hasSigningCertificate(packageName, certificate, type); - } - } - - @Override - public boolean hasUidSigningCertificate(int uid, @NonNull byte[] certificate, int type) { - synchronized (mLock) { - return super.hasUidSigningCertificate(uid, certificate, type); - } - } - - @Override - public List<String> getAllPackages() { - synchronized (mLock) { - return super.getAllPackages(); - } - } - - @Nullable - @Override - public String getNameForUid(int uid) { - synchronized (mLock) { - return super.getNameForUid(uid); - } - } - - @Nullable - @Override - public String[] getNamesForUids(int[] uids) { - synchronized (mLock) { - return super.getNamesForUids(uids); - } - } - - @Override - public int getUidForSharedUser(@NonNull String sharedUserName) { - synchronized (mLock) { - return super.getUidForSharedUser(sharedUserName); - } - } - - @Override - public int getFlagsForUid(int uid) { - synchronized (mLock) { - return super.getFlagsForUid(uid); - } - } - - @Override - public int getPrivateFlagsForUid(int uid) { - synchronized (mLock) { - return super.getPrivateFlagsForUid(uid); - } - } - - @Override - public boolean isUidPrivileged(int uid) { - synchronized (mLock) { - return super.isUidPrivileged(uid); - } - } - - @NonNull - @Override - public String[] getAppOpPermissionPackages(@NonNull String permissionName) { - synchronized (mLock) { - return super.getAppOpPermissionPackages(permissionName); - } - } - - @NonNull - @Override - public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions( - @NonNull String[] permissions, @PackageManager.PackageInfoFlagsBits long flags, - @UserIdInt int userId) { - synchronized (mLock) { - return super.getPackagesHoldingPermissions(permissions, flags, userId); - } - } - - @NonNull - @Override - public List<ApplicationInfo> getInstalledApplications( - @PackageManager.ApplicationInfoFlagsBits long flags, @UserIdInt int userId, - int callingUid) { - synchronized (mLock) { - return super.getInstalledApplications(flags, userId, callingUid); - } - } - - @Nullable - @Override - public ProviderInfo resolveContentProvider(@NonNull String name, - @PackageManager.ResolveInfoFlagsBits long flags, @UserIdInt int userId, - int callingUid) { - synchronized (mLock) { - return super.resolveContentProvider(name, flags, userId, callingUid); - } - } - - @Nullable - @Override - public ProviderInfo getGrantImplicitAccessProviderInfo(int recipientUid, - @NonNull String visibleAuthority) { - synchronized (mLock) { - return super.getGrantImplicitAccessProviderInfo(recipientUid, visibleAuthority); - } - } - - @Override - public void querySyncProviders(boolean safeMode, @NonNull List<String> outNames, - @NonNull List<ProviderInfo> outInfo) { - synchronized (mLock) { - super.querySyncProviders(safeMode, outNames, outInfo); - } - } - - @NonNull - @Override - public ParceledListSlice<ProviderInfo> queryContentProviders(@Nullable String processName, - int uid, @PackageManager.ComponentInfoFlagsBits long flags, - @Nullable String metaDataKey) { - synchronized (mLock) { - return super.queryContentProviders(processName, uid, flags, metaDataKey); - } - } - - @Nullable - @Override - public InstrumentationInfo getInstrumentationInfo(@NonNull ComponentName component, int flags) { - synchronized (mLock) { - return super.getInstrumentationInfo(component, flags); - } - } - - @NonNull - @Override - public ParceledListSlice<InstrumentationInfo> queryInstrumentation( - @NonNull String targetPackage, int flags) { - synchronized (mLock) { - return super.queryInstrumentation(targetPackage, flags); - } - } - - @NonNull - @Override - public List<PackageStateInternal> findSharedNonSystemLibraries( - @NonNull PackageStateInternal pkgSetting) { - synchronized (mLock) { - return super.findSharedNonSystemLibraries(pkgSetting); - } - } - - @Override - public boolean getApplicationHiddenSettingAsUser(@NonNull String packageName, - @UserIdInt int userId) { - synchronized (mLock) { - return super.getApplicationHiddenSettingAsUser(packageName, userId); - } - } - - @Override - public boolean isPackageSuspendedForUser(@NonNull String packageName, @UserIdInt int userId) { - synchronized (mLock) { - return super.isPackageSuspendedForUser(packageName, userId); - } - } - - @Override - public boolean isSuspendingAnyPackages(@NonNull String suspendingPackage, - @UserIdInt int userId) { - synchronized (mLock) { - return super.isSuspendingAnyPackages(suspendingPackage, userId); - } - } - - @NonNull - @Override - public ParceledListSlice<IntentFilter> getAllIntentFilters(@NonNull String packageName) { - synchronized (mLock) { - return super.getAllIntentFilters(packageName); - } - } - - @Override - public boolean getBlockUninstallForUser(@NonNull String packageName, @UserIdInt int userId) { - synchronized (mLock) { - return super.getBlockUninstallForUser(packageName, userId); - } - } - - @Nullable - @Override - public SparseArray<int[]> getBroadcastAllowList(@NonNull String packageName, - @UserIdInt int[] userIds, boolean isInstantApp) { - synchronized (mLock) { - return super.getBroadcastAllowList(packageName, userIds, isInstantApp); - } - } - - @Nullable - @Override - public String getInstallerPackageName(@NonNull String packageName) { - synchronized (mLock) { - return super.getInstallerPackageName(packageName); - } - } - - @Nullable - @Override - public InstallSourceInfo getInstallSourceInfo(@NonNull String packageName) { - synchronized (mLock) { - return super.getInstallSourceInfo(packageName); - } - } - - @Override - public int getApplicationEnabledSetting(@NonNull String packageName, @UserIdInt int userId) { - synchronized (mLock) { - return super.getApplicationEnabledSetting(packageName, userId); - } - } - - @Override - public int getComponentEnabledSetting(@NonNull ComponentName component, int callingUid, - @UserIdInt int userId) { - synchronized (mLock) { - return super.getComponentEnabledSetting(component, callingUid, userId); - } - } - - @Override - public int getComponentEnabledSettingInternal(@NonNull ComponentName component, int callingUid, - @UserIdInt int userId) { - synchronized (mLock) { - return super.getComponentEnabledSettingInternal(component, callingUid, userId); - } - } - - @Override - public boolean isComponentEffectivelyEnabled(@NonNull ComponentInfo componentInfo, - @UserIdInt int userId) { - synchronized (mLock) { - return super.isComponentEffectivelyEnabled(componentInfo, userId); - } - } - - @Nullable - @Override - public KeySet getKeySetByAlias(@NonNull String packageName, @NonNull String alias) { - synchronized (mLock) { - return super.getKeySetByAlias(packageName, alias); - } - } - - @Nullable - @Override - public KeySet getSigningKeySet(@NonNull String packageName) { - synchronized (mLock) { - return super.getSigningKeySet(packageName); - } - } - - @Override - public boolean isPackageSignedByKeySet(@NonNull String packageName, @NonNull KeySet ks) { - synchronized (mLock) { - return super.isPackageSignedByKeySet(packageName, ks); - } - } - - @Override - public boolean isPackageSignedByKeySetExactly(@NonNull String packageName, @NonNull KeySet ks) { - synchronized (mLock) { - return super.isPackageSignedByKeySetExactly(packageName, ks); - } - } - - @Nullable - @Override - public int[] getVisibilityAllowList(@NonNull String packageName, @UserIdInt int userId) { - synchronized (mLock) { - return super.getVisibilityAllowList(packageName, userId); - } - } - - @Override - public boolean canQueryPackage(int callingUid, @Nullable String targetPackageName) { - synchronized (mLock) { - return super.canQueryPackage(callingUid, targetPackageName); - } - } - - @Override - public int getPackageUid(@NonNull String packageName, - @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId) { - synchronized (mLock) { - return super.getPackageUid(packageName, flags, userId); - } - } - - @Override - public boolean canAccessComponent(int callingUid, @NonNull ComponentName component, - @UserIdInt int userId) { - synchronized (mLock) { - return super.canAccessComponent(callingUid, component, userId); - } - } - - @Override - public boolean isCallerInstallerOfRecord(@NonNull AndroidPackage pkg, int callingUid) { - synchronized (mLock) { - return super.isCallerInstallerOfRecord(pkg, callingUid); - } - } - - @Override - public int getInstallReason(@NonNull String packageName, @UserIdInt int userId) { - synchronized (mLock) { - return super.getInstallReason(packageName, userId); - } - } - - @Override - public boolean canPackageQuery(@NonNull String sourcePackageName, - @NonNull String targetPackageName, @UserIdInt int userId) { - synchronized (mLock) { - return super.canPackageQuery(sourcePackageName, targetPackageName, userId); - } - } - - @Override - public boolean canForwardTo(@NonNull Intent intent, @Nullable String resolvedType, - @UserIdInt int sourceUserId, @UserIdInt int targetUserId) { - synchronized (mLock) { - return super.canForwardTo(intent, resolvedType, sourceUserId, targetUserId); - } - } - - @NonNull - @Override - public List<ApplicationInfo> getPersistentApplications(boolean safeMode, int flags) { - synchronized (mLock) { - return super.getPersistentApplications(safeMode, flags); - } - } - - @NonNull - @Override - public SparseArray<String> getAppsWithSharedUserIds() { - synchronized (mLock) { - return super.getAppsWithSharedUserIds(); - } - } - - @NonNull - @Override - public String[] getSharedUserPackagesForPackage(@NonNull String packageName, - @UserIdInt int userId) { - synchronized (mLock) { - return super.getSharedUserPackagesForPackage(packageName, userId); - } - } - - @NonNull - @Override - public Set<String> getUnusedPackages(long downgradeTimeThresholdMillis) { - synchronized (mLock) { - return super.getUnusedPackages(downgradeTimeThresholdMillis); - } - } - - @Nullable - @Override - public CharSequence getHarmfulAppWarning(@NonNull String packageName, @UserIdInt int userId) { - synchronized (mLock) { - return super.getHarmfulAppWarning(packageName, userId); - } - } - - @NonNull - @Override - public String[] filterOnlySystemPackages(@Nullable String... pkgNames) { - synchronized (mLock) { - return super.filterOnlySystemPackages(pkgNames); - } - } - - @NonNull - @Override - public List<AndroidPackage> getPackagesForAppId(int appId) { - synchronized (mLock) { - return super.getPackagesForAppId(appId); - } - } - - @Override - public int getUidTargetSdkVersion(int uid) { - synchronized (mLock) { - return super.getUidTargetSdkVersion(uid); - } - } - - @Nullable - @Override - public ArrayMap<String, ProcessInfo> getProcessesForUid(int uid) { - synchronized (mLock) { - return super.getProcessesForUid(uid); - } - } - - @Override - public PackageStateInternal getPackageStateFiltered(@NonNull String packageName, int callingUid, - @UserIdInt int userId) { - synchronized (mLock) { - return super.getPackageStateFiltered(packageName, callingUid, userId); - } - } - - @Override - public boolean getBlockUninstall(@UserIdInt int userId, @NonNull String packageName) { - synchronized (mLock) { - return super.getBlockUninstall(userId, packageName); - } - } - - @NonNull - @Override - public WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>> getSharedLibraries() { - synchronized (mLock) { - return super.getSharedLibraries(); - } - } - - @Nullable - @Override - public Pair<PackageStateInternal, SharedUserApi> getPackageOrSharedUser(int appId) { - synchronized (mLock) { - return super.getPackageOrSharedUser(appId); - } - } - - @Nullable - @Override - public SharedUserApi getSharedUser(int sharedUserAppId) { - synchronized (mLock) { - return super.getSharedUser(sharedUserAppId); - } - } - - @NonNull - @Override - public ArraySet<PackageStateInternal> getSharedUserPackages(int sharedUserAppId) { - synchronized (mLock) { - return super.getSharedUserPackages(sharedUserAppId); - } - } - - @NonNull - @Override - public ComponentResolverApi getComponentResolver() { - synchronized (mLock) { - return super.getComponentResolver(); - } - } - - @Nullable - @Override - public PackageStateInternal getDisabledSystemPackage(@NonNull String packageName) { - synchronized (mLock) { - return super.getDisabledSystemPackage(packageName); - } - } - - @Nullable - @Override - public ResolveInfo getInstantAppInstallerInfo() { - synchronized (mLock) { - return super.getInstantAppInstallerInfo(); - } - } } diff --git a/services/core/java/com/android/server/pm/ComputerTracker.java b/services/core/java/com/android/server/pm/ComputerTracker.java deleted file mode 100644 index 216ad71b4d5d..000000000000 --- a/services/core/java/com/android/server/pm/ComputerTracker.java +++ /dev/null @@ -1,1327 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.pm; - -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.annotation.UserIdInt; -import android.content.ComponentName; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.pm.ActivityInfo; -import android.content.pm.ApplicationInfo; -import android.content.pm.ComponentInfo; -import android.content.pm.InstallSourceInfo; -import android.content.pm.InstrumentationInfo; -import android.content.pm.KeySet; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.content.pm.PackageManagerInternal; -import android.content.pm.ParceledListSlice; -import android.content.pm.ProcessInfo; -import android.content.pm.ProviderInfo; -import android.content.pm.ResolveInfo; -import android.content.pm.ServiceInfo; -import android.content.pm.SharedLibraryInfo; -import android.content.pm.SigningDetails; -import android.content.pm.UserInfo; -import android.content.pm.VersionedPackage; -import android.util.ArrayMap; -import android.util.ArraySet; -import android.util.Pair; -import android.util.SparseArray; - -import com.android.server.pm.parsing.pkg.AndroidPackage; -import com.android.server.pm.pkg.PackageState; -import com.android.server.pm.pkg.PackageStateInternal; -import com.android.server.pm.pkg.SharedUserApi; -import com.android.server.pm.resolution.ComponentResolverApi; -import com.android.server.utils.WatchedArrayMap; -import com.android.server.utils.WatchedLongSparseArray; - -import java.io.FileDescriptor; -import java.io.PrintWriter; -import java.util.List; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * This subclass delegates to methods in a Computer after reference-counting the computer. - */ -public final class ComputerTracker implements Computer { - - // The number of times a thread reused a computer in its stack instead of fetching - // a snapshot computer. - private final AtomicInteger mReusedSnapshot = new AtomicInteger(0); - - private final PackageManagerService mService; - ComputerTracker(PackageManagerService s) { - mService = s; - } - - private ThreadComputer snapshot() { - ThreadComputer current = PackageManagerService.sThreadComputer.get(); - if (current.mRefCount > 0) { - current.acquire(); - mReusedSnapshot.incrementAndGet(); - } else { - current.acquire(mService.snapshotComputer()); - } - return current; - } - - public @NonNull List<ResolveInfo> queryIntentActivitiesInternal(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, - @PackageManagerInternal.PrivateResolveFlags long privateResolveFlags, - int filterCallingUid, int userId, boolean resolveForStart, - boolean allowDynamicSplits) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.queryIntentActivitiesInternal(intent, resolvedType, flags, - privateResolveFlags, filterCallingUid, userId, resolveForStart, - allowDynamicSplits); - } finally { - current.release(); - } - } - public @NonNull List<ResolveInfo> queryIntentActivitiesInternal(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.queryIntentActivitiesInternal(intent, resolvedType, flags, - userId); - } finally { - current.release(); - } - } - public @NonNull List<ResolveInfo> queryIntentServicesInternal(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId, - int callingUid, boolean includeInstantApps) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.queryIntentServicesInternal(intent, resolvedType, flags, - userId, callingUid, includeInstantApps); - } finally { - current.release(); - } - } - public @NonNull QueryIntentActivitiesResult queryIntentActivitiesInternalBody( - Intent intent, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, - int filterCallingUid, int userId, boolean resolveForStart, boolean allowDynamicSplits, - String pkgName, String instantAppPkgName) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.queryIntentActivitiesInternalBody(intent, resolvedType, - flags, filterCallingUid, userId, resolveForStart, allowDynamicSplits, - pkgName, instantAppPkgName); - } finally { - current.release(); - } - } - public ActivityInfo getActivityInfo(ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getActivityInfo(component, flags, userId); - } finally { - current.release(); - } - } - public ActivityInfo getActivityInfoInternal(ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, - int filterCallingUid, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getActivityInfoInternal(component, flags, filterCallingUid, - userId); - } finally { - current.release(); - } - } - public AndroidPackage getPackage(String packageName) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getPackage(packageName); - } finally { - current.release(); - } - } - public AndroidPackage getPackage(int uid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getPackage(uid); - } finally { - current.release(); - } - } - public ApplicationInfo generateApplicationInfoFromSettings(String packageName, - long flags, int filterCallingUid, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.generateApplicationInfoFromSettings(packageName, flags, - filterCallingUid, userId); - } finally { - current.release(); - } - } - public ApplicationInfo getApplicationInfo(String packageName, - @PackageManager.ApplicationInfoFlagsBits long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getApplicationInfo(packageName, flags, userId); - } finally { - current.release(); - } - } - public ApplicationInfo getApplicationInfoInternal(String packageName, - @PackageManager.ApplicationInfoFlagsBits long flags, int filterCallingUid, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getApplicationInfoInternal(packageName, flags, - filterCallingUid, userId); - } finally { - current.release(); - } - } - public ComponentName getDefaultHomeActivity(int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getDefaultHomeActivity(userId); - } finally { - current.release(); - } - } - public ComponentName getHomeActivitiesAsUser(List<ResolveInfo> allHomeCandidates, - int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getHomeActivitiesAsUser(allHomeCandidates, userId); - } finally { - current.release(); - } - } - public CrossProfileDomainInfo getCrossProfileDomainPreferredLpr(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int sourceUserId, - int parentUserId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getCrossProfileDomainPreferredLpr(intent, resolvedType, - flags, sourceUserId, parentUserId); - } finally { - current.release(); - } - } - public Intent getHomeIntent() { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getHomeIntent(); - } finally { - current.release(); - } - } - public List<CrossProfileIntentFilter> getMatchingCrossProfileIntentFilters( - Intent intent, String resolvedType, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getMatchingCrossProfileIntentFilters(intent, resolvedType, - userId); - } finally { - current.release(); - } - } - public List<ResolveInfo> applyPostResolutionFilter( - @NonNull List<ResolveInfo> resolveInfos, - String ephemeralPkgName, boolean allowDynamicSplits, int filterCallingUid, - boolean resolveForStart, int userId, Intent intent) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.applyPostResolutionFilter(resolveInfos, ephemeralPkgName, - allowDynamicSplits, filterCallingUid, resolveForStart, userId, intent); - } finally { - current.release(); - } - } - public PackageInfo generatePackageInfo(PackageStateInternal ps, - @PackageManager.PackageInfoFlagsBits long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.generatePackageInfo(ps, flags, userId); - } finally { - current.release(); - } - } - public PackageInfo getPackageInfo(String packageName, - @PackageManager.PackageInfoFlagsBits long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getPackageInfo(packageName, flags, userId); - } finally { - current.release(); - } - } - public PackageInfo getPackageInfoInternal(String packageName, long versionCode, - long flags, int filterCallingUid, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getPackageInfoInternal(packageName, versionCode, flags, - filterCallingUid, userId); - } finally { - current.release(); - } - } - public PackageStateInternal getPackageStateInternal(String packageName) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getPackageStateInternal(packageName); - } finally { - current.release(); - } - } - public PackageStateInternal getPackageStateInternal(String packageName, int callingUid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getPackageStateInternal(packageName, callingUid); - } finally { - current.release(); - } - } - - @Nullable - public PackageState getPackageStateCopied(@NonNull String packageName) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getPackageStateCopied(packageName); - } finally { - current.release(); - } - } - - public ParceledListSlice<PackageInfo> getInstalledPackages(long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getInstalledPackages(flags, userId); - } finally { - current.release(); - } - } - public ResolveInfo createForwardingResolveInfoUnchecked(WatchedIntentFilter filter, - int sourceUserId, int targetUserId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.createForwardingResolveInfoUnchecked(filter, sourceUserId, - targetUserId); - } finally { - current.release(); - } - } - public ServiceInfo getServiceInfo(ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getServiceInfo(component, flags, userId); - } finally { - current.release(); - } - } - public SharedLibraryInfo getSharedLibraryInfo(String name, long version) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getSharedLibraryInfo(name, version); - } finally { - current.release(); - } - } - public SigningDetails getSigningDetails(@NonNull String packageName) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getSigningDetails(packageName); - } finally { - current.release(); - } - } - public SigningDetails getSigningDetails(int uid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getSigningDetails(uid); - } finally { - current.release(); - } - } - public String getInstantAppPackageName(int callingUid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getInstantAppPackageName(callingUid); - } finally { - current.release(); - } - } - public String resolveExternalPackageName(AndroidPackage pkg) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.resolveExternalPackageName(pkg); - } finally { - current.release(); - } - } - public String resolveInternalPackageName(String packageName, long versionCode) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.resolveInternalPackageName(packageName, versionCode); - } finally { - current.release(); - } - } - public String[] getPackagesForUid(int uid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getPackagesForUid(uid); - } finally { - current.release(); - } - } - public UserInfo getProfileParent(int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getProfileParent(userId); - } finally { - current.release(); - } - } - public boolean canViewInstantApps(int callingUid, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.canViewInstantApps(callingUid, userId); - } finally { - current.release(); - } - } - public boolean filterAppAccess(AndroidPackage pkg, int callingUid, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.filterAppAccess(pkg, callingUid, userId); - } finally { - current.release(); - } - } - public boolean filterAppAccess(String packageName, int callingUid, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.filterAppAccess(packageName, callingUid, userId); - } finally { - current.release(); - } - } - public boolean filterAppAccess(int uid, int callingUid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.filterAppAccess(uid, callingUid); - } finally { - current.release(); - } - } - public boolean filterSharedLibPackage(@Nullable PackageStateInternal ps, int uid, - int userId, @PackageManager.ComponentInfoFlagsBits long flags) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.filterSharedLibPackage(ps, uid, userId, flags); - } finally { - current.release(); - } - } - public boolean isCallerSameApp(String packageName, int uid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.isCallerSameApp(packageName, uid); - } finally { - current.release(); - } - } - public boolean isComponentVisibleToInstantApp(@Nullable ComponentName component) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.isComponentVisibleToInstantApp(component); - } finally { - current.release(); - } - } - public boolean isComponentVisibleToInstantApp(@Nullable ComponentName component, - @PackageManager.ComponentType int type) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.isComponentVisibleToInstantApp(component, type); - } finally { - current.release(); - } - } - public boolean isImplicitImageCaptureIntentAndNotSetByDpcLocked(Intent intent, - int userId, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, - userId, resolvedType, flags); - } finally { - current.release(); - } - } - public boolean isInstantApp(String packageName, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.isInstantApp(packageName, userId); - } finally { - current.release(); - } - } - public boolean isInstantAppInternal(String packageName, @UserIdInt int userId, - int callingUid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.isInstantAppInternal(packageName, userId, callingUid); - } finally { - current.release(); - } - } - public boolean isSameProfileGroup(@UserIdInt int callerUserId, - @UserIdInt int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.isSameProfileGroup(callerUserId, userId); - } finally { - current.release(); - } - } - public boolean shouldFilterApplication(@NonNull SharedUserSetting sus, - int callingUid, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.shouldFilterApplication(sus, callingUid, userId); - } finally { - current.release(); - } - } - public boolean shouldFilterApplication(@Nullable PackageStateInternal ps, - int callingUid, @Nullable ComponentName component, - @PackageManager.ComponentType int componentType, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.shouldFilterApplication(ps, callingUid, component, - componentType, userId); - } finally { - current.release(); - } - } - public boolean shouldFilterApplication(@Nullable PackageStateInternal ps, - int callingUid, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.shouldFilterApplication(ps, callingUid, userId); - } finally { - current.release(); - } - } - public int checkUidPermission(String permName, int uid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.checkUidPermission(permName, uid); - } finally { - current.release(); - } - } - public int getPackageUidInternal(String packageName, - @PackageManager.PackageInfoFlagsBits long flags, int userId, int callingUid) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.getPackageUidInternal(packageName, flags, userId, - callingUid); - } finally { - current.release(); - } - } - public long updateFlagsForApplication(long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.updateFlagsForApplication(flags, userId); - } finally { - current.release(); - } - } - public long updateFlagsForComponent(long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.updateFlagsForComponent(flags, userId); - } finally { - current.release(); - } - } - public long updateFlagsForPackage(long flags, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.updateFlagsForPackage(flags, userId); - } finally { - current.release(); - } - } - public long updateFlagsForResolve(long flags, int userId, int callingUid, - boolean wantInstantApps, boolean isImplicitImageCaptureIntentAndNotSetByDpc) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.updateFlagsForResolve(flags, userId, callingUid, - wantInstantApps, isImplicitImageCaptureIntentAndNotSetByDpc); - } finally { - current.release(); - } - } - public long updateFlagsForResolve(long flags, int userId, int callingUid, - boolean wantInstantApps, boolean onlyExposedExplicitly, - boolean isImplicitImageCaptureIntentAndNotSetByDpc) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.updateFlagsForResolve(flags, userId, callingUid, - wantInstantApps, onlyExposedExplicitly, - isImplicitImageCaptureIntentAndNotSetByDpc); - } finally { - current.release(); - } - } - public void dump(int type, FileDescriptor fd, PrintWriter pw, DumpState dumpState) { - ThreadComputer current = snapshot(); - try { - current.mComputer.dump(type, fd, pw, dumpState); - } finally { - current.release(); - } - } - public void enforceCrossUserOrProfilePermission(int callingUid, @UserIdInt int userId, - boolean requireFullPermission, boolean checkShell, String message) { - ThreadComputer current = snapshot(); - try { - current.mComputer.enforceCrossUserOrProfilePermission(callingUid, userId, - requireFullPermission, checkShell, message); - } finally { - current.release(); - } - } - public void enforceCrossUserPermission(int callingUid, @UserIdInt int userId, - boolean requireFullPermission, boolean checkShell, String message) { - ThreadComputer current = snapshot(); - try { - current.mComputer.enforceCrossUserPermission(callingUid, userId, - requireFullPermission, checkShell, message); - } finally { - current.release(); - } - } - public void enforceCrossUserPermission(int callingUid, @UserIdInt int userId, - boolean requireFullPermission, boolean checkShell, - boolean requirePermissionWhenSameUser, String message) { - ThreadComputer current = snapshot(); - try { - current.mComputer.enforceCrossUserPermission(callingUid, userId, - requireFullPermission, checkShell, requirePermissionWhenSameUser, message); - } finally { - current.release(); - } - } - public PackageManagerService.FindPreferredActivityBodyResult findPreferredActivityInternal( - Intent intent, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, - List<ResolveInfo> query, boolean always, boolean removeMatches, boolean debug, - int userId, boolean queryMayBeFiltered) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.findPreferredActivityInternal(intent, resolvedType, flags, - query, always, removeMatches, debug, userId, queryMayBeFiltered); - } finally { - current.release(); - } - } - public ResolveInfo findPersistentPreferredActivityLP(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, - List<ResolveInfo> query, boolean debug, int userId) { - ThreadComputer current = snapshot(); - try { - return current.mComputer.findPersistentPreferredActivityLP(intent, resolvedType, - flags, query, debug, userId); - } finally { - current.release(); - } - } - - @Override - public String[] getAllAvailablePackageNames() { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getAllAvailablePackageNames(); - } - } - - @Override - public PreferredIntentResolver getPreferredActivities(int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPreferredActivities(userId); - } - } - - @NonNull - @Override - public ArrayMap<String, ? extends PackageStateInternal> getPackageStates() { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPackageStates(); - } - } - - @Nullable - @Override - public String getRenamedPackage(@NonNull String packageName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getRenamedPackage(packageName); - } - } - - @NonNull - @Override - public ArraySet<String> getNotifyPackagesForReplacedReceived(@NonNull String[] packages) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getNotifyPackagesForReplacedReceived(packages); - } - } - - @Override - public int getPackageStartability(boolean safeMode, @NonNull String packageName, int callingUid, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPackageStartability(safeMode, packageName, callingUid, - userId); - } - } - - @Override - public boolean isPackageAvailable(String packageName, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.isPackageAvailable(packageName, userId); - } - } - - @Override - public String[] currentToCanonicalPackageNames(String[] names) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.currentToCanonicalPackageNames(names); - } - } - - @Override - public String[] canonicalToCurrentPackageNames(String[] names) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.canonicalToCurrentPackageNames(names); - } - } - - @Override - public int[] getPackageGids(@NonNull String packageName, - @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPackageGids(packageName, flags, userId); - } - } - - @Override - public int getTargetSdkVersion(@NonNull String packageName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getTargetSdkVersion(packageName); - } - } - - @Override - public boolean activitySupportsIntent(@NonNull ComponentName resolveComponentName, - @NonNull ComponentName component, @NonNull Intent intent, String resolvedType) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.activitySupportsIntent(resolveComponentName, component, intent, - resolvedType); - } - } - - @Nullable - @Override - public ActivityInfo getReceiverInfo(@NonNull ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getReceiverInfo(component, flags, userId); - } - } - - @Nullable - @Override - public ParceledListSlice<SharedLibraryInfo> getSharedLibraries(@NonNull String packageName, - @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getSharedLibraries(packageName, flags, userId); - } - } - - @Override - public boolean canRequestPackageInstalls(@NonNull String packageName, int callingUid, - @UserIdInt int userId, boolean throwIfPermNotDeclared) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.canRequestPackageInstalls(packageName, callingUid, userId, - throwIfPermNotDeclared); - } - } - - @Override - public boolean isInstallDisabledForPackage(@NonNull String packageName, int uid, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.isInstallDisabledForPackage(packageName, uid, userId); - } - } - - @Override - public List<VersionedPackage> getPackagesUsingSharedLibrary(@NonNull SharedLibraryInfo libInfo, - @PackageManager.PackageInfoFlagsBits long flags, int callingUid, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPackagesUsingSharedLibrary(libInfo, flags, callingUid, - userId); - } - } - - @Nullable - @Override - public ParceledListSlice<SharedLibraryInfo> getDeclaredSharedLibraries( - @NonNull String packageName, @PackageManager.PackageInfoFlagsBits long flags, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getDeclaredSharedLibraries(packageName, flags, userId); - } - } - - @Nullable - @Override - public ProviderInfo getProviderInfo(@NonNull ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getProviderInfo(component, flags, userId); - } - } - - @Nullable - @Override - public String[] getSystemSharedLibraryNames() { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getSystemSharedLibraryNames(); - } - } - - @Override - public int checkSignatures(@NonNull String pkg1, - @NonNull String pkg2) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.checkSignatures(pkg1, pkg2); - } - } - - @Override - public int checkUidSignatures(int uid1, int uid2) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.checkUidSignatures(uid1, uid2); - } - } - - @Override - public boolean hasSigningCertificate(@NonNull String packageName, @NonNull byte[] certificate, - int type) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.hasSigningCertificate(packageName, certificate, type); - } - } - - @Override - public boolean hasUidSigningCertificate(int uid, @NonNull byte[] certificate, int type) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.hasUidSigningCertificate(uid, certificate, type); - } - } - - @Override - public List<String> getAllPackages() { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getAllPackages(); - } - } - - @Nullable - @Override - public String getNameForUid(int uid) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getNameForUid(uid); - } - } - - @Nullable - @Override - public String[] getNamesForUids(int[] uids) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getNamesForUids(uids); - } - } - - @Override - public int getUidForSharedUser(@NonNull String sharedUserName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getUidForSharedUser(sharedUserName); - } - } - - @Override - public int getFlagsForUid(int uid) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getFlagsForUid(uid); - } - } - - @Override - public int getPrivateFlagsForUid(int uid) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPrivateFlagsForUid(uid); - } - } - - @Override - public boolean isUidPrivileged(int uid) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.isUidPrivileged(uid); - } - } - - @NonNull - @Override - public String[] getAppOpPermissionPackages(@NonNull String permissionName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getAppOpPermissionPackages(permissionName); - } - } - - @NonNull - @Override - public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions( - @NonNull String[] permissions, @PackageManager.PackageInfoFlagsBits long flags, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPackagesHoldingPermissions(permissions, flags, userId); - } - } - - @NonNull - @Override - public List<ApplicationInfo> getInstalledApplications( - @PackageManager.ApplicationInfoFlagsBits long flags, @UserIdInt int userId, - int callingUid) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getInstalledApplications(flags, userId, callingUid); - } - } - - @Nullable - @Override - public ProviderInfo resolveContentProvider(@NonNull String name, - @PackageManager.ResolveInfoFlagsBits long flags, @UserIdInt int userId, - int callingUid) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.resolveContentProvider(name, flags, userId, callingUid); - } - } - - @Nullable - @Override - public ProviderInfo getGrantImplicitAccessProviderInfo(int recipientUid, - @NonNull String visibleAuthority) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getGrantImplicitAccessProviderInfo(recipientUid, - visibleAuthority); - } - } - - @Override - public void querySyncProviders(boolean safeMode, @NonNull List<String> outNames, - @NonNull List<ProviderInfo> outInfo) { - try (ThreadComputer current = snapshot()) { - current.mComputer.querySyncProviders(safeMode, outNames, outInfo); - } - } - - @NonNull - @Override - public ParceledListSlice<ProviderInfo> queryContentProviders(@Nullable String processName, - int uid, @PackageManager.ComponentInfoFlagsBits long flags, - @Nullable String metaDataKey) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.queryContentProviders(processName, uid, flags, metaDataKey); - } - } - - @Nullable - @Override - public InstrumentationInfo getInstrumentationInfo(@NonNull ComponentName component, int flags) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getInstrumentationInfo(component, flags); - } - } - - @NonNull - @Override - public ParceledListSlice<InstrumentationInfo> queryInstrumentation( - @NonNull String targetPackage, int flags) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.queryInstrumentation(targetPackage, flags); - } - } - - @NonNull - @Override - public List<PackageStateInternal> findSharedNonSystemLibraries( - @NonNull PackageStateInternal pkgSetting) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.findSharedNonSystemLibraries(pkgSetting); - } - } - - @Override - public boolean getApplicationHiddenSettingAsUser(@NonNull String packageName, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getApplicationHiddenSettingAsUser(packageName, userId); - } - } - - @Override - public boolean isPackageSuspendedForUser(@NonNull String packageName, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.isPackageSuspendedForUser(packageName, userId); - } - } - - @Override - public boolean isSuspendingAnyPackages(@NonNull String suspendingPackage, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.isSuspendingAnyPackages(suspendingPackage, userId); - } - } - - @NonNull - @Override - public ParceledListSlice<IntentFilter> getAllIntentFilters(@NonNull String packageName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getAllIntentFilters(packageName); - } - } - - @Override - public boolean getBlockUninstallForUser(@NonNull String packageName, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getBlockUninstallForUser(packageName, userId); - } - } - - @Nullable - @Override - public SparseArray<int[]> getBroadcastAllowList(@NonNull String packageName, - @UserIdInt int[] userIds, boolean isInstantApp) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getBroadcastAllowList(packageName, userIds, isInstantApp); - } - } - - @Nullable - @Override - public String getInstallerPackageName(@NonNull String packageName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getInstallerPackageName(packageName); - } - } - - @Nullable - @Override - public InstallSourceInfo getInstallSourceInfo(@NonNull String packageName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getInstallSourceInfo(packageName); - } - } - - @Override - public int getApplicationEnabledSetting(@NonNull String packageName, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getApplicationEnabledSetting(packageName, userId); - } - } - - @Override - public int getComponentEnabledSetting(@NonNull ComponentName component, int callingUid, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getComponentEnabledSetting(component, callingUid, userId); - } - } - - @Override - public int getComponentEnabledSettingInternal(@NonNull ComponentName component, int callingUid, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getComponentEnabledSettingInternal( - component, callingUid, userId); - } - } - - @Override - public boolean isComponentEffectivelyEnabled(@NonNull ComponentInfo componentInfo, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.isComponentEffectivelyEnabled(componentInfo, userId); - } - } - - @Nullable - @Override - public KeySet getKeySetByAlias(@NonNull String packageName, @NonNull String alias) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getKeySetByAlias(packageName, alias); - } - } - - @Nullable - @Override - public KeySet getSigningKeySet(@NonNull String packageName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getSigningKeySet(packageName); - } - } - - @Override - public boolean isPackageSignedByKeySet(@NonNull String packageName, @NonNull KeySet ks) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.isPackageSignedByKeySet(packageName, ks); - } - } - - @Override - public boolean isPackageSignedByKeySetExactly(@NonNull String packageName, @NonNull KeySet ks) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.isPackageSignedByKeySetExactly(packageName, ks); - } - } - - @Nullable - @Override - public int[] getVisibilityAllowList(@NonNull String packageName, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getVisibilityAllowList(packageName, userId); - } - } - - @Override - public boolean canQueryPackage(int callingUid, @Nullable String targetPackageName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.canQueryPackage(callingUid, targetPackageName); - } - } - - @Override - public int getPackageUid(@NonNull String packageName, - @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPackageUid(packageName, flags, userId); - } - } - - @Override - public boolean canAccessComponent(int callingUid, @NonNull ComponentName component, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.canAccessComponent(callingUid, component, userId); - } - } - - @Override - public boolean isCallerInstallerOfRecord(@NonNull AndroidPackage pkg, int callingUid) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.isCallerInstallerOfRecord(pkg, callingUid); - } - } - - @Override - public int getInstallReason(@NonNull String packageName, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getInstallReason(packageName, userId); - } - } - - @Override - public boolean canPackageQuery(@NonNull String sourcePackageName, - @NonNull String targetPackageName, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.canPackageQuery(sourcePackageName, targetPackageName, userId); - } - } - - @Override - public boolean canForwardTo(@NonNull Intent intent, @Nullable String resolvedType, - @UserIdInt int sourceUserId, @UserIdInt int targetUserId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.canForwardTo(intent, resolvedType, sourceUserId, targetUserId); - } - } - - @NonNull - @Override - public List<ApplicationInfo> getPersistentApplications(boolean safeMode, int flags) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPersistentApplications(safeMode, flags); - } - } - - @NonNull - @Override - public SparseArray<String> getAppsWithSharedUserIds() { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getAppsWithSharedUserIds(); - } - } - - @NonNull - @Override - public String[] getSharedUserPackagesForPackage(@NonNull String packageName, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getSharedUserPackagesForPackage(packageName, userId); - } - } - - @NonNull - @Override - public Set<String> getUnusedPackages(long downgradeTimeThresholdMillis) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getUnusedPackages(downgradeTimeThresholdMillis); - } - } - - @Nullable - @Override - public CharSequence getHarmfulAppWarning(@NonNull String packageName, @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getHarmfulAppWarning(packageName, userId); - } - } - - @NonNull - @Override - public String[] filterOnlySystemPackages(@Nullable String... pkgNames) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.filterOnlySystemPackages(pkgNames); - } - } - - @NonNull - @Override - public List<AndroidPackage> getPackagesForAppId(int appId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPackagesForAppId(appId); - } - } - - @Override - public int getUidTargetSdkVersion(int uid) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getUidTargetSdkVersion(uid); - } - } - - @Nullable - @Override - public ArrayMap<String, ProcessInfo> getProcessesForUid(int uid) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getProcessesForUid(uid); - } - } - - @Override - public PackageStateInternal getPackageStateFiltered(@NonNull String packageName, int callingUid, - @UserIdInt int userId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPackageStateFiltered(packageName, callingUid, userId); - } - } - - @Override - public boolean getBlockUninstall(@UserIdInt int userId, @NonNull String packageName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getBlockUninstall(userId, packageName); - } - } - - @NonNull - @Override - public WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>> getSharedLibraries() { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getSharedLibraries(); - } - } - - @Nullable - @Override - public Pair<PackageStateInternal, SharedUserApi> getPackageOrSharedUser(int appId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getPackageOrSharedUser(appId); - } - } - - @Nullable - @Override - public SharedUserApi getSharedUser(int sharedUserAppId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getSharedUser(sharedUserAppId); - } - } - - @NonNull - @Override - public ArraySet<PackageStateInternal> getSharedUserPackages(int sharedUserAppId) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getSharedUserPackages(sharedUserAppId); - } - } - - @NonNull - @Override - public ComponentResolverApi getComponentResolver() { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getComponentResolver(); - } - } - - @Nullable - @Override - public PackageStateInternal getDisabledSystemPackage(@NonNull String packageName) { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getDisabledSystemPackage(packageName); - } - } - - @Nullable - @Override - public ResolveInfo getInstantAppInstallerInfo() { - try (ThreadComputer current = snapshot()) { - return current.mComputer.getInstantAppInstallerInfo(); - } - } -} diff --git a/services/core/java/com/android/server/pm/DeletePackageHelper.java b/services/core/java/com/android/server/pm/DeletePackageHelper.java index 664c7bb929d7..0e1c1ad4120f 100644 --- a/services/core/java/com/android/server/pm/DeletePackageHelper.java +++ b/services/core/java/com/android/server/pm/DeletePackageHelper.java @@ -147,6 +147,7 @@ final class DeletePackageHelper { final SparseArray<TempUserState> priorUserStates; /** enabled state of the uninstalled application */ synchronized (mPm.mLock) { + final Computer computer = mPm.snapshotComputer(); uninstalledPs = mPm.mSettings.getPackageLPr(packageName); if (uninstalledPs == null) { Slog.w(TAG, "Not removing non-existent package " + packageName); @@ -170,10 +171,10 @@ final class DeletePackageHelper { if (pkg != null) { SharedLibraryInfo libraryInfo = null; if (pkg.getStaticSharedLibName() != null) { - libraryInfo = mPm.getSharedLibraryInfo(pkg.getStaticSharedLibName(), + libraryInfo = computer.getSharedLibraryInfo(pkg.getStaticSharedLibName(), pkg.getStaticSharedLibVersion()); } else if (pkg.getSdkLibName() != null) { - libraryInfo = mPm.getSharedLibraryInfo(pkg.getSdkLibName(), + libraryInfo = computer.getSharedLibraryInfo(pkg.getSdkLibName(), pkg.getSdkLibVersionMajor()); } @@ -183,7 +184,7 @@ final class DeletePackageHelper { continue; } List<VersionedPackage> libClientPackages = - mPm.getPackagesUsingSharedLibrary(libraryInfo, + computer.getPackagesUsingSharedLibrary(libraryInfo, MATCH_KNOWN_PACKAGES, Process.SYSTEM_UID, currUserId); if (!ArrayUtils.isEmpty(libClientPackages)) { Slog.w(TAG, "Not removing package " + pkg.getManifestPackageName() @@ -454,11 +455,11 @@ final class DeletePackageHelper { if (affectedUserIds == null) { affectedUserIds = mPm.resolveUserIds(userId); } + final Computer snapshot = mPm.snapshotComputer(); for (final int affectedUserId : affectedUserIds) { if (hadSuspendAppsPermission.get(affectedUserId)) { - mPm.unsuspendForSuspendingPackage(mPm.snapshotComputer(), packageName, - affectedUserId); - mPm.removeAllDistractingPackageRestrictions(affectedUserId); + mPm.unsuspendForSuspendingPackage(snapshot, packageName, affectedUserId); + mPm.removeAllDistractingPackageRestrictions(snapshot, affectedUserId); } } @@ -621,7 +622,8 @@ final class DeletePackageHelper { final int callingUid = Binder.getCallingUid(); mPm.mContext.enforceCallingOrSelfPermission( android.Manifest.permission.DELETE_PACKAGES, null); - final boolean canViewInstantApps = mPm.canViewInstantApps(callingUid, userId); + final Computer snapshot = mPm.snapshotComputer(); + final boolean canViewInstantApps = snapshot.canViewInstantApps(callingUid, userId); Preconditions.checkNotNull(versionedPackage); Preconditions.checkNotNull(observer); Preconditions.checkArgumentInRange(versionedPackage.getLongVersionCode(), @@ -644,12 +646,13 @@ final class DeletePackageHelper { } // Normalize package name to handle renamed packages and static libs - final String internalPackageName = mPm.resolveInternalPackageName(packageName, versionCode); + final String internalPackageName = + snapshot.resolveInternalPackageName(packageName, versionCode); final int uid = Binder.getCallingUid(); - if (!isOrphaned(internalPackageName) + if (!isOrphaned(snapshot, internalPackageName) && !allowSilentUninstall - && !isCallerAllowedToSilentlyUninstall(uid, internalPackageName)) { + && !isCallerAllowedToSilentlyUninstall(snapshot, uid, internalPackageName)) { mPm.mHandler.post(() -> { try { final Intent intent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE); @@ -680,8 +683,7 @@ final class DeletePackageHelper { return; } - if (!deleteAllUsers && mPm.mIPackageManager - .getBlockUninstallForUser(internalPackageName, userId)) { + if (!deleteAllUsers && snapshot.getBlockUninstallForUser(internalPackageName, userId)) { mPm.mHandler.post(() -> { try { observer.onPackageDeleted(packageName, @@ -756,44 +758,45 @@ final class DeletePackageHelper { }); } - private boolean isOrphaned(String packageName) { - final PackageStateInternal packageState = mPm.getPackageStateInternal(packageName); + private boolean isOrphaned(@NonNull Computer snapshot, String packageName) { + final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); return packageState != null && packageState.getInstallSource().isOrphaned; } - private boolean isCallerAllowedToSilentlyUninstall(int callingUid, String pkgName) { + private boolean isCallerAllowedToSilentlyUninstall(@NonNull Computer snapshot, int callingUid, + String pkgName) { if (callingUid == Process.SHELL_UID || callingUid == Process.ROOT_UID || UserHandle.getAppId(callingUid) == Process.SYSTEM_UID) { return true; } final int callingUserId = UserHandle.getUserId(callingUid); // If the caller installed the pkgName, then allow it to silently uninstall. - if (callingUid == mPm.mIPackageManager.getPackageUid( - mPm.mIPackageManager.getInstallerPackageName(pkgName), 0, callingUserId)) { + if (callingUid == snapshot.getPackageUid(snapshot.getInstallerPackageName(pkgName), 0, + callingUserId)) { return true; } // Allow package verifier to silently uninstall. - if (mPm.mRequiredVerifierPackage != null && callingUid == mPm.mIPackageManager + if (mPm.mRequiredVerifierPackage != null && callingUid == snapshot .getPackageUid(mPm.mRequiredVerifierPackage, 0, callingUserId)) { return true; } // Allow package uninstaller to silently uninstall. - if (mPm.mRequiredUninstallerPackage != null && callingUid == mPm.mIPackageManager + if (mPm.mRequiredUninstallerPackage != null && callingUid == snapshot .getPackageUid(mPm.mRequiredUninstallerPackage, 0, callingUserId)) { return true; } // Allow storage manager to silently uninstall. - if (mPm.mStorageManagerPackage != null && callingUid == mPm.mIPackageManager.getPackageUid( + if (mPm.mStorageManagerPackage != null && callingUid == snapshot.getPackageUid( mPm.mStorageManagerPackage, 0, callingUserId)) { return true; } // Allow caller having MANAGE_PROFILE_AND_DEVICE_OWNERS permission to silently // uninstall for device owner provisioning. - return mPm.mIPackageManager.checkUidPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS, callingUid) + return snapshot.checkUidPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS, callingUid) == PERMISSION_GRANTED; } @@ -899,8 +902,8 @@ final class DeletePackageHelper { int installedForUsersCount = 0; synchronized (mPm.mLock) { // Normalize package name to handle renamed packages and static libs - final String internalPkgName = mPm.resolveInternalPackageName(packageName, - versionCode); + final String internalPkgName = mPm.snapshotComputer() + .resolveInternalPackageName(packageName, versionCode); final PackageSetting ps = mPm.mSettings.getPackageLPr(internalPkgName); if (ps != null) { int[] installedUsers = ps.queryInstalledUsers(mUserManagerInternal.getUserIds(), diff --git a/services/core/java/com/android/server/pm/DexOptHelper.java b/services/core/java/com/android/server/pm/DexOptHelper.java index 74ea7cc9b4e1..50b2e2321886 100644 --- a/services/core/java/com/android/server/pm/DexOptHelper.java +++ b/services/core/java/com/android/server/pm/DexOptHelper.java @@ -266,8 +266,9 @@ final class DexOptHelper { return; } + final Computer snapshot = mPm.snapshotComputer(); List<PackageStateInternal> pkgSettings = - getPackagesForDexopt(mPm.getPackageStates().values(), mPm); + getPackagesForDexopt(snapshot.getPackageStates().values(), mPm); List<AndroidPackage> pkgs = new ArrayList<>(pkgSettings.size()); for (int index = 0; index < pkgSettings.size(); index++) { @@ -282,17 +283,19 @@ final class DexOptHelper { final int elapsedTimeSeconds = (int) TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - startTime); + final Computer newSnapshot = mPm.snapshotComputer(); + MetricsLogger.histogram(mPm.mContext, "opt_dialog_num_dexopted", stats[0]); MetricsLogger.histogram(mPm.mContext, "opt_dialog_num_skipped", stats[1]); MetricsLogger.histogram(mPm.mContext, "opt_dialog_num_failed", stats[2]); - MetricsLogger.histogram( - mPm.mContext, "opt_dialog_num_total", getOptimizablePackages().size()); + MetricsLogger.histogram(mPm.mContext, "opt_dialog_num_total", + getOptimizablePackages(newSnapshot).size()); MetricsLogger.histogram(mPm.mContext, "opt_dialog_time_s", elapsedTimeSeconds); } - public ArraySet<String> getOptimizablePackages() { + public ArraySet<String> getOptimizablePackages(@NonNull Computer snapshot) { ArraySet<String> pkgs = new ArraySet<>(); - mPm.forEachPackageState(packageState -> { + mPm.forEachPackageState(snapshot, packageState -> { final AndroidPackage pkg = packageState.getPkg(); if (pkg != null && mPm.mPackageDexOptimizer.canOptimizePackage(pkg)) { pkgs.add(packageState.getPackageName()); @@ -302,10 +305,10 @@ final class DexOptHelper { } /*package*/ boolean performDexOpt(DexoptOptions options) { - if (mPm.getInstantAppPackageName(Binder.getCallingUid()) != null) { + final Computer snapshot = mPm.snapshotComputer(); + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { return false; - } else if (mPm.mIPackageManager.isInstantApp(options.getPackageName(), - UserHandle.getCallingUserId())) { + } else if (snapshot.isInstantApp(options.getPackageName(), UserHandle.getCallingUserId())) { return false; } @@ -417,10 +420,10 @@ final class DexOptHelper { mPm.getDexManager().getPackageUseInfoOrDefault(p.getPackageName()), options); } - public void forceDexOpt(String packageName) { + public void forceDexOpt(@NonNull Computer snapshot, String packageName) { PackageManagerServiceUtils.enforceSystemOrRoot("forceDexOpt"); - final PackageStateInternal packageState = mPm.getPackageStateInternal(packageName); + final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); final AndroidPackage pkg = packageState == null ? null : packageState.getPkg(); if (packageState == null || pkg == null) { throw new IllegalArgumentException("Unknown package: " + packageName); @@ -485,19 +488,21 @@ final class DexOptHelper { ArrayList<PackageStateInternal> sortTemp = new ArrayList<>(remainingPkgSettings.size()); + final Computer snapshot = packageManagerService.snapshotComputer(); + // Give priority to core apps. - applyPackageFilter(pkgSetting -> pkgSetting.getPkg().isCoreApp(), result, + applyPackageFilter(snapshot, pkgSetting -> pkgSetting.getPkg().isCoreApp(), result, remainingPkgSettings, sortTemp, packageManagerService); // Give priority to system apps that listen for pre boot complete. Intent intent = new Intent(Intent.ACTION_PRE_BOOT_COMPLETED); final ArraySet<String> pkgNames = getPackageNamesForIntent(intent, UserHandle.USER_SYSTEM); - applyPackageFilter(pkgSetting -> pkgNames.contains(pkgSetting.getPackageName()), result, + applyPackageFilter(snapshot, pkgSetting -> pkgNames.contains(pkgSetting.getPackageName()), result, remainingPkgSettings, sortTemp, packageManagerService); // Give priority to apps used by other apps. DexManager dexManager = packageManagerService.getDexManager(); - applyPackageFilter(pkgSetting -> + applyPackageFilter(snapshot, pkgSetting -> dexManager.getPackageUseInfoOrDefault(pkgSetting.getPackageName()) .isAnyCodePathUsedByOtherApps(), result, remainingPkgSettings, sortTemp, packageManagerService); @@ -535,7 +540,7 @@ final class DexOptHelper { // No historical info. Take all. remainingPredicate = pkgSetting -> true; } - applyPackageFilter(remainingPredicate, result, remainingPkgSettings, sortTemp, + applyPackageFilter(snapshot, remainingPredicate, result, remainingPkgSettings, sortTemp, packageManagerService); if (debug) { @@ -550,7 +555,7 @@ final class DexOptHelper { // package will be removed from {@code packages} and added to {@code result} with its // dependencies. If usage data is available, the positive packages will be sorted by usage // data (with {@code sortTemp} as temporary storage). - private static void applyPackageFilter( + private static void applyPackageFilter(@NonNull Computer snapshot, Predicate<PackageStateInternal> filter, Collection<PackageStateInternal> result, Collection<PackageStateInternal> packages, @@ -568,8 +573,7 @@ final class DexOptHelper { for (PackageStateInternal pkgSetting : sortTemp) { result.add(pkgSetting); - List<PackageStateInternal> deps = - packageManagerService.findSharedNonSystemLibraries(pkgSetting); + List<PackageStateInternal> deps = snapshot.findSharedNonSystemLibraries(pkgSetting); if (!deps.isEmpty()) { deps.removeAll(result); result.addAll(deps); diff --git a/services/core/java/com/android/server/pm/DomainVerificationConnection.java b/services/core/java/com/android/server/pm/DomainVerificationConnection.java index db8c6dc60b5e..20e4dd8a995b 100644 --- a/services/core/java/com/android/server/pm/DomainVerificationConnection.java +++ b/services/core/java/com/android/server/pm/DomainVerificationConnection.java @@ -21,7 +21,6 @@ import static com.android.server.pm.PackageManagerService.DOMAIN_VERIFICATION; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; -import android.content.pm.PackageManagerInternal; import android.os.Binder; import android.os.Message; import android.os.UserHandle; @@ -35,13 +34,10 @@ import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV2; public final class DomainVerificationConnection implements DomainVerificationService.Connection, DomainVerificationProxyV1.Connection, DomainVerificationProxyV2.Connection { final PackageManagerService mPm; - final PackageManagerInternal mPmInternal; final UserManagerInternal mUmInternal; - // TODO(b/198166813): remove PMS dependency DomainVerificationConnection(PackageManagerService pm) { mPm = pm; - mPmInternal = mPm.mInjector.getLocalService(PackageManagerInternal.class); mUmInternal = mPm.mInjector.getLocalService(UserManagerInternal.class); } @@ -82,18 +78,18 @@ public final class DomainVerificationConnection implements DomainVerificationSer @Override public boolean isCallerPackage(int callingUid, @NonNull String packageName) { final int callingUserId = UserHandle.getUserId(callingUid); - return callingUid == mPmInternal.getPackageUid(packageName, 0, callingUserId); + return callingUid == mPm.snapshotComputer().getPackageUid(packageName, 0, callingUserId); } @Nullable @Override public AndroidPackage getPackage(@NonNull String packageName) { - return mPmInternal.getPackage(packageName); + return mPm.snapshotComputer().getPackage(packageName); } @Override public boolean filterAppAccess(String packageName, int callingUid, int userId) { - return mPmInternal.filterAppAccess(packageName, callingUid, userId); + return mPm.snapshotComputer().filterAppAccess(packageName, callingUid, userId); } @Override @@ -108,6 +104,6 @@ public final class DomainVerificationConnection implements DomainVerificationSer @NonNull public Computer snapshot() { - return (Computer) mPmInternal.snapshot(); + return mPm.snapshotComputer(); } } diff --git a/services/core/java/com/android/server/pm/DumpHelper.java b/services/core/java/com/android/server/pm/DumpHelper.java index 05ef3c4ec300..f83ef5aea23a 100644 --- a/services/core/java/com/android/server/pm/DumpHelper.java +++ b/services/core/java/com/android/server/pm/DumpHelper.java @@ -55,6 +55,7 @@ final class DumpHelper { @NeverCompile // Avoid size overhead of debugging code. public void doDump(FileDescriptor fd, PrintWriter pw, String[] args) { + final Computer snapshot = mPm.snapshotComputer(); DumpState dumpState = new DumpState(); ArraySet<String> permissionNames = null; @@ -121,7 +122,7 @@ final class DumpHelper { } // Normalize package name to handle renamed packages and static libs - pkg = mPm.resolveInternalPackageName(pkg, PackageManager.VERSION_CODE_HIGHEST); + pkg = snapshot.resolveInternalPackageName(pkg, PackageManager.VERSION_CODE_HIGHEST); pw.println(mPm.checkPermission(perm, pkg, user)); return; @@ -243,7 +244,7 @@ final class DumpHelper { // Return if the package doesn't exist. if (packageName != null - && mPm.getPackageStateInternal(packageName) == null + && snapshot.getPackageStateInternal(packageName) == null && !mPm.mApexManager.isApexPackage(packageName)) { pw.println("Unable to find package: " + packageName); return; @@ -257,7 +258,7 @@ final class DumpHelper { if (!checkin && dumpState.isDumping(DumpState.DUMP_VERSION) && packageName == null) { - mPm.dumpComputer(DumpState.DUMP_VERSION, fd, pw, dumpState); + snapshot.dump(DumpState.DUMP_VERSION, fd, pw, dumpState); } if (!checkin @@ -273,7 +274,7 @@ final class DumpHelper { final String knownPackage = PackageManagerInternal.knownPackageToString(i); ipw.print(knownPackage); ipw.println(":"); - final String[] pkgNames = mPm.getKnownPackageNamesInternal(i, + final String[] pkgNames = mPm.getKnownPackageNamesInternal(snapshot, i, UserHandle.USER_SYSTEM); ipw.increaseIndent(); if (ArrayUtils.isEmpty(pkgNames)) { @@ -288,8 +289,6 @@ final class DumpHelper { ipw.decreaseIndent(); } - final Computer snapshot = mPm.snapshotComputer(); - if (dumpState.isDumping(DumpState.DUMP_VERIFIERS) && packageName == null) { final String requiredVerifierPackage = mPm.mRequiredVerifierPackage; @@ -343,7 +342,7 @@ final class DumpHelper { if (dumpState.isDumping(DumpState.DUMP_LIBS) && packageName == null) { - mPm.dumpComputer(DumpState.DUMP_LIBS, fd, pw, dumpState); + snapshot.dump(DumpState.DUMP_LIBS, fd, pw, dumpState); } if (dumpState.isDumping(DumpState.DUMP_FEATURES) @@ -389,17 +388,17 @@ final class DumpHelper { } if (!checkin && dumpState.isDumping(DumpState.DUMP_PREFERRED)) { - mPm.dumpComputer(DumpState.DUMP_PREFERRED, fd, pw, dumpState); + snapshot.dump(DumpState.DUMP_PREFERRED, fd, pw, dumpState); } if (!checkin && dumpState.isDumping(DumpState.DUMP_PREFERRED_XML) && packageName == null) { - mPm.dumpComputer(DumpState.DUMP_PREFERRED_XML, fd, pw, dumpState); + snapshot.dump(DumpState.DUMP_PREFERRED_XML, fd, pw, dumpState); } if (!checkin && dumpState.isDumping(DumpState.DUMP_DOMAIN_PREFERRED)) { - mPm.dumpComputer(DumpState.DUMP_DOMAIN_PREFERRED, fd, pw, dumpState); + snapshot.dump(DumpState.DUMP_DOMAIN_PREFERRED, fd, pw, dumpState); } if (!checkin && dumpState.isDumping(DumpState.DUMP_PERMISSIONS)) { @@ -429,7 +428,7 @@ final class DumpHelper { if (!checkin && dumpState.isDumping(DumpState.DUMP_QUERIES)) { - mPm.dumpComputer(DumpState.DUMP_QUERIES, fd, pw, dumpState); + snapshot.dump(DumpState.DUMP_QUERIES, fd, pw, dumpState); } if (dumpState.isDumping(DumpState.DUMP_SHARED_USERS)) { @@ -529,12 +528,12 @@ final class DumpHelper { if (!checkin && dumpState.isDumping(DumpState.DUMP_DEXOPT)) { - mPm.dumpComputer(DumpState.DUMP_DEXOPT, fd, pw, dumpState); + snapshot.dump(DumpState.DUMP_DEXOPT, fd, pw, dumpState); } if (!checkin && dumpState.isDumping(DumpState.DUMP_COMPILER_STATS)) { - mPm.dumpComputer(DumpState.DUMP_COMPILER_STATS, fd, pw, dumpState); + snapshot.dump(DumpState.DUMP_COMPILER_STATS, fd, pw, dumpState); } if (dumpState.isDumping(DumpState.DUMP_MESSAGES) @@ -581,7 +580,7 @@ final class DumpHelper { pw.println(" Known digesters list flag: " + PackageManagerService.getKnownDigestersList()); - PerUidReadTimeouts[] items = mPm.getPerUidReadTimeouts(); + PerUidReadTimeouts[] items = mPm.getPerUidReadTimeouts(snapshot); pw.println(" Timeouts (" + items.length + "):"); for (PerUidReadTimeouts item : items) { pw.print(" ("); diff --git a/services/core/java/com/android/server/pm/IPackageManagerBase.java b/services/core/java/com/android/server/pm/IPackageManagerBase.java new file mode 100644 index 000000000000..e1aee6d747f4 --- /dev/null +++ b/services/core/java/com/android/server/pm/IPackageManagerBase.java @@ -0,0 +1,1189 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm; + + +import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SuppressLint; +import android.annotation.UserIdInt; +import android.app.role.RoleManager; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; +import android.content.pm.IPackageDeleteObserver; +import android.content.pm.IPackageDeleteObserver2; +import android.content.pm.IPackageInstaller; +import android.content.pm.IPackageManager; +import android.content.pm.IPackageStatsObserver; +import android.content.pm.InstallSourceInfo; +import android.content.pm.InstrumentationInfo; +import android.content.pm.IntentFilterVerificationInfo; +import android.content.pm.KeySet; +import android.content.pm.ModuleInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.ParceledListSlice; +import android.content.pm.PermissionGroupInfo; +import android.content.pm.PermissionInfo; +import android.content.pm.ProviderInfo; +import android.content.pm.ResolveInfo; +import android.content.pm.ServiceInfo; +import android.content.pm.SharedLibraryInfo; +import android.content.pm.VersionedPackage; +import android.content.pm.dex.IArtManager; +import android.os.Binder; +import android.os.Process; +import android.os.RemoteException; +import android.os.Trace; +import android.os.UserHandle; +import android.permission.PermissionManager; + +import com.android.internal.R; +import com.android.internal.content.InstallLocationUtils; +import com.android.internal.util.CollectionUtils; +import com.android.server.pm.pkg.PackageStateInternal; +import com.android.server.pm.verify.domain.DomainVerificationManagerInternal; +import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV1; + +import java.util.List; +import java.util.Objects; + +/** + * Contains all simply proxy methods which need a snapshot instance and just calls a method on it, + * with no additional logic. Separated with all methods marked final and deprecated to prevent their + * use from other methods which may need a snapshot for non-trivial reasons. + */ +public abstract class IPackageManagerBase extends IPackageManager.Stub { + + @NonNull + private final PackageManagerService mService; + + @NonNull + private final Context mContext; + + @NonNull private final DexOptHelper mDexOptHelper; + @NonNull private final ModuleInfoProvider mModuleInfoProvider; + @NonNull private final PreferredActivityHelper mPreferredActivityHelper; + @NonNull private final ResolveIntentHelper mResolveIntentHelper; + + @NonNull + private final DomainVerificationManagerInternal mDomainVerificationManager; + + @NonNull + private final DomainVerificationConnection mDomainVerificationConnection; + + @NonNull + private final PackageInstallerService mInstallerService; + + @NonNull + private final PackageProperty mPackageProperty; + + @NonNull + private final ComponentName mResolveComponentName; + + @Nullable + private final ComponentName mInstantAppResolverSettingsComponent; + + @NonNull + private final String mRequiredSupplementalProcessPackage; + + @Nullable + private final String mServicesExtensionPackageName; + + @Nullable + private final String mSharedSystemSharedLibraryPackageName; + + public IPackageManagerBase(@NonNull PackageManagerService service, @NonNull Context context, + @NonNull DexOptHelper dexOptHelper, @NonNull ModuleInfoProvider moduleInfoProvider, + @NonNull PreferredActivityHelper preferredActivityHelper, + @NonNull ResolveIntentHelper resolveIntentHelper, + @NonNull DomainVerificationManagerInternal domainVerificationManager, + @NonNull DomainVerificationConnection domainVerificationConnection, + @NonNull PackageInstallerService installerService, + @NonNull PackageProperty packageProperty, @NonNull ComponentName resolveComponentName, + @Nullable ComponentName instantAppResolverSettingsComponent, + @NonNull String requiredSupplementalProcessPackage, + @Nullable String servicesExtensionPackageName, + @Nullable String sharedSystemSharedLibraryPackageName) { + mService = service; + mContext = context; + mDexOptHelper = dexOptHelper; + mModuleInfoProvider = moduleInfoProvider; + mPreferredActivityHelper = preferredActivityHelper; + mResolveIntentHelper = resolveIntentHelper; + mDomainVerificationManager = domainVerificationManager; + mDomainVerificationConnection = domainVerificationConnection; + mInstallerService = installerService; + mPackageProperty = packageProperty; + mResolveComponentName = resolveComponentName; + mInstantAppResolverSettingsComponent = instantAppResolverSettingsComponent; + mRequiredSupplementalProcessPackage = requiredSupplementalProcessPackage; + mServicesExtensionPackageName = servicesExtensionPackageName; + mSharedSystemSharedLibraryPackageName = sharedSystemSharedLibraryPackageName; + } + + protected Computer snapshot() { + return mService.snapshotComputer(); + } + + @Override + @Deprecated + public final boolean activitySupportsIntent(ComponentName component, Intent intent, + String resolvedType) { + return snapshot().activitySupportsIntent(mResolveComponentName, component, intent, + resolvedType); + } + + @Override + @Deprecated + public final void addCrossProfileIntentFilter(IntentFilter intentFilter, String ownerPackage, + int sourceUserId, int targetUserId, int flags) { + mService.addCrossProfileIntentFilter(snapshot(), + new WatchedIntentFilter(intentFilter), ownerPackage, sourceUserId, targetUserId, + flags); + } + + // NOTE: Can't remove due to unsupported app usage + @Override + @Deprecated + public final boolean addPermission(PermissionInfo info) { + // Because this is accessed via the package manager service AIDL, + // go through the permission manager service AIDL + return mContext.getSystemService(PermissionManager.class).addPermission(info, false); + } + + // NOTE: Can't remove due to unsupported app usage + @Override + @Deprecated + public final boolean addPermissionAsync(PermissionInfo info) { + // Because this is accessed via the package manager service AIDL, + // go through the permission manager service AIDL + return mContext.getSystemService(PermissionManager.class).addPermission(info, true); + } + + @Override + @Deprecated + public final void addPersistentPreferredActivity(IntentFilter filter, ComponentName activity, + int userId) { + mPreferredActivityHelper.addPersistentPreferredActivity(new WatchedIntentFilter(filter), + activity, userId); + } + + @Override + @Deprecated + public final void addPreferredActivity(IntentFilter filter, int match, + ComponentName[] set, ComponentName activity, int userId, boolean removeExisting) { + mPreferredActivityHelper.addPreferredActivity(snapshot(), + new WatchedIntentFilter(filter), match, set, activity, true, userId, + "Adding preferred", removeExisting); + } + + /* + * Returns if intent can be forwarded from the sourceUserId to the targetUserId + */ + @Override + @Deprecated + public final boolean canForwardTo(@NonNull Intent intent, @Nullable String resolvedType, + @UserIdInt int sourceUserId, @UserIdInt int targetUserId) { + return snapshot().canForwardTo(intent, resolvedType, sourceUserId, targetUserId); + } + + @Override + @Deprecated + public final boolean canRequestPackageInstalls(String packageName, int userId) { + return snapshot().canRequestPackageInstalls(packageName, Binder.getCallingUid(), userId, + true /* throwIfPermNotDeclared*/); + } + + @Override + @Deprecated + public final String[] canonicalToCurrentPackageNames(String[] names) { + return snapshot().canonicalToCurrentPackageNames(names); + } + + // NOTE: Can't remove due to unsupported app usage + @Override + @Deprecated + public final int checkPermission(String permName, String pkgName, int userId) { + return mService.checkPermission(permName, pkgName, userId); + } + + @Override + @Deprecated + public final int checkSignatures(@NonNull String pkg1, @NonNull String pkg2) { + return snapshot().checkSignatures(pkg1, pkg2); + } + + @Override + @Deprecated + public final int checkUidPermission(String permName, int uid) { + return snapshot().checkUidPermission(permName, uid); + } + + @Override + @Deprecated + public final int checkUidSignatures(int uid1, int uid2) { + return snapshot().checkUidSignatures(uid1, uid2); + } + + @Override + @Deprecated + public final void clearPackagePersistentPreferredActivities(String packageName, int userId) { + mPreferredActivityHelper.clearPackagePersistentPreferredActivities(packageName, userId); + } + + @Override + @Deprecated + public final void clearPackagePreferredActivities(String packageName) { + mPreferredActivityHelper.clearPackagePreferredActivities(snapshot(), + packageName); + } + + @Override + @Deprecated + public final String[] currentToCanonicalPackageNames(String[] names) { + return snapshot().currentToCanonicalPackageNames(names); + } + + @Override + @Deprecated + public final void deleteExistingPackageAsUser(VersionedPackage versionedPackage, + final IPackageDeleteObserver2 observer, final int userId) { + mService.deleteExistingPackageAsUser(versionedPackage, observer, userId); + } + + @Override + @Deprecated + public final void deletePackageAsUser(String packageName, int versionCode, + IPackageDeleteObserver observer, int userId, int flags) { + deletePackageVersioned(new VersionedPackage(packageName, versionCode), + new PackageManager.LegacyPackageDeleteObserver(observer).getBinder(), userId, + flags); + } + + @Override + @Deprecated + public final void deletePackageVersioned(VersionedPackage versionedPackage, + final IPackageDeleteObserver2 observer, final int userId, final int deleteFlags) { + mService.deletePackageVersioned(versionedPackage, observer, userId, deleteFlags); + } + + @Override + @Deprecated + public final ResolveInfo findPersistentPreferredActivity(Intent intent, int userId) { + return mPreferredActivityHelper.findPersistentPreferredActivity(snapshot(), intent, userId); + } + + @Override + @Deprecated + public final void forceDexOpt(String packageName) { + mDexOptHelper.forceDexOpt(snapshot(), packageName); + } + + @Override + @Deprecated + public final ActivityInfo getActivityInfo(ComponentName component, + @PackageManager.ComponentInfoFlagsBits long flags, int userId) { + return snapshot().getActivityInfo(component, flags, userId); + } + + @NonNull + @Override + @Deprecated + public final ParceledListSlice<IntentFilter> getAllIntentFilters(@NonNull String packageName) { + return snapshot().getAllIntentFilters(packageName); + } + + @Override + @Deprecated + public final List<String> getAllPackages() { + return snapshot().getAllPackages(); + } + + // NOTE: Can't remove due to unsupported app usage + @NonNull + @Override + @Deprecated + public final String[] getAppOpPermissionPackages(@NonNull String permissionName) { + return snapshot().getAppOpPermissionPackages(permissionName); + } + + @Override + @Deprecated + public final String getAppPredictionServicePackageName() { + return mService.mAppPredictionServicePackage; + } + + @PackageManager.EnabledState + @Override + @Deprecated + public final int getApplicationEnabledSetting(@NonNull String packageName, + @UserIdInt int userId) { + return snapshot().getApplicationEnabledSetting(packageName, userId); + } + + /** + * Returns true if application is not found or there was an error. Otherwise it returns the + * hidden state of the package for the given user. + */ + @Override + @Deprecated + public final boolean getApplicationHiddenSettingAsUser(@NonNull String packageName, + @UserIdInt int userId) { + return snapshot().getApplicationHiddenSettingAsUser(packageName, userId); + } + + @Override + @Deprecated + public final ApplicationInfo getApplicationInfo(String packageName, + @PackageManager.ApplicationInfoFlagsBits long flags, int userId) { + return snapshot().getApplicationInfo(packageName, flags, userId); + } + + @Override + @Deprecated + public final IArtManager getArtManager() { + return mService.mArtManagerService; + } + + @Override + @Deprecated + public final @Nullable + String getAttentionServicePackageName() { + return mService.ensureSystemPackageName(snapshot(), + mService.getPackageFromComponentString(R.string.config_defaultAttentionService)); + } + + @Override + @Deprecated + public final boolean getBlockUninstallForUser(@NonNull String packageName, + @UserIdInt int userId) { + return snapshot().getBlockUninstallForUser(packageName, userId); + } + + @Override + @Deprecated + public final int getComponentEnabledSetting(@NonNull ComponentName component, int userId) { + return snapshot().getComponentEnabledSetting(component, Binder.getCallingUid(), userId); + } + + @Override + @Deprecated + public final String getContentCaptureServicePackageName() { + return mService.ensureSystemPackageName(snapshot(), + mService.getPackageFromComponentString( + R.string.config_defaultContentCaptureService)); + } + + @Nullable + @Override + @Deprecated + public final ParceledListSlice<SharedLibraryInfo> getDeclaredSharedLibraries( + @NonNull String packageName, @PackageManager.PackageInfoFlagsBits long flags, + @NonNull int userId) { + return snapshot().getDeclaredSharedLibraries(packageName, flags, userId); + } + + /** + * Non-Binder method, support for the backup/restore mechanism: write the default browser (etc) + * settings in its canonical XML format. Returns the default browser XML representation as a + * byte array, or null if there is none. + */ + @Override + @Deprecated + public final byte[] getDefaultAppsBackup(int userId) { + return mPreferredActivityHelper.getDefaultAppsBackup(userId); + } + + @Override + @Deprecated + public final String getDefaultTextClassifierPackageName() { + return mService.mDefaultTextClassifierPackage; + } + + @Override + @Deprecated + public final int getFlagsForUid(int uid) { + return snapshot().getFlagsForUid(uid); + } + + @Nullable + @Override + @Deprecated + public final CharSequence getHarmfulAppWarning(@NonNull String packageName, + @UserIdInt int userId) { + return snapshot().getHarmfulAppWarning(packageName, userId); + } + + @Override + @Deprecated + public final ComponentName getHomeActivities(List<ResolveInfo> allHomeCandidates) { + final Computer snapshot = snapshot(); + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { + return null; + } + return snapshot.getHomeActivitiesAsUser(allHomeCandidates, + UserHandle.getCallingUserId()); + } + + @Deprecated + public final String getIncidentReportApproverPackageName() { + return mService.mIncidentReportApproverPackage; + } + + @Override + @Deprecated + public final int getInstallLocation() { + // allow instant app access + return android.provider.Settings.Global.getInt(mContext.getContentResolver(), + android.provider.Settings.Global.DEFAULT_INSTALL_LOCATION, + InstallLocationUtils.APP_INSTALL_AUTO); + } + + @PackageManager.InstallReason + @Override + @Deprecated + public final int getInstallReason(@NonNull String packageName, @UserIdInt int userId) { + return snapshot().getInstallReason(packageName, userId); + } + + @Override + @Nullable + @Deprecated + public final InstallSourceInfo getInstallSourceInfo(@NonNull String packageName) { + return snapshot().getInstallSourceInfo(packageName); + } + + @Override + @Deprecated + public final ParceledListSlice<ApplicationInfo> getInstalledApplications( + @PackageManager.ApplicationInfoFlagsBits long flags, int userId) { + final int callingUid = Binder.getCallingUid(); + return new ParceledListSlice<>( + snapshot().getInstalledApplications(flags, userId, callingUid)); + } + + @Override + @Deprecated + public final List<ModuleInfo> getInstalledModules(int flags) { + return mModuleInfoProvider.getInstalledModules(flags); + } + + @Override + @Deprecated + public final ParceledListSlice<PackageInfo> getInstalledPackages( + @PackageManager.PackageInfoFlagsBits long flags, int userId) { + return snapshot().getInstalledPackages(flags, userId); + } + + @Nullable + @Override + @Deprecated + public final String getInstallerPackageName(@NonNull String packageName) { + return snapshot().getInstallerPackageName(packageName); + } + + @Override + @Deprecated + public final ComponentName getInstantAppInstallerComponent() { + final Computer snapshot = snapshot(); + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { + return null; + } + return snapshot.getInstantAppInstallerComponent(); + } + + @Override + @Deprecated + public final @Nullable + ComponentName getInstantAppResolverComponent() { + final Computer snapshot = snapshot(); + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { + return null; + } + return mService.getInstantAppResolver(snapshot); + } + + @Override + @Deprecated + public final ComponentName getInstantAppResolverSettingsComponent() { + return mInstantAppResolverSettingsComponent; + } + + @Nullable + @Override + @Deprecated + public final InstrumentationInfo getInstrumentationInfo(@NonNull ComponentName component, + int flags) { + return snapshot().getInstrumentationInfo(component, flags); + } + + @Override + @Deprecated + public final @NonNull + ParceledListSlice<IntentFilterVerificationInfo> + getIntentFilterVerifications(String packageName) { + return ParceledListSlice.emptyList(); + } + + @Override + @Deprecated + public final int getIntentVerificationStatus(String packageName, int userId) { + return mDomainVerificationManager.getLegacyState(packageName, userId); + } + + @Nullable + @Override + @Deprecated + public final KeySet getKeySetByAlias(@NonNull String packageName, @NonNull String alias) { + return snapshot().getKeySetByAlias(packageName, alias); + } + + @Override + @Deprecated + public final ModuleInfo getModuleInfo(String packageName, + @PackageManager.ModuleInfoFlags int flags) { + return mModuleInfoProvider.getModuleInfo(packageName, flags); + } + + @Nullable + @Override + @Deprecated + public final String getNameForUid(int uid) { + return snapshot().getNameForUid(uid); + } + + @Nullable + @Override + @Deprecated + public final String[] getNamesForUids(@NonNull int[] uids) { + return snapshot().getNamesForUids(uids); + } + + @Override + @Deprecated + public final int[] getPackageGids(String packageName, + @PackageManager.PackageInfoFlagsBits long flags, int userId) { + return snapshot().getPackageGids(packageName, flags, userId); + } + + @Override + @Deprecated + public final PackageInfo getPackageInfo(String packageName, + @PackageManager.PackageInfoFlagsBits long flags, int userId) { + return snapshot().getPackageInfo(packageName, flags, userId); + } + + @Override + @Deprecated + public final PackageInfo getPackageInfoVersioned(VersionedPackage versionedPackage, + @PackageManager.PackageInfoFlagsBits long flags, int userId) { + return snapshot().getPackageInfoInternal(versionedPackage.getPackageName(), + versionedPackage.getLongVersionCode(), flags, Binder.getCallingUid(), userId); + } + + @Override + @Deprecated + public final IPackageInstaller getPackageInstaller() { + // Return installer service for internal calls. + if (PackageManagerServiceUtils.isSystemOrRoot()) { + return mInstallerService; + } + final Computer snapshot = snapshot(); + // Return null for InstantApps. + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { + return null; + } + return mInstallerService; + } + + @Override + @Deprecated + public final void getPackageSizeInfo(final String packageName, int userId, + final IPackageStatsObserver observer) { + throw new UnsupportedOperationException( + "Shame on you for calling the hidden API getPackageSizeInfo(). Shame!"); + } + + @Override + @Deprecated + public final int getPackageUid(@NonNull String packageName, + @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId) { + return snapshot().getPackageUid(packageName, flags, userId); + } + + /** + * <em>IMPORTANT:</em> Not all packages returned by this method may be known + * to the system. There are two conditions in which this may occur: + * <ol> + * <li>The package is on adoptable storage and the device has been removed</li> + * <li>The package is being removed and the internal structures are partially updated</li> + * </ol> + * The second is an artifact of the current data structures and should be fixed. See + * b/111075456 for one such instance. + * This binder API is cached. If the algorithm in this method changes, + * or if the underlying objecs (as returned by getSettingLPr()) change + * then the logic that invalidates the cache must be revisited. See + * calls to invalidateGetPackagesForUidCache() to locate the points at + * which the cache is invalidated. + */ + @Override + @Deprecated + public final String[] getPackagesForUid(int uid) { + final int callingUid = Binder.getCallingUid(); + final int userId = UserHandle.getUserId(uid); + snapshot().enforceCrossUserOrProfilePermission(callingUid, userId, + /* requireFullPermission */ false, + /* checkShell */ false, "getPackagesForUid"); + return snapshot().getPackagesForUid(uid); + } + + @Override + @Deprecated + public final ParceledListSlice<PackageInfo> getPackagesHoldingPermissions( + @NonNull String[] permissions, @PackageManager.PackageInfoFlagsBits long flags, + @UserIdInt int userId) { + return snapshot().getPackagesHoldingPermissions(permissions, flags, userId); + } + + // NOTE: Can't remove due to unsupported app usage + @Override + @Deprecated + public final PermissionGroupInfo getPermissionGroupInfo(String groupName, int flags) { + return mService.getPermissionGroupInfo(groupName, flags); + } + + @Override + @Deprecated + public final @NonNull + ParceledListSlice<ApplicationInfo> getPersistentApplications(int flags) { + final Computer snapshot = snapshot(); + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { + return ParceledListSlice.emptyList(); + } + return new ParceledListSlice<>(snapshot.getPersistentApplications(isSafeMode(), flags)); + } + + @Override + @Deprecated + public final int getPreferredActivities(List<IntentFilter> outFilters, + List<ComponentName> outActivities, String packageName) { + return mPreferredActivityHelper.getPreferredActivities(snapshot(), outFilters, + outActivities, packageName); + } + + /** + * Non-Binder method, support for the backup/restore mechanism: write the full set of preferred + * activities in its canonical XML format. Returns the XML output as a byte array, or null if + * there is none. + */ + @Override + @Deprecated + public final byte[] getPreferredActivityBackup(int userId) { + return mPreferredActivityHelper.getPreferredActivityBackup(userId); + } + + @Override + @Deprecated + public final int getPrivateFlagsForUid(int uid) { + return snapshot().getPrivateFlagsForUid(uid); + } + + @Override + @Deprecated + public final PackageManager.Property getProperty(String propertyName, String packageName, + String className) { + Objects.requireNonNull(propertyName); + Objects.requireNonNull(packageName); + PackageStateInternal packageState = snapshot().getPackageStateFiltered(packageName, + Binder.getCallingUid(), UserHandle.getCallingUserId()); + if (packageState == null) { + return null; + } + return mPackageProperty.getProperty(propertyName, packageName, className); + } + + @Nullable + @Override + @Deprecated + public final ProviderInfo getProviderInfo(@NonNull ComponentName component, + @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId) { + return snapshot().getProviderInfo(component, flags, userId); + } + + @Override + @Deprecated + public final ActivityInfo getReceiverInfo(ComponentName component, + @PackageManager.ComponentInfoFlagsBits long flags, int userId) { + return snapshot().getReceiverInfo(component, flags, userId); + } + + @Override + @Deprecated + public final @Nullable + String getRotationResolverPackageName() { + return mService.ensureSystemPackageName(snapshot(), + mService.getPackageFromComponentString( + R.string.config_defaultRotationResolverService)); + } + + @Nullable + @Override + @Deprecated + public final ServiceInfo getServiceInfo(@NonNull ComponentName component, + @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId) { + return snapshot().getServiceInfo(component, flags, userId); + } + + @Override + @Deprecated + public final @NonNull + String getServicesSystemSharedLibraryPackageName() { + return mServicesExtensionPackageName; + } + + @Override + @Deprecated + public final String getSetupWizardPackageName() { + if (Binder.getCallingUid() != Process.SYSTEM_UID) { + throw new SecurityException("Non-system caller"); + } + return mService.mSetupWizardPackage; + } + + @Override + @Deprecated + public final ParceledListSlice<SharedLibraryInfo> getSharedLibraries(String packageName, + @PackageManager.PackageInfoFlagsBits long flags, int userId) { + return snapshot().getSharedLibraries(packageName, flags, userId); + } + + @Override + @Deprecated + public final @NonNull + String getSharedSystemSharedLibraryPackageName() { + return mSharedSystemSharedLibraryPackageName; + } + + @Nullable + @Override + @Deprecated + public final KeySet getSigningKeySet(@NonNull String packageName) { + return snapshot().getSigningKeySet(packageName); + } + + @Override + @Deprecated + public final String getSdkSandboxPackageName() { + return mService.getSdkSandboxPackageName(); + } + + @Override + @Deprecated + public final String getSystemCaptionsServicePackageName() { + return mService.ensureSystemPackageName(snapshot(), + mService.getPackageFromComponentString( + R.string.config_defaultSystemCaptionsService)); + } + + @Nullable + @Override + @Deprecated + public final String[] getSystemSharedLibraryNames() { + return snapshot().getSystemSharedLibraryNames(); + } + + @Override + @Deprecated + public final String getSystemTextClassifierPackageName() { + return mService.mSystemTextClassifierPackageName; + } + + @Override + @Deprecated + public final int getTargetSdkVersion(@NonNull String packageName) { + return snapshot().getTargetSdkVersion(packageName); + } + + @Override + @Deprecated + public final int getUidForSharedUser(@NonNull String sharedUserName) { + return snapshot().getUidForSharedUser(sharedUserName); + } + + @SuppressLint("MissingPermission") + @Override + @Deprecated + public final String getWellbeingPackageName() { + final long identity = Binder.clearCallingIdentity(); + try { + return CollectionUtils.firstOrNull( + mContext.getSystemService(RoleManager.class).getRoleHolders( + RoleManager.ROLE_SYSTEM_WELLBEING)); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + + // NOTE: Can't remove due to unsupported app usage + @SuppressLint("MissingPermission") + @Override + @Deprecated + public final void grantRuntimePermission(String packageName, String permName, + final int userId) { + // Because this is accessed via the package manager service AIDL, + // go through the permission manager service AIDL + mContext.getSystemService(PermissionManager.class) + .grantRuntimePermission(packageName, permName, UserHandle.of(userId)); + } + + @Override + @Deprecated + public final boolean hasSigningCertificate(@NonNull String packageName, + @NonNull byte[] certificate, + @PackageManager.CertificateInputType int type) { + return snapshot().hasSigningCertificate(packageName, certificate, type); + } + + @Override + @Deprecated + public final boolean hasSystemFeature(String name, int version) { + return mService.hasSystemFeature(name, version); + } + + @Override + @Deprecated + public final boolean hasSystemUidErrors() { + // allow instant applications + return false; + } + + @Override + @Deprecated + public final boolean hasUidSigningCertificate(int uid, @NonNull byte[] certificate, + @PackageManager.CertificateInputType int type) { + return snapshot().hasUidSigningCertificate(uid, certificate, type); + } + + @Override + @Deprecated + public final boolean isDeviceUpgrading() { + return mService.isDeviceUpgrading(); + } + + @Override + @Deprecated + public final boolean isFirstBoot() { + return mService.isFirstBoot(); + } + + @Override + @Deprecated + public final boolean isInstantApp(String packageName, int userId) { + return snapshot().isInstantApp(packageName, userId); + } + + @Override + @Deprecated + public final boolean isOnlyCoreApps() { + return mService.isOnlyCoreApps(); + } + + @Override + @Deprecated + public final boolean isPackageAvailable(String packageName, int userId) { + return snapshot().isPackageAvailable(packageName, userId); + } + + @Override + @Deprecated + public final boolean isPackageDeviceAdminOnAnyUser(String packageName) { + return mService.isPackageDeviceAdminOnAnyUser(snapshot(), + packageName); + } + + @Override + @Deprecated + public final boolean isPackageSignedByKeySet(@NonNull String packageName, @NonNull KeySet ks) { + return snapshot().isPackageSignedByKeySet(packageName, ks); + } + + @Override + @Deprecated + public final boolean isPackageSignedByKeySetExactly(@NonNull String packageName, + @NonNull KeySet ks) { + return snapshot().isPackageSignedByKeySetExactly(packageName, ks); + } + + @Override + @Deprecated + public final boolean isPackageSuspendedForUser(@NonNull String packageName, + @UserIdInt int userId) { + return snapshot().isPackageSuspendedForUser(packageName, userId); + } + + @Override + @Deprecated + public final boolean isSafeMode() { + // allow instant applications + return mService.getSafeMode(); + } + + @Override + @Deprecated + public final boolean isStorageLow() { + return mService.isStorageLow(); + } + + @Override + @Deprecated + public final boolean isUidPrivileged(int uid) { + return snapshot().isUidPrivileged(uid); + } + + /** + * Ask the package manager to perform a dex-opt with the given compiler filter. + * <p> + * Note: exposed only for the shell command to allow moving packages explicitly to a definite + * state. + */ + @Override + @Deprecated + public final boolean performDexOptMode(String packageName, + boolean checkProfiles, String targetCompilerFilter, boolean force, + boolean bootComplete, String splitName) { + return mDexOptHelper.performDexOptMode(packageName, checkProfiles, targetCompilerFilter, + force, bootComplete, splitName); + } + + /** + * Ask the package manager to perform a dex-opt with the given compiler filter on the secondary + * dex files belonging to the given package. + * <p> + * Note: exposed only for the shell command to allow moving packages explicitly to a definite + * state. + */ + @Override + @Deprecated + public final boolean performDexOptSecondary(String packageName, String compilerFilter, + boolean force) { + return mDexOptHelper.performDexOptSecondary(packageName, compilerFilter, force); + } + + @Override + @Deprecated + public final @NonNull + ParceledListSlice<ResolveInfo> queryIntentActivities(Intent intent, + String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { + try { + Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "queryIntentActivities"); + + return new ParceledListSlice<>(snapshot().queryIntentActivitiesInternal(intent, + resolvedType, flags, userId)); + } finally { + Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); + } + } + + @NonNull + @Override + @Deprecated + public final ParceledListSlice<ProviderInfo> queryContentProviders(@Nullable String processName, + int uid, @PackageManager.ComponentInfoFlagsBits long flags, + @Nullable String metaDataKey) { + return snapshot().queryContentProviders(processName, uid, flags, metaDataKey); + } + + @NonNull + @Override + @Deprecated + public final ParceledListSlice<InstrumentationInfo> queryInstrumentation( + @NonNull String targetPackage, int flags) { + return snapshot().queryInstrumentation(targetPackage, flags); + } + + @Override + @Deprecated + public final @NonNull + ParceledListSlice<ResolveInfo> queryIntentActivityOptions( + ComponentName caller, Intent[] specifics, String[] specificTypes, Intent intent, + String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { + return new ParceledListSlice<>(mResolveIntentHelper.queryIntentActivityOptionsInternal( + snapshot(), caller, specifics, specificTypes, intent, resolvedType, flags, + userId)); + } + + @Override + @Deprecated + public final @NonNull + ParceledListSlice<ResolveInfo> queryIntentContentProviders(Intent intent, + String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { + return new ParceledListSlice<>(mResolveIntentHelper.queryIntentContentProvidersInternal( + snapshot(), intent, resolvedType, flags, userId)); + } + + @Override + @Deprecated + public final @NonNull + ParceledListSlice<ResolveInfo> queryIntentReceivers(Intent intent, + String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { + return new ParceledListSlice<>(mResolveIntentHelper.queryIntentReceiversInternal( + snapshot(), intent, resolvedType, flags, userId, Binder.getCallingUid())); + } + + @Override + @Deprecated + public final @NonNull + ParceledListSlice<ResolveInfo> queryIntentServices(Intent intent, + String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { + final int callingUid = Binder.getCallingUid(); + return new ParceledListSlice<>(snapshot().queryIntentServicesInternal( + intent, resolvedType, flags, userId, callingUid, false /*includeInstantApps*/)); + } + + @Override + @Deprecated + public final void querySyncProviders(List<String> outNames, List<ProviderInfo> outInfo) { + snapshot().querySyncProviders(isSafeMode(), outNames, outInfo); + } + + @Override + @Deprecated + public final void removePermission(String permName) { + // Because this is accessed via the package manager service AIDL, + // go through the permission manager service AIDL + mContext.getSystemService(PermissionManager.class).removePermission(permName); + } + + @Override + @Deprecated + public final void replacePreferredActivity(IntentFilter filter, int match, + ComponentName[] set, ComponentName activity, int userId) { + mPreferredActivityHelper.replacePreferredActivity(snapshot(), + new WatchedIntentFilter(filter), match, set, activity, userId); + } + + @Override + @Deprecated + public final ProviderInfo resolveContentProvider(String name, + @PackageManager.ResolveInfoFlagsBits long flags, int userId) { + return snapshot().resolveContentProvider(name, flags, userId, Binder.getCallingUid()); + } + + @Override + @Deprecated + public final void resetApplicationPreferences(int userId) { + mPreferredActivityHelper.resetApplicationPreferences(userId); + } + + @Override + @Deprecated + public final ResolveInfo resolveIntent(Intent intent, String resolvedType, + @PackageManager.ResolveInfoFlagsBits long flags, int userId) { + return mResolveIntentHelper.resolveIntentInternal(snapshot(), intent, + resolvedType, flags, 0 /*privateResolveFlags*/, userId, false, + Binder.getCallingUid()); + } + + @Override + @Deprecated + public final ResolveInfo resolveService(Intent intent, String resolvedType, + @PackageManager.ResolveInfoFlagsBits long flags, int userId) { + final int callingUid = Binder.getCallingUid(); + return mResolveIntentHelper.resolveServiceInternal(snapshot(), intent, + resolvedType, flags, userId, callingUid); + } + + @Override + @Deprecated + public final void restoreDefaultApps(byte[] backup, int userId) { + mPreferredActivityHelper.restoreDefaultApps(backup, userId); + } + + @Override + @Deprecated + public final void restorePreferredActivities(byte[] backup, int userId) { + mPreferredActivityHelper.restorePreferredActivities(backup, userId); + } + + @Override + @Deprecated + public final void setHomeActivity(ComponentName comp, int userId) { + mPreferredActivityHelper.setHomeActivity(snapshot(), comp, userId); + } + + @Override + @Deprecated + public final void setLastChosenActivity(Intent intent, String resolvedType, int flags, + IntentFilter filter, int match, ComponentName activity) { + mPreferredActivityHelper.setLastChosenActivity(snapshot(), intent, resolvedType, + flags, new WatchedIntentFilter(filter), match, activity); + } + + @Override + @Deprecated + public final boolean updateIntentVerificationStatus(String packageName, int status, + int userId) { + return mDomainVerificationManager.setLegacyUserState(packageName, userId, status); + } + + @Override + @Deprecated + public final void verifyIntentFilter(int id, int verificationCode, List<String> failedDomains) { + DomainVerificationProxyV1.queueLegacyVerifyResult(mContext, mDomainVerificationConnection, + id, verificationCode, failedDomains, Binder.getCallingUid()); + } + + @Override + @Deprecated + public final boolean canPackageQuery(@NonNull String sourcePackageName, + @NonNull String targetPackageName, @UserIdInt int userId) { + return snapshot().canPackageQuery(sourcePackageName, targetPackageName, userId); + } + + @Override + @Deprecated + public final void deletePreloadsFileCache() throws RemoteException { + mService.deletePreloadsFileCache(); + } + + @Override + @Deprecated + public final void setSystemAppHiddenUntilInstalled(String packageName, boolean hidden) + throws RemoteException { + mService.setSystemAppHiddenUntilInstalled(snapshot(), packageName, hidden); + } + + @Override + @Deprecated + public final boolean setSystemAppInstallState(String packageName, + boolean installed, int userId) throws RemoteException { + return mService.setSystemAppInstallState(snapshot(), packageName, installed, userId); + } + + @Override + @Deprecated + public final void finishPackageInstall(int token, boolean didLaunch) throws RemoteException { + mService.finishPackageInstall(token, didLaunch); + } +} diff --git a/services/core/java/com/android/server/pm/IncrementalProgressListener.java b/services/core/java/com/android/server/pm/IncrementalProgressListener.java index fa11924218d4..703bbda92182 100644 --- a/services/core/java/com/android/server/pm/IncrementalProgressListener.java +++ b/services/core/java/com/android/server/pm/IncrementalProgressListener.java @@ -33,7 +33,8 @@ final class IncrementalProgressListener extends IPackageLoadingProgressCallback. @Override public void onPackageLoadingProgressChanged(float progress) { - PackageStateInternal packageState = mPm.getPackageStateInternal(mPackageName); + PackageStateInternal packageState = mPm.snapshotComputer() + .getPackageStateInternal(mPackageName); if (packageState == null) { return; } diff --git a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java index 8d7762410b27..91750dee7688 100644 --- a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java +++ b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java @@ -171,7 +171,7 @@ final class InitAndSystemPackageHelper { } } OverlayConfig overlayConfig = OverlayConfig.initializeSystemInstance( - consumer -> mPm.forEachPackage( + consumer -> mPm.forEachPackage(mPm.snapshotComputer(), pkg -> consumer.accept(pkg, pkg.isSystem(), apkInApexPreInstalledPaths.get(pkg.getPackageName())))); // Prune any system packages that no longer exist. diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 8667ffd7930c..b39b24f6defa 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -527,8 +527,10 @@ final class InstallPackageHelper { + android.Manifest.permission.INSTALL_PACKAGES + "."); } PackageSetting pkgSetting; - mPm.enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */, - true /* checkShell */, "installExistingPackage for user " + userId); + final Computer preLockSnapshot = mPm.snapshotComputer(); + preLockSnapshot.enforceCrossUserPermission(callingUid, userId, + true /* requireFullPermission */, true /* checkShell */, + "installExistingPackage for user " + userId); if (mPm.isUserRestricted(userId, UserManager.DISALLOW_INSTALL_APPS)) { return PackageManager.INSTALL_FAILED_USER_RESTRICTED; } @@ -543,11 +545,12 @@ final class InstallPackageHelper { // writer synchronized (mPm.mLock) { + final Computer snapshot = mPm.snapshotComputer(); pkgSetting = mPm.mSettings.getPackageLPr(packageName); if (pkgSetting == null) { return PackageManager.INSTALL_FAILED_INVALID_URI; } - if (!mPm.canViewInstantApps(callingUid, UserHandle.getUserId(callingUid))) { + if (!snapshot.canViewInstantApps(callingUid, UserHandle.getUserId(callingUid))) { // only allow the existing package to be used if it's installed as a full // application for at least one user boolean installAllowed = false; @@ -597,7 +600,8 @@ final class InstallPackageHelper { mAppDataHelper.prepareAppDataAfterInstallLIF(pkgSetting.getPkg()); } } - mPm.sendPackageAddedForUser(packageName, pkgSetting, userId, DataLoaderType.NONE); + mPm.sendPackageAddedForUser(mPm.snapshotComputer(), packageName, pkgSetting, userId, + DataLoaderType.NONE); synchronized (mPm.mLock) { mPm.updateSequenceNumberLP(pkgSetting, new int[]{ userId }); } @@ -1902,8 +1906,8 @@ final class InstallPackageHelper { AndroidPackage oldPackage = mPm.mPackages.get(packageName); // Set the update and install times - PackageStateInternal deletedPkgSetting = mPm.getPackageStateInternal( - oldPackage.getPackageName()); + PackageStateInternal deletedPkgSetting = mPm.snapshotComputer() + .getPackageStateInternal(oldPackage.getPackageName()); reconciledPkg.mPkgSetting .setFirstInstallTimeFromReplaced(deletedPkgSetting, request.mAllUsers) .setLastUpdateTime(System.currentTimeMillis()); @@ -2571,9 +2575,10 @@ final class InstallPackageHelper { size = i; mPm.mPendingBroadcasts.clear(); } + final Computer snapshot = mPm.snapshotComputer(); // Send broadcasts for (int i = 0; i < size; i++) { - mPm.sendPackageChangedBroadcast(packages[i], true /* dontKillApp */, + mPm.sendPackageChangedBroadcast(snapshot, packages[i], true /* dontKillApp */, components[i], uids[i], null /* reason */); } Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); @@ -2592,7 +2597,7 @@ final class InstallPackageHelper { final boolean update = res.mRemovedInfo != null && res.mRemovedInfo.mRemovedPackage != null; final String packageName = res.mName; final PackageStateInternal pkgSetting = - succeeded ? mPm.getPackageStateInternal(packageName) : null; + succeeded ? mPm.snapshotComputer().getPackageStateInternal(packageName) : null; final boolean removedBeforeUpdate = (pkgSetting == null) || (pkgSetting.isSystem() && !pkgSetting.getPath().getPath().equals( res.mPkg.getPath())); @@ -2690,9 +2695,9 @@ final class InstallPackageHelper { // sendPackageAddedForNewUsers also deals with system apps int appId = UserHandle.getAppId(res.mUid); boolean isSystem = res.mPkg.isSystem(); - mPm.sendPackageAddedForNewUsers(packageName, isSystem || virtualPreload, - virtualPreload /*startReceiver*/, appId, firstUserIds, firstInstantUserIds, - dataLoaderType); + mPm.sendPackageAddedForNewUsers(mPm.snapshotComputer(), packageName, + isSystem || virtualPreload, virtualPreload /*startReceiver*/, appId, + firstUserIds, firstInstantUserIds, dataLoaderType); // Send added for users that don't see the package for the first time Bundle extras = new Bundle(); @@ -2705,7 +2710,8 @@ final class InstallPackageHelper { final SparseArray<int[]> newBroadcastAllowList; synchronized (mPm.mLock) { newBroadcastAllowList = mPm.mAppsFilter.getVisibilityAllowList( - mPm.getPackageStateInternal(packageName, Process.SYSTEM_UID), + mPm.snapshotComputer() + .getPackageStateInternal(packageName, Process.SYSTEM_UID), updateUserIds, mPm.mSettings.getPackagesLocked()); } mPm.sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName, @@ -2807,11 +2813,12 @@ final class InstallPackageHelper { } } else if (!ArrayUtils.isEmpty(res.mLibraryConsumers)) { // if static shared lib // No need to kill consumers if it's installation of new version static shared lib. + final Computer snapshot = mPm.snapshotComputer(); final boolean dontKillApp = !update && res.mPkg.getStaticSharedLibName() != null; for (int i = 0; i < res.mLibraryConsumers.size(); i++) { AndroidPackage pkg = res.mLibraryConsumers.get(i); // send broadcast that all consumers of the static shared library have changed - mPm.sendPackageChangedBroadcast(pkg.getPackageName(), dontKillApp, + mPm.sendPackageChangedBroadcast(snapshot, pkg.getPackageName(), dontKillApp, new ArrayList<>(Collections.singletonList(pkg.getPackageName())), pkg.getUid(), null); } diff --git a/services/core/java/com/android/server/pm/ModuleInfoProvider.java b/services/core/java/com/android/server/pm/ModuleInfoProvider.java index 0ffc1ed9e90c..230f5558b37d 100644 --- a/services/core/java/com/android/server/pm/ModuleInfoProvider.java +++ b/services/core/java/com/android/server/pm/ModuleInfoProvider.java @@ -16,6 +16,7 @@ package com.android.server.pm; +import android.annotation.NonNull; import android.content.Context; import android.content.pm.IPackageManager; import android.content.pm.ModuleInfo; @@ -25,6 +26,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.os.RemoteException; +import android.os.ServiceManager; import android.os.UserHandle; import android.text.TextUtils; import android.util.ArrayMap; @@ -58,7 +60,7 @@ public class ModuleInfoProvider { private static final String MODULE_METADATA_KEY = "android.content.pm.MODULE_METADATA"; private final Context mContext; - private final IPackageManager mPackageManager; + private IPackageManager mPackageManager; private final ApexManager mApexManager; private final Map<String, ModuleInfo> mModuleInfo; @@ -66,9 +68,8 @@ public class ModuleInfoProvider { private volatile boolean mMetadataLoaded; private volatile String mPackageName; - ModuleInfoProvider(Context context, IPackageManager packageManager) { + ModuleInfoProvider(Context context) { mContext = context; - mPackageManager = packageManager; mApexManager = ApexManager.getInstance(); mModuleInfo = new ArrayMap<>(); } @@ -77,12 +78,20 @@ public class ModuleInfoProvider { public ModuleInfoProvider( XmlResourceParser metadata, Resources resources, ApexManager apexManager) { mContext = null; - mPackageManager = null; mApexManager = apexManager; mModuleInfo = new ArrayMap<>(); loadModuleMetadata(metadata, resources); } + @NonNull + private IPackageManager getPackageManager() { + if (mPackageManager == null) { + mPackageManager = IPackageManager.Stub.asInterface( + ServiceManager.getService("package")); + } + return mPackageManager; + } + /** Called by the {@code PackageManager} when it has completed its boot sequence */ public void systemReady() { mPackageName = mContext.getResources().getString( @@ -95,7 +104,7 @@ public class ModuleInfoProvider { final Resources packageResources; final PackageInfo pi; try { - pi = mPackageManager.getPackageInfo(mPackageName, + pi = getPackageManager().getPackageInfo(mPackageName, PackageManager.GET_META_DATA, UserHandle.USER_SYSTEM); Context packageContext = mContext.createPackageContext(mPackageName, 0); @@ -183,7 +192,7 @@ public class ModuleInfoProvider { List<PackageInfo> allPackages; try { - allPackages = mPackageManager.getInstalledPackages( + allPackages = getPackageManager().getInstalledPackages( flags | PackageManager.MATCH_APEX, UserHandle.getCallingUserId()).getList(); } catch (RemoteException e) { Slog.w(TAG, "Unable to retrieve all package names", e); diff --git a/services/core/java/com/android/server/pm/MovePackageHelper.java b/services/core/java/com/android/server/pm/MovePackageHelper.java index 5fc90b1d994f..c5ca06cc7b84 100644 --- a/services/core/java/com/android/server/pm/MovePackageHelper.java +++ b/services/core/java/com/android/server/pm/MovePackageHelper.java @@ -57,6 +57,8 @@ import com.android.internal.os.SomeArgs; import com.android.internal.util.FrameworkStatsLog; import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.pm.parsing.pkg.AndroidPackageUtils; +import com.android.server.pm.pkg.PackageStateInternal; +import com.android.server.pm.pkg.PackageStateUtils; import java.io.File; import java.util.Objects; @@ -77,81 +79,74 @@ public final class MovePackageHelper { final StorageManager storage = mPm.mInjector.getSystemService(StorageManager.class); final PackageManager pm = mPm.mContext.getPackageManager(); - final String currentVolumeUuid; - final File codeFile; - final InstallSource installSource; - final String packageAbiOverride; - final int appId; - final String seinfo; - final String label; - final int targetSdkVersion; - final PackageFreezer freezer; - final int[] installedUserIds; - final boolean isCurrentLocationExternal; - final String fromCodePath; + Computer snapshot = mPm.snapshotComputer(); + final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); + if (packageState == null + || packageState.getPkg() == null + || snapshot.shouldFilterApplication(packageState, callingUid, user.getIdentifier())) { + throw new PackageManagerException(MOVE_FAILED_DOESNT_EXIST, "Missing package"); + } + final AndroidPackage pkg = packageState.getPkg(); + if (pkg.isSystem()) { + throw new PackageManagerException(MOVE_FAILED_SYSTEM_PACKAGE, + "Cannot move system application"); + } - // reader - synchronized (mPm.mLock) { - final AndroidPackage pkg = mPm.mPackages.get(packageName); - final PackageSetting ps = mPm.mSettings.getPackageLPr(packageName); - if (pkg == null - || ps == null - || mPm.shouldFilterApplication(ps, callingUid, user.getIdentifier())) { - throw new PackageManagerException(MOVE_FAILED_DOESNT_EXIST, "Missing package"); - } - if (pkg.isSystem()) { - throw new PackageManagerException(MOVE_FAILED_SYSTEM_PACKAGE, - "Cannot move system application"); - } + final boolean isInternalStorage = VolumeInfo.ID_PRIVATE_INTERNAL.equals(volumeUuid); + final boolean allow3rdPartyOnInternal = mPm.mContext.getResources().getBoolean( + com.android.internal.R.bool.config_allow3rdPartyAppOnInternal); + if (isInternalStorage && !allow3rdPartyOnInternal) { + throw new PackageManagerException(MOVE_FAILED_3RD_PARTY_NOT_ALLOWED_ON_INTERNAL, + "3rd party apps are not allowed on internal storage"); + } - final boolean isInternalStorage = VolumeInfo.ID_PRIVATE_INTERNAL.equals(volumeUuid); - final boolean allow3rdPartyOnInternal = mPm.mContext.getResources().getBoolean( - com.android.internal.R.bool.config_allow3rdPartyAppOnInternal); - if (isInternalStorage && !allow3rdPartyOnInternal) { - throw new PackageManagerException(MOVE_FAILED_3RD_PARTY_NOT_ALLOWED_ON_INTERNAL, - "3rd party apps are not allowed on internal storage"); - } - currentVolumeUuid = ps.getVolumeUuid(); + final String currentVolumeUuid = packageState.getVolumeUuid(); - final File probe = new File(pkg.getPath()); - final File probeOat = new File(probe, "oat"); - if (!probe.isDirectory() || !probeOat.isDirectory()) { - throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR, - "Move only supported for modern cluster style installs"); - } + final File probe = new File(pkg.getPath()); + final File probeOat = new File(probe, "oat"); + if (!probe.isDirectory() || !probeOat.isDirectory()) { + throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR, + "Move only supported for modern cluster style installs"); + } - if (Objects.equals(currentVolumeUuid, volumeUuid)) { - throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR, - "Package already moved to " + volumeUuid); - } - if (!pkg.isExternalStorage() && mPm.isPackageDeviceAdminOnAnyUser(packageName)) { - throw new PackageManagerException(MOVE_FAILED_DEVICE_ADMIN, - "Device admin cannot be moved"); - } + if (Objects.equals(currentVolumeUuid, volumeUuid)) { + throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR, + "Package already moved to " + volumeUuid); + } + if (!pkg.isExternalStorage() + && mPm.isPackageDeviceAdminOnAnyUser(snapshot, packageName)) { + throw new PackageManagerException(MOVE_FAILED_DEVICE_ADMIN, + "Device admin cannot be moved"); + } - if (mPm.mFrozenPackages.containsKey(packageName)) { - throw new PackageManagerException(MOVE_FAILED_OPERATION_PENDING, - "Failed to move already frozen package"); - } + if (snapshot.getFrozenPackages().containsKey(packageName)) { + throw new PackageManagerException(MOVE_FAILED_OPERATION_PENDING, + "Failed to move already frozen package"); + } - isCurrentLocationExternal = pkg.isExternalStorage(); - codeFile = new File(pkg.getPath()); - installSource = ps.getInstallSource(); - packageAbiOverride = ps.getCpuAbiOverride(); - appId = UserHandle.getAppId(pkg.getUid()); - seinfo = AndroidPackageUtils.getSeInfo(pkg, ps); - label = String.valueOf(pm.getApplicationLabel( - AndroidPackageUtils.generateAppInfoWithoutState(pkg))); - targetSdkVersion = pkg.getTargetSdkVersion(); + final boolean isCurrentLocationExternal = pkg.isExternalStorage(); + final File codeFile = new File(pkg.getPath()); + final InstallSource installSource = packageState.getInstallSource(); + final String packageAbiOverride = packageState.getCpuAbiOverride(); + final int appId = UserHandle.getAppId(pkg.getUid()); + final String seinfo = AndroidPackageUtils.getSeInfo(pkg, packageState); + final String label = String.valueOf(pm.getApplicationLabel( + AndroidPackageUtils.generateAppInfoWithoutState(pkg))); + final int targetSdkVersion = pkg.getTargetSdkVersion(); + final int[] installedUserIds = PackageStateUtils.queryInstalledUsers(packageState, + mPm.mUserManager.getUserIds(), true); + final String fromCodePath; + if (codeFile.getParentFile().getName().startsWith( + PackageManagerService.RANDOM_DIR_PREFIX)) { + fromCodePath = codeFile.getParentFile().getAbsolutePath(); + } else { + fromCodePath = codeFile.getAbsolutePath(); + } + + final PackageFreezer freezer; + synchronized (mPm.mLock) { freezer = mPm.freezePackage(packageName, "movePackageInternal"); - installedUserIds = ps.queryInstalledUsers(mPm.mUserManager.getUserIds(), true); - if (codeFile.getParentFile().getName().startsWith( - PackageManagerService.RANDOM_DIR_PREFIX)) { - fromCodePath = codeFile.getParentFile().getAbsolutePath(); - } else { - fromCodePath = codeFile.getAbsolutePath(); - } } final Bundle extras = new Bundle(); diff --git a/services/core/java/com/android/server/pm/OWNERS b/services/core/java/com/android/server/pm/OWNERS index c219f80ac9c5..8534fabb5576 100644 --- a/services/core/java/com/android/server/pm/OWNERS +++ b/services/core/java/com/android/server/pm/OWNERS @@ -15,7 +15,9 @@ per-file StagingManager.java = dariofreni@google.com, ioffe@google.com, olilan@g per-file AbstractStatsBase.java = file:dex/OWNERS per-file BackgroundDexOptService.java = file:dex/OWNERS per-file CompilerStats.java = file:dex/OWNERS +per-file DexOptHelper.java = file:dex/OWNERS per-file DynamicCodeLoggingService.java = file:dex/OWNERS +per-file Installer.java = file:dex/OWNERS per-file InstructionSets.java = file:dex/OWNERS per-file OtaDexoptService.java = file:dex/OWNERS per-file OtaDexoptShellCommand.java = file:dex/OWNERS diff --git a/services/core/java/com/android/server/pm/OtaDexoptService.java b/services/core/java/com/android/server/pm/OtaDexoptService.java index bd0091480caf..cc4a76034b2b 100644 --- a/services/core/java/com/android/server/pm/OtaDexoptService.java +++ b/services/core/java/com/android/server/pm/OtaDexoptService.java @@ -131,8 +131,9 @@ public class OtaDexoptService extends IOtaDexopt.Stub { Predicate<PackageStateInternal> isPlatformPackage = pkgSetting -> PLATFORM_PACKAGE_NAME.equals(pkgSetting.getPkg().getPackageName()); // Important: the packages we need to run with ab-ota compiler-reason. + final Computer snapshot = mPackageManagerService.snapshotComputer(); final Collection<? extends PackageStateInternal> allPackageStates = - mPackageManagerService.getPackageStates().values(); + snapshot.getPackageStates().values(); important = DexOptHelper.getPackagesForDexopt(allPackageStates,mPackageManagerService, DEBUG_DEXOPT); // Remove Platform Package from A/B OTA b/160735835. @@ -165,7 +166,7 @@ public class OtaDexoptService extends IOtaDexopt.Stub { Log.i(TAG, "Low on space, deleting oat files in an attempt to free up space: " + DexOptHelper.packagesToString(others)); for (PackageStateInternal pkg : others) { - mPackageManagerService.deleteOatArtifactsOfPackage(pkg.getPackageName()); + mPackageManagerService.deleteOatArtifactsOfPackage(snapshot, pkg.getPackageName()); } } long spaceAvailableNow = getAvailableSpace(); diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 6613f016f66a..4e702e2c9df5 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -597,8 +597,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements String installerAttributionTag, int userId) throws IOException { final int callingUid = Binder.getCallingUid(); - mPm.enforceCrossUserPermission( - callingUid, userId, true, true, "createSession"); + final Computer snapshot = mPm.snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, userId, true, true, "createSession"); if (mPm.isUserRestricted(userId, UserManager.DISALLOW_INSTALL_APPS)) { throw new SecurityException("User restriction prevents installing"); @@ -663,7 +663,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements params.installFlags &= ~PackageManager.INSTALL_ALL_USERS; params.installFlags |= PackageManager.INSTALL_REPLACE_EXISTING; if ((params.installFlags & PackageManager.INSTALL_VIRTUAL_PRELOAD) != 0 - && !mPm.isCallerVerifier(callingUid)) { + && !mPm.isCallerVerifier(snapshot, callingUid)) { params.installFlags &= ~PackageManager.INSTALL_VIRTUAL_PRELOAD; } if (mContext.checkCallingOrSelfPermission( @@ -676,7 +676,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements String originatingPackageName = null; if (params.originatingUid != SessionParams.UID_UNKNOWN && params.originatingUid != callingUid) { - String[] packages = mPm.mIPackageManager.getPackagesForUid(params.originatingUid); + String[] packages = snapshot.getPackagesForUid(params.originatingUid); if (packages != null && packages.length > 0) { // Choose an arbitrary representative package in the case of a shared UID. originatingPackageName = packages[0]; @@ -727,7 +727,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements if ((params.installFlags & PackageManager.INSTALL_INSTANT_APP) != 0 && !isCalledBySystemOrShell(callingUid) - && (mPm.mIPackageManager.getFlagsForUid(callingUid) & ApplicationInfo.FLAG_SYSTEM) + && (snapshot.getFlagsForUid(callingUid) & ApplicationInfo.FLAG_SYSTEM) == 0) { throw new SecurityException( "Only system apps could use the PackageManager.INSTALL_INSTANT_APP flag."); @@ -1038,11 +1038,12 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements return "smdl" + sessionId + ".tmp"; } - private boolean shouldFilterSession(int uid, SessionInfo info) { + private boolean shouldFilterSession(@NonNull Computer snapshot, int uid, SessionInfo info) { if (info == null) { return false; } - return uid != info.getInstallerUid() && !mPm.canQueryPackage(uid, info.getAppPackageName()); + return uid != info.getInstallerUid() + && !snapshot.canQueryPackage(uid, info.getAppPackageName()); } @Override @@ -1055,7 +1056,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements ? session.generateInfoForCaller(true /* includeIcon */, callingUid) : null; } - return shouldFilterSession(callingUid, result) ? null : result; + return shouldFilterSession(mPm.snapshotComputer(), callingUid, result) ? null : result; } @Override @@ -1070,15 +1071,16 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements } } } - result.removeIf(info -> shouldFilterSession(callingUid, info)); + final Computer snapshot = mPm.snapshotComputer(); + result.removeIf(info -> shouldFilterSession(snapshot, callingUid, info)); return new ParceledListSlice<>(result); } @Override public ParceledListSlice<SessionInfo> getAllSessions(int userId) { final int callingUid = Binder.getCallingUid(); - mPm.enforceCrossUserPermission( - callingUid, userId, true, false, "getAllSessions"); + final Computer snapshot = mPm.snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, userId, true, false, "getAllSessions"); final List<SessionInfo> result = new ArrayList<>(); synchronized (mSessions) { @@ -1090,15 +1092,16 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements } } } - result.removeIf(info -> shouldFilterSession(callingUid, info)); + result.removeIf(info -> shouldFilterSession(snapshot, callingUid, info)); return new ParceledListSlice<>(result); } @Override public ParceledListSlice<SessionInfo> getMySessions(String installerPackageName, int userId) { - mPm.enforceCrossUserPermission( - Binder.getCallingUid(), userId, true, false, "getMySessions"); - mAppOps.checkPackage(Binder.getCallingUid(), installerPackageName); + final Computer snapshot = mPm.snapshotComputer(); + final int callingUid = Binder.getCallingUid(); + snapshot.enforceCrossUserPermission(callingUid, userId, true, false, "getMySessions"); + mAppOps.checkPackage(callingUid, installerPackageName); final List<SessionInfo> result = new ArrayList<>(); synchronized (mSessions) { @@ -1120,8 +1123,9 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements @Override public void uninstall(VersionedPackage versionedPackage, String callerPackageName, int flags, IntentSender statusReceiver, int userId) { + final Computer snapshot = mPm.snapshotComputer(); final int callingUid = Binder.getCallingUid(); - mPm.enforceCrossUserPermission(callingUid, userId, true, true, "uninstall"); + snapshot.enforceCrossUserPermission(callingUid, userId, true, true, "uninstall"); if ((callingUid != Process.SHELL_UID) && (callingUid != Process.ROOT_UID)) { mAppOps.checkPackage(callingUid, callerPackageName); } @@ -1154,8 +1158,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements .setAdmin(callerPackageName) .write(); } else { - ApplicationInfo appInfo = mPm.mIPackageManager - .getApplicationInfo(callerPackageName, 0, userId); + ApplicationInfo appInfo = snapshot.getApplicationInfo(callerPackageName, 0, userId); if (appInfo.targetSdkVersion >= Build.VERSION_CODES.P) { mContext.enforceCallingOrSelfPermission(Manifest.permission.REQUEST_DELETE_PACKAGES, null); @@ -1174,7 +1177,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements String callerPackageName, IntentSender statusReceiver, int userId) { final int callingUid = Binder.getCallingUid(); mContext.enforceCallingOrSelfPermission(Manifest.permission.DELETE_PACKAGES, null); - mPm.enforceCrossUserPermission(callingUid, userId, true, true, "uninstall"); + final Computer snapshot = mPm.snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, userId, true, true, "uninstall"); if ((callingUid != Process.SHELL_UID) && (callingUid != Process.ROOT_UID)) { mAppOps.checkPackage(callingUid, callerPackageName); } @@ -1206,8 +1210,9 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements @Override public void registerCallback(IPackageInstallerCallback callback, int userId) { - mPm.enforceCrossUserPermission( - Binder.getCallingUid(), userId, true, false, "registerCallback"); + final Computer snapshot = mPm.snapshotComputer(); + snapshot.enforceCrossUserPermission(Binder.getCallingUid(), userId, true, false, + "registerCallback"); registerCallback(callback, eventUserId -> userId == eventUserId); } @@ -1295,13 +1300,13 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements } } - private boolean shouldFilterSession(int uid, int sessionId) { + private boolean shouldFilterSession(@NonNull Computer snapshot, int uid, int sessionId) { final PackageInstallerSession session = getSession(sessionId); if (session == null) { return false; } return uid != session.getInstallerUid() - && !mPm.canQueryPackage(uid, session.getPackageName()); + && !snapshot.canQueryPackage(uid, session.getPackageName()); } static class PackageDeleteObserverAdapter extends PackageDeleteObserver { @@ -1454,11 +1459,12 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements final int sessionId = msg.arg1; final int userId = msg.arg2; final int n = mCallbacks.beginBroadcast(); + final Computer snapshot = mPm.snapshotComputer(); for (int i = 0; i < n; i++) { final IPackageInstallerCallback callback = mCallbacks.getBroadcastItem(i); final BroadcastCookie cookie = (BroadcastCookie) mCallbacks.getBroadcastCookie(i); if (cookie.userCheck.test(userId) - && !shouldFilterSession(cookie.callingUid, sessionId)) { + && !shouldFilterSession(snapshot, cookie.callingUid, sessionId)) { try { invokeCallback(callback, msg); } catch (RemoteException ignored) { diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index bcda046c2abe..68be64fdba0d 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -860,7 +860,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { return USER_ACTION_NOT_NEEDED; } - if (mPm.isInstallDisabledForPackage(getInstallerPackageName(), mInstallerUid, userId)) { + if (snapshot.isInstallDisabledForPackage(getInstallerPackageName(), mInstallerUid, + userId)) { // show the installer to account for device poslicy or unknown sources use cases return USER_ACTION_REQUIRED; } @@ -3755,7 +3756,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { }; if (!manualStartAndDestroy) { - final PerUidReadTimeouts[] perUidReadTimeouts = mPm.getPerUidReadTimeouts(); + final PerUidReadTimeouts[] perUidReadTimeouts = + mPm.getPerUidReadTimeouts(mPm.snapshotComputer()); final StorageHealthCheckParams healthCheckParams = new StorageHealthCheckParams(); healthCheckParams.blockedTimeoutMs = INCREMENTAL_STORAGE_BLOCKED_TIMEOUT_MS; diff --git a/services/core/java/com/android/server/pm/PackageManagerInternalBase.java b/services/core/java/com/android/server/pm/PackageManagerInternalBase.java new file mode 100644 index 000000000000..2b733754685e --- /dev/null +++ b/services/core/java/com/android/server/pm/PackageManagerInternalBase.java @@ -0,0 +1,751 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm; + +import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT; +import static android.content.pm.PackageManager.RESTRICTION_NONE; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.UserIdInt; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; +import android.content.pm.AuxiliaryResolveInfo; +import android.content.pm.Checksum; +import android.content.pm.IOnChecksumsReadyListener; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManagerInternal; +import android.content.pm.ProcessInfo; +import android.content.pm.ProviderInfo; +import android.content.pm.ResolveInfo; +import android.content.pm.SuspendDialogInfo; +import android.os.Binder; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.os.Process; +import android.os.storage.StorageManager; +import android.util.ArrayMap; +import android.util.ArraySet; +import android.util.SparseArray; + +import com.android.server.pm.dex.DexManager; +import com.android.server.pm.dex.DynamicCodeLogger; +import com.android.server.pm.parsing.pkg.AndroidPackage; +import com.android.server.pm.permission.PermissionManagerServiceInternal; +import com.android.server.pm.pkg.AndroidPackageApi; +import com.android.server.pm.pkg.PackageStateInternal; +import com.android.server.pm.pkg.PackageStateUtils; +import com.android.server.pm.pkg.SharedUserApi; +import com.android.server.pm.pkg.component.ParsedMainComponent; +import com.android.server.pm.pkg.mutate.PackageStateMutator; + +import java.io.IOException; +import java.util.List; +import java.util.concurrent.Executor; +import java.util.function.Consumer; + +/** + * Internal manager variant of {@link IPackageManagerBase}. See that class for info. + * {@link PackageManagerInternal} should eventually passing in a snapshot instance, deprecating + * this class, but that requires much larger refactor. + */ +abstract class PackageManagerInternalBase extends PackageManagerInternal { + + @NonNull + private final PackageManagerService mService; + + public PackageManagerInternalBase(@NonNull PackageManagerService service) { + mService = service; + } + + @NonNull protected abstract Context getContext(); + @NonNull protected abstract PermissionManagerServiceInternal getPermissionManager(); + @NonNull protected abstract AppDataHelper getAppDataHelper(); + @NonNull protected abstract PackageObserverHelper getPackageObserverHelper(); + @NonNull protected abstract ResolveIntentHelper getResolveIntentHelper(); + @NonNull protected abstract SuspendPackageHelper getSuspendPackageHelper(); + @NonNull protected abstract ProtectedPackages getProtectedPackages(); + @NonNull protected abstract UserNeedsBadgingCache getUserNeedsBadging(); + @NonNull protected abstract InstantAppRegistry getInstantAppRegistry(); + @NonNull protected abstract ApexManager getApexManager(); + @NonNull protected abstract DexManager getDexManager(); + + @Override + public final Computer snapshot() { + return mService.snapshotComputer(); + } + + @Override + @Deprecated + public final List<ApplicationInfo> getInstalledApplications( + @PackageManager.ApplicationInfoFlagsBits long flags, int userId, int callingUid) { + return snapshot().getInstalledApplications(flags, userId, callingUid); + } + + @Override + @Deprecated + public final boolean isInstantApp(String packageName, int userId) { + return snapshot().isInstantApp(packageName, userId); + } + + @Override + @Deprecated + public final String getInstantAppPackageName(int uid) { + return snapshot().getInstantAppPackageName(uid); + } + + @Override + @Deprecated + public final boolean filterAppAccess(AndroidPackage pkg, int callingUid, int userId) { + return snapshot().filterAppAccess(pkg, callingUid, userId); + } + + @Override + @Deprecated + public final boolean filterAppAccess(String packageName, int callingUid, int userId) { + return snapshot().filterAppAccess(packageName, callingUid, userId); + } + + @Override + @Deprecated + public final boolean filterAppAccess(int uid, int callingUid) { + return snapshot().filterAppAccess(uid, callingUid); + } + + @Nullable + @Override + @Deprecated + public final int[] getVisibilityAllowList(@NonNull String packageName, int userId) { + return snapshot().getVisibilityAllowList(packageName, userId); + } + + @Override + @Deprecated + public final boolean canQueryPackage(int callingUid, @Nullable String packageName) { + return snapshot().canQueryPackage(callingUid, packageName); + } + + @Override + @Deprecated + public final AndroidPackage getPackage(String packageName) { + return snapshot().getPackage(packageName); + } + + @Nullable + @Override + @Deprecated + public final AndroidPackageApi getAndroidPackage(@NonNull String packageName) { + return snapshot().getPackage(packageName); + } + + @Override + @Deprecated + public final AndroidPackage getPackage(int uid) { + return snapshot().getPackage(uid); + } + + @Override + @Deprecated + public final List<AndroidPackage> getPackagesForAppId(int appId) { + return snapshot().getPackagesForAppId(appId); + } + + @Nullable + @Override + @Deprecated + public final PackageStateInternal getPackageStateInternal(String packageName) { + return snapshot().getPackageStateInternal(packageName); + } + + @NonNull + @Override + @Deprecated + public final ArrayMap<String, ? extends PackageStateInternal> getPackageStates() { + return snapshot().getPackageStates(); + } + + @Override + @Deprecated + public final void removePackageListObserver(PackageListObserver observer) { + getPackageObserverHelper().removeObserver(observer); + } + + @Override + @Deprecated + public final PackageStateInternal getDisabledSystemPackage(@NonNull String packageName) { + return snapshot().getDisabledSystemPackage(packageName); + } + + @Override + @Deprecated + public final @NonNull String[] getKnownPackageNames(int knownPackage, int userId) { + return mService.getKnownPackageNamesInternal(snapshot(), knownPackage, userId); + } + + @Override + @Deprecated + public final void setKeepUninstalledPackages(final List<String> packageList) { + mService.setKeepUninstalledPackagesInternal(snapshot(), packageList); + } + + @Override + @Deprecated + public final boolean isPermissionsReviewRequired(String packageName, int userId) { + return getPermissionManager().isPermissionsReviewRequired(packageName, userId); + } + + @Override + @Deprecated + public final PackageInfo getPackageInfo(String packageName, + @PackageManager.PackageInfoFlagsBits long flags, int filterCallingUid, int userId) { + return snapshot().getPackageInfoInternal(packageName, + PackageManager.VERSION_CODE_HIGHEST, flags, filterCallingUid, userId); + } + + @Override + @Deprecated + public final Bundle getSuspendedPackageLauncherExtras(String packageName, int userId) { + return getSuspendPackageHelper().getSuspendedPackageLauncherExtras(snapshot(), packageName, + userId, Binder.getCallingUid()); + } + + @Override + @Deprecated + public final boolean isPackageSuspended(String packageName, int userId) { + return getSuspendPackageHelper().isPackageSuspended(snapshot(), packageName, userId, + Binder.getCallingUid()); + } + + @Override + @Deprecated + public final void removeNonSystemPackageSuspensions(String packageName, int userId) { + getSuspendPackageHelper().removeSuspensionsBySuspendingPackage(snapshot(), + new String[]{packageName}, + (suspendingPackage) -> !PackageManagerService.PLATFORM_PACKAGE_NAME.equals( + suspendingPackage), + userId); + } + + @Override + @Deprecated + public final void removeDistractingPackageRestrictions(String packageName, int userId) { + mService.removeDistractingPackageRestrictions(snapshot(), new String[]{packageName}, + userId); + } + + @Override + @Deprecated + public final void removeAllDistractingPackageRestrictions(int userId) { + mService.removeAllDistractingPackageRestrictions(snapshot(), userId); + } + + @Override + @Deprecated + public final String getSuspendingPackage(String suspendedPackage, int userId) { + return getSuspendPackageHelper().getSuspendingPackage(snapshot(), suspendedPackage, userId, + Binder.getCallingUid()); + } + + @Override + @Deprecated + public final SuspendDialogInfo getSuspendedDialogInfo(String suspendedPackage, + String suspendingPackage, int userId) { + return getSuspendPackageHelper().getSuspendedDialogInfo(snapshot(), suspendedPackage, + suspendingPackage, userId, Binder.getCallingUid()); + } + + @Override + @Deprecated + public final int getDistractingPackageRestrictions(String packageName, int userId) { + final PackageStateInternal packageState = getPackageStateInternal(packageName); + return (packageState == null) ? RESTRICTION_NONE + : packageState.getUserStateOrDefault(userId).getDistractionFlags(); + } + + @Override + @Deprecated + public final int getPackageUid(String packageName, + @PackageManager.PackageInfoFlagsBits long flags, int userId) { + return snapshot().getPackageUidInternal(packageName, flags, userId, Process.SYSTEM_UID); + } + + @Override + @Deprecated + public final ApplicationInfo getApplicationInfo(String packageName, + @PackageManager.ApplicationInfoFlagsBits long flags, int filterCallingUid, int userId) { + return snapshot().getApplicationInfoInternal(packageName, flags, filterCallingUid, userId); + } + + @Override + @Deprecated + public final ActivityInfo getActivityInfo(ComponentName component, + @PackageManager.ComponentInfoFlagsBits long flags, int filterCallingUid, int userId) { + return snapshot().getActivityInfoInternal(component, flags, filterCallingUid, userId); + } + + @Override + @Deprecated + public final List<ResolveInfo> queryIntentActivities( + Intent intent, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, + int filterCallingUid, int userId) { + return snapshot().queryIntentActivitiesInternal(intent, resolvedType, flags, userId); + } + + @Override + @Deprecated + public final List<ResolveInfo> queryIntentReceivers(Intent intent, + String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, + int filterCallingUid, int userId) { + return getResolveIntentHelper().queryIntentReceiversInternal( + snapshot(), intent, resolvedType, flags, userId, filterCallingUid); + } + + @Override + @Deprecated + public final List<ResolveInfo> queryIntentServices( + Intent intent, @PackageManager.ResolveInfoFlagsBits long flags, int callingUid, + int userId) { + final String resolvedType = intent.resolveTypeIfNeeded(getContext().getContentResolver()); + return snapshot().queryIntentServicesInternal(intent, resolvedType, flags, userId, + callingUid, false); + } + + @Override + @Deprecated + public final ComponentName getHomeActivitiesAsUser(List<ResolveInfo> allHomeCandidates, + int userId) { + return snapshot().getHomeActivitiesAsUser(allHomeCandidates, userId); + } + + @Override + @Deprecated + public final ComponentName getDefaultHomeActivity(int userId) { + return snapshot().getDefaultHomeActivity(userId); + } + + @Override + @Deprecated + public final ComponentName getSystemUiServiceComponent() { + return ComponentName.unflattenFromString(getContext().getResources().getString( + com.android.internal.R.string.config_systemUIServiceComponent)); + } + + @Override + @Deprecated + public final void setDeviceOwnerProtectedPackages( + String deviceOwnerPackageName, List<String> packageNames) { + getProtectedPackages().setDeviceOwnerProtectedPackages( + deviceOwnerPackageName, packageNames); + } + + @Override + @Deprecated + public final boolean isPackageDataProtected(int userId, String packageName) { + return getProtectedPackages().isPackageDataProtected(userId, packageName); + } + + @Override + @Deprecated + public final boolean isPackageStateProtected(String packageName, int userId) { + return getProtectedPackages().isPackageStateProtected(userId, packageName); + } + + @Override + @Deprecated + public final boolean isPackageEphemeral(int userId, String packageName) { + final PackageStateInternal packageState = getPackageStateInternal(packageName); + return packageState != null + && packageState.getUserStateOrDefault(userId).isInstantApp(); + } + + @Override + @Deprecated + public final boolean wasPackageEverLaunched(String packageName, int userId) { + final PackageStateInternal packageState = getPackageStateInternal(packageName); + if (packageState == null) { + throw new IllegalArgumentException("Unknown package: " + packageName); + } + return !packageState.getUserStateOrDefault(userId).isNotLaunched(); + } + + @Override + @Deprecated + public final boolean isEnabledAndMatches(ParsedMainComponent component, long flags, int userId) { + return PackageStateUtils.isEnabledAndMatches( + getPackageStateInternal(component.getPackageName()), component, flags, userId); + } + + @Override + @Deprecated + public final boolean userNeedsBadging(int userId) { + return getUserNeedsBadging().get(userId); + } + + @Override + @Deprecated + public final String getNameForUid(int uid) { + return snapshot().getNameForUid(uid); + } + + @Override + @Deprecated + public final void requestInstantAppResolutionPhaseTwo(AuxiliaryResolveInfo responseObj, + Intent origIntent, String resolvedType, String callingPackage, + @Nullable String callingFeatureId, boolean isRequesterInstantApp, + Bundle verificationBundle, int userId) { + mService.requestInstantAppResolutionPhaseTwo(responseObj, origIntent, + resolvedType, callingPackage, callingFeatureId, isRequesterInstantApp, + verificationBundle, userId); + } + + @Override + @Deprecated + public final void grantImplicitAccess(int userId, Intent intent, + int recipientAppId, int visibleUid, boolean direct) { + grantImplicitAccess(userId, intent, recipientAppId, visibleUid, direct, + false /* retainOnUpdate */); + } + + @Override + @Deprecated + public final void grantImplicitAccess(int userId, Intent intent, + int recipientAppId, int visibleUid, boolean direct, boolean retainOnUpdate) { + mService.grantImplicitAccess(snapshot(), userId, intent, + recipientAppId, visibleUid, direct, retainOnUpdate); + } + + @Override + @Deprecated + public final boolean isInstantAppInstallerComponent(ComponentName component) { + final ActivityInfo instantAppInstallerActivity = mService.mInstantAppInstallerActivity; + return instantAppInstallerActivity != null + && instantAppInstallerActivity.getComponentName().equals(component); + } + + @Override + @Deprecated + public final void pruneInstantApps() { + getInstantAppRegistry().pruneInstantApps(snapshot()); + } + + @Override + @Deprecated + public final String getSetupWizardPackageName() { + return mService.mSetupWizardPackage; + } + + @Override + @Deprecated + public final ResolveInfo resolveIntent(Intent intent, String resolvedType, + @PackageManager.ResolveInfoFlagsBits long flags, + @PackageManagerInternal.PrivateResolveFlags long privateResolveFlags, int userId, + boolean resolveForStart, int filterCallingUid) { + return getResolveIntentHelper().resolveIntentInternal(snapshot(), + intent, resolvedType, flags, privateResolveFlags, userId, resolveForStart, + filterCallingUid); + } + + @Override + @Deprecated + public final ResolveInfo resolveService(Intent intent, String resolvedType, + @PackageManager.ResolveInfoFlagsBits long flags, int userId, int callingUid) { + return getResolveIntentHelper().resolveServiceInternal(snapshot(), intent, + resolvedType, flags, userId, callingUid); + } + + @Override + @Deprecated + public final ProviderInfo resolveContentProvider(String name, + @PackageManager.ResolveInfoFlagsBits long flags, int userId, int callingUid) { + return snapshot().resolveContentProvider(name, flags, userId,callingUid); + } + + @Override + @Deprecated + public final int getUidTargetSdkVersion(int uid) { + return snapshot().getUidTargetSdkVersion(uid); + } + + @Override + @Deprecated + public final int getPackageTargetSdkVersion(String packageName) { + final PackageStateInternal packageState = getPackageStateInternal(packageName); + if (packageState != null && packageState.getPkg() != null) { + return packageState.getPkg().getTargetSdkVersion(); + } + return Build.VERSION_CODES.CUR_DEVELOPMENT; + } + + @Override + @Deprecated + public final boolean canAccessInstantApps(int callingUid, @UserIdInt int userId) { + return snapshot().canViewInstantApps(callingUid, userId); + } + + @Override + @Deprecated + public final boolean canAccessComponent(int callingUid, @NonNull ComponentName component, + @UserIdInt int userId) { + return snapshot().canAccessComponent(callingUid, component, userId); + } + + @Override + @Deprecated + public final boolean hasInstantApplicationMetadata(String packageName, int userId) { + return getInstantAppRegistry().hasInstantApplicationMetadata(packageName, userId); + } + + @Override + @Deprecated + public final SparseArray<String> getAppsWithSharedUserIds() { + return snapshot().getAppsWithSharedUserIds(); + } + + @Override + @NonNull + @Deprecated + public final String[] getSharedUserPackagesForPackage(String packageName, int userId) { + return snapshot().getSharedUserPackagesForPackage(packageName, userId); + } + + @Override + @Deprecated + public final ArrayMap<String, ProcessInfo> getProcessesForUid(int uid) { + return snapshot().getProcessesForUid(uid); + } + + @Override + @Deprecated + public final int[] getPermissionGids(String permissionName, int userId) { + return getPermissionManager().getPermissionGids(permissionName, userId); + } + + @Override + @Deprecated + public final boolean isOnlyCoreApps() { + return mService.isOnlyCoreApps(); + } + + @Override + @Deprecated + public final void freeStorage(String volumeUuid, long bytes, + @StorageManager.AllocateFlags int flags) throws IOException { + mService.freeStorage(volumeUuid, bytes, flags); + } + + @Override + @Deprecated + public final void freeAllAppCacheAboveQuota(@NonNull String volumeUuid) throws IOException { + mService.freeAllAppCacheAboveQuota(volumeUuid); + } + + @Override + @Deprecated + public final void forEachPackageSetting(Consumer<PackageSetting> actionLocked) { + mService.forEachPackageSetting(actionLocked); + } + + @Override + @Deprecated + public final void forEachPackageState(Consumer<PackageStateInternal> action) { + mService.forEachPackageState(snapshot(), action); + } + + @Override + @Deprecated + public final void forEachPackage(Consumer<AndroidPackage> action) { + mService.forEachPackage(snapshot(), action); + } + + @Override + @Deprecated + public final void forEachInstalledPackage(@NonNull Consumer<AndroidPackage> action, + @UserIdInt int userId) { + mService.forEachInstalledPackage(snapshot(), action, userId); + } + + @Override + @Deprecated + public final ArraySet<String> getEnabledComponents(String packageName, int userId) { + final PackageStateInternal packageState = getPackageStateInternal(packageName); + if (packageState == null) { + return new ArraySet<>(); + } + return packageState.getUserStateOrDefault(userId).getEnabledComponents(); + } + + @Override + @Deprecated + public final ArraySet<String> getDisabledComponents(String packageName, int userId) { + final PackageStateInternal packageState = getPackageStateInternal(packageName); + if (packageState == null) { + return new ArraySet<>(); + } + return packageState.getUserStateOrDefault(userId).getDisabledComponents(); + } + + @Override + @Deprecated + public final @PackageManager.EnabledState int getApplicationEnabledState( + String packageName, int userId) { + final PackageStateInternal packageState = getPackageStateInternal(packageName); + if (packageState == null) { + return COMPONENT_ENABLED_STATE_DEFAULT; + } + return packageState.getUserStateOrDefault(userId).getEnabledState(); + } + + @Override + @Deprecated + public final @PackageManager.EnabledState int getComponentEnabledSetting( + @NonNull ComponentName componentName, int callingUid, int userId) { + return snapshot().getComponentEnabledSettingInternal( + componentName, callingUid, userId); + } + + @Override + @Deprecated + public final void setEnableRollbackCode(int token, int enableRollbackCode) { + mService.setEnableRollbackCode(token, enableRollbackCode); + } + + @Override + @Deprecated + public final void finishPackageInstall(int token, boolean didLaunch) { + mService.finishPackageInstall(token, didLaunch); + } + + @Override + @Deprecated + public final boolean isApexPackage(String packageName) { + return getApexManager().isApexPackage(packageName); + } + + @Override + @Deprecated + public final List<String> getApksInApex(String apexPackageName) { + return getApexManager().getApksInApex(apexPackageName); + } + + @Override + @Deprecated + public final boolean isCallerInstallerOfRecord(@NonNull AndroidPackage pkg, int callingUid) { + return snapshot().isCallerInstallerOfRecord(pkg, callingUid); + } + + @Override + @Deprecated + public final List<String> getMimeGroup(String packageName, String mimeGroup) { + return mService.getMimeGroupInternal(snapshot(), packageName, mimeGroup); + } + + @Override + @Deprecated + public final boolean isSystemPackage(@NonNull String packageName) { + return packageName.equals(mService.ensureSystemPackageName(snapshot(), packageName)); + } + + @Override + @Deprecated + public final void unsuspendForSuspendingPackage(final String packageName, int affectedUser) { + mService.unsuspendForSuspendingPackage(snapshot(), packageName, affectedUser); + } + + @Override + @Deprecated + public final boolean isSuspendingAnyPackages(String suspendingPackage, int userId) { + return snapshot().isSuspendingAnyPackages(suspendingPackage, userId); + } + + @Override + @Deprecated + public final void requestChecksums(@NonNull String packageName, boolean includeSplits, + @Checksum.TypeMask int optional, @Checksum.TypeMask int required, + @Nullable List trustedInstallers, + @NonNull IOnChecksumsReadyListener onChecksumsReadyListener, int userId, + @NonNull Executor executor, @NonNull Handler handler) { + mService.requestChecksumsInternal(snapshot(), packageName, includeSplits, optional, + required, trustedInstallers, onChecksumsReadyListener, userId, executor, + handler); + } + + @Override + @Deprecated + public final boolean isPackageFrozen(@NonNull String packageName, + int callingUid, int userId) { + return snapshot().getPackageStartability(mService.getSafeMode(), packageName, callingUid, userId) + == PackageManagerService.PACKAGE_STARTABILITY_FROZEN; + } + + @Override + @Deprecated + public final long deleteOatArtifactsOfPackage(String packageName) { + return mService.deleteOatArtifactsOfPackage(snapshot(), packageName); + } + + @Override + @Deprecated + public final void reconcileAppsData(int userId, @StorageManager.StorageFlags int flags, + boolean migrateAppsData) { + getAppDataHelper().reconcileAppsData(userId, flags, migrateAppsData); + } + + @Override + @NonNull + public ArraySet<PackageStateInternal> getSharedUserPackages(int sharedUserAppId) { + return snapshot().getSharedUserPackages(sharedUserAppId); + } + + @Override + @Nullable + public SharedUserApi getSharedUserApi(int sharedUserAppId) { + return snapshot().getSharedUser(sharedUserAppId); + } + + @NonNull + @Override + @Deprecated + public final PackageStateMutator.InitialState recordInitialState() { + return mService.recordInitialState(); + } + + @Nullable + @Override + @Deprecated + public final PackageStateMutator.Result commitPackageStateMutation( + @Nullable PackageStateMutator.InitialState state, + @NonNull Consumer<PackageStateMutator> consumer) { + return mService.commitPackageStateMutation(state, consumer); + } + + @Override + @Deprecated + public final void shutdown() { + mService.shutdown(); + } + + @Override + @Deprecated + public final DynamicCodeLogger getDynamicCodeLogger() { + return getDexManager().getDynamicCodeLogger(); + } +} diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index e20a861e2eae..67056ead3423 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -29,7 +29,6 @@ import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS; import static android.content.pm.PackageManager.MATCH_FACTORY_ONLY; import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static android.content.pm.PackageManager.RESTRICTION_NONE; import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; import static android.os.storage.StorageManager.FLAG_STORAGE_CE; import static android.os.storage.StorageManager.FLAG_STORAGE_DE; @@ -83,21 +82,15 @@ import android.content.pm.IDexModuleRegisterCallback; import android.content.pm.IOnChecksumsReadyListener; import android.content.pm.IPackageChangeObserver; import android.content.pm.IPackageDataObserver; -import android.content.pm.IPackageDeleteObserver; import android.content.pm.IPackageDeleteObserver2; import android.content.pm.IPackageInstallObserver2; -import android.content.pm.IPackageInstaller; import android.content.pm.IPackageLoadingProgressCallback; import android.content.pm.IPackageManager; import android.content.pm.IPackageMoveObserver; -import android.content.pm.IPackageStatsObserver; import android.content.pm.IncrementalStatesInfo; import android.content.pm.InstallSourceInfo; import android.content.pm.InstantAppInfo; import android.content.pm.InstantAppRequest; -import android.content.pm.InstrumentationInfo; -import android.content.pm.IntentFilterVerificationInfo; -import android.content.pm.KeySet; import android.content.pm.ModuleInfo; import android.content.pm.PackageChangeEvent; import android.content.pm.PackageInfo; @@ -109,11 +102,8 @@ import android.content.pm.PackageManagerInternal; import android.content.pm.PackagePartitions; import android.content.pm.ParceledListSlice; import android.content.pm.PermissionGroupInfo; -import android.content.pm.PermissionInfo; -import android.content.pm.ProcessInfo; import android.content.pm.ProviderInfo; import android.content.pm.ResolveInfo; -import android.content.pm.ServiceInfo; import android.content.pm.SharedLibraryInfo; import android.content.pm.Signature; import android.content.pm.SigningDetails; @@ -122,7 +112,6 @@ import android.content.pm.TestUtilityService; import android.content.pm.UserInfo; import android.content.pm.VerifierDeviceIdentity; import android.content.pm.VersionedPackage; -import android.content.pm.dex.IArtManager; import android.content.pm.overlay.OverlayPaths; import android.content.pm.parsing.PackageLite; import android.content.res.Resources; @@ -213,7 +202,6 @@ import com.android.server.pm.Settings.VersionInfo; import com.android.server.pm.dex.ArtManagerService; import com.android.server.pm.dex.ArtUtils; import com.android.server.pm.dex.DexManager; -import com.android.server.pm.dex.DynamicCodeLogger; import com.android.server.pm.dex.ViewCompiler; import com.android.server.pm.parsing.PackageCacher; import com.android.server.pm.parsing.PackageInfoUtils; @@ -225,10 +213,7 @@ import com.android.server.pm.permission.LegacyPermissionManagerInternal; import com.android.server.pm.permission.LegacyPermissionManagerService; import com.android.server.pm.permission.PermissionManagerService; import com.android.server.pm.permission.PermissionManagerServiceInternal; -import com.android.server.pm.pkg.AndroidPackageApi; -import com.android.server.pm.pkg.PackageState; import com.android.server.pm.pkg.PackageStateInternal; -import com.android.server.pm.pkg.PackageStateUtils; import com.android.server.pm.pkg.PackageUserState; import com.android.server.pm.pkg.PackageUserStateInternal; import com.android.server.pm.pkg.SharedUserApi; @@ -413,7 +398,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService public @interface ScanFlags {} /** - * Used as the result code of the {@link #getPackageStartability}. + * Used as the result code of the {@link Computer#getPackageStartability(boolean, String, int, + * int)}. */ @IntDef(value = { PACKAGE_STARTABILITY_OK, @@ -426,40 +412,43 @@ public class PackageManagerService implements PackageSender, TestUtilityService public @interface PackageStartability {} /** - * Used as the result code of the {@link #getPackageStartability} to indicate - * the given package is allowed to start. + * Used as the result code of the {@link Computer#getPackageStartability(boolean, String, int, + * int)} to indicate the given package is allowed to start. */ public static final int PACKAGE_STARTABILITY_OK = 0; /** - * Used as the result code of the {@link #getPackageStartability} to indicate - * the given package is <b>not</b> allowed to start because it's not found + * Used as the result code of the {@link Computer#getPackageStartability(boolean, String, int, + * int)} to indicate the given package is <b>not</b> allowed to start because it's not found * (could be due to that package is invisible to the given user). */ public static final int PACKAGE_STARTABILITY_NOT_FOUND = 1; /** - * Used as the result code of the {@link #getPackageStartability} to indicate - * the given package is <b>not</b> allowed to start because it's not a system app - * and the system is running in safe mode. + * Used as the result code of the {@link Computer#getPackageStartability(boolean, String, int, + * int)} to indicate the given package is <b>not</b> allowed to start because it's not a system + * app and the system is running in safe mode. */ public static final int PACKAGE_STARTABILITY_NOT_SYSTEM = 2; /** - * Used as the result code of the {@link #getPackageStartability} to indicate - * the given package is <b>not</b> allowed to start because it's currently frozen. + * Used as the result code of the {@link Computer#getPackageStartability(boolean, String, int, + * int)} to indicate the given package is <b>not</b> allowed to start because it's currently + * frozen. */ public static final int PACKAGE_STARTABILITY_FROZEN = 3; /** - * Used as the result code of the {@link #getPackageStartability} to indicate - * the given package is <b>not</b> allowed to start because it doesn't support + * Used as the result code of the {@link Computer#getPackageStartability(boolean, String, int, + * int)} to indicate the given package is <b>not</b> allowed to start because it doesn't support * direct boot. */ public static final int PACKAGE_STARTABILITY_DIRECT_BOOT_UNSUPPORTED = 4; private static final String STATIC_SHARED_LIB_DELIMITER = "_"; - /** Extension of the compressed packages */ + /** + * Extension of the compressed packages + */ public final static String COMPRESSED_EXTENSION = ".gz"; /** Suffix of stub packages on the system partition */ public final static String STUB_SUFFIX = "-Stub"; @@ -644,9 +633,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService */ boolean mPromoteSystemApps; - // TODO: Make IPackageManager reference private to hide discouraged APIs - final IPackageManagerImpl mIPackageManager; - private final PackageManagerInternal mPmInternal; private final TestUtilityService mTestUtilityService; @Watched @@ -1057,9 +1043,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService // A lock-free cache for frequently called functions. private volatile Computer mSnapshotComputer; - // A trampoline that directs callers to either the live or snapshot computer. - final ComputerTracker mComputer = new ComputerTracker(this); - // If true, the snapshot is invalid (stale). The attribute is static since it may be // set from outside classes. The attribute may be set to true anywhere, although it // should only be set true while holding mLock. However, the attribute id guaranteed @@ -1088,6 +1071,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService * Return the cached computer. The method will rebuild the cached computer if necessary. * The live computer will be returned if snapshots are disabled. */ + @VisibleForTesting(visibility = Visibility.PACKAGE) + @NonNull public Computer snapshotComputer() { if (Thread.holdsLock(mLock)) { // If the current thread holds mLock then it may have modified state but not @@ -1247,15 +1232,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService ApkChecksums.Injector injector = new ApkChecksums.Injector( () -> mContext, () -> handler, - () -> mInjector.getIncrementalManager(), - () -> mPmInternal); + mInjector::getIncrementalManager, + () -> mInjector.getLocalService(PackageManagerInternal.class)); ApkChecksums.getChecksums(filesToChecksum, optional, required, installerPackageName, trustedCerts, onChecksumsReadyListener, injector); }); } - private void requestChecksumsInternal(@NonNull String packageName, boolean includeSplits, - @Checksum.TypeMask int optional, @Checksum.TypeMask int required, + void requestChecksumsInternal(@NonNull Computer snapshot, @NonNull String packageName, + boolean includeSplits, @Checksum.TypeMask int optional, @Checksum.TypeMask int required, @Nullable List trustedInstallers, @NonNull IOnChecksumsReadyListener onChecksumsReadyListener, int userId, @NonNull Executor executor, @NonNull Handler handler) { @@ -1264,13 +1249,12 @@ public class PackageManagerService implements PackageSender, TestUtilityService Objects.requireNonNull(executor); Objects.requireNonNull(handler); - final ApplicationInfo applicationInfo = getApplicationInfoInternal(packageName, 0, + final ApplicationInfo applicationInfo = snapshot.getApplicationInfoInternal(packageName, 0, Binder.getCallingUid(), userId); if (applicationInfo == null) { throw new ParcelableException(new PackageManager.NameNotFoundException(packageName)); } - final InstallSourceInfo installSourceInfo = - mIPackageManager.getInstallSourceInfo(packageName); + final InstallSourceInfo installSourceInfo = snapshot.getInstallSourceInfo(packageName); final String installerPackageName = installSourceInfo != null ? installSourceInfo.getInitiatingPackageName() : null; @@ -1294,8 +1278,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService ApkChecksums.Injector injector = new ApkChecksums.Injector( () -> mContext, () -> handler, - () -> mInjector.getIncrementalManager(), - () -> mPmInternal); + mInjector::getIncrementalManager, + () -> mInjector.getLocalService(PackageManagerInternal.class)); ApkChecksums.getChecksums(filesToChecksum, optional, required, installerPackageName, trustedCerts, onChecksumsReadyListener, injector); }); @@ -1440,15 +1424,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService RuntimePermissionsPersistence.createInstance(), i.getPermissionManagerServiceInternal(), domainVerificationService, lock), - (i, pm) -> AppsFilter.create(pm.mPmInternal, i), + (i, pm) -> AppsFilter.create(i, i.getLocalService(PackageManagerInternal.class)), (i, pm) -> (PlatformCompat) ServiceManager.getService("platform_compat"), (i, pm) -> SystemConfig.getInstance(), (i, pm) -> new PackageDexOptimizer(i.getInstaller(), i.getInstallLock(), i.getContext(), "*dexopt*"), - (i, pm) -> new DexManager(i.getContext(), pm.mIPackageManager, - i.getPackageDexOptimizer(), i.getInstaller(), i.getInstallLock()), - (i, pm) -> new ArtManagerService(i.getContext(), pm.mIPackageManager, + (i, pm) -> new DexManager(i.getContext(), i.getPackageDexOptimizer(), i.getInstaller(), i.getInstallLock()), + (i, pm) -> new ArtManagerService(i.getContext(), i.getInstaller(), + i.getInstallLock()), (i, pm) -> ApexManager.getInstance(), (i, pm) -> new ViewCompiler(i.getInstallLock(), i.getInstaller()), (i, pm) -> (IncrementalManager) @@ -1470,7 +1454,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService i.getContext(), pm, i::getScanningPackageParser), (i, pm, cn) -> new InstantAppResolverConnection( i.getContext(), cn, Intent.ACTION_RESOLVE_INSTANT_APP_PACKAGE), - (i, pm) -> new ModuleInfoProvider(i.getContext(), pm.mIPackageManager), + (i, pm) -> new ModuleInfoProvider(i.getContext()), (i, pm) -> LegacyPermissionManagerService.create(i.getContext()), (i, pm) -> domainVerificationService, (i, pm) -> { @@ -1498,13 +1482,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService final CompatChange.ChangeListener selinuxChangeListener = packageName -> { synchronized (m.mInstallLock) { - final PackageStateInternal packageState = m.getPackageStateInternal(packageName); + final Computer snapshot = m.snapshotComputer(); + final PackageStateInternal packageState = + snapshot.getPackageStateInternal(packageName); if (packageState == null) { Slog.e(TAG, "Failed to find package setting " + packageName); return; } AndroidPackage pkg = packageState.getPkg(); - SharedUserApi sharedUser = m.mComputer.getSharedUser( + SharedUserApi sharedUser = snapshot.getSharedUser( packageState.getSharedUserAppId()); String oldSeInfo = AndroidPackageUtils.getSeInfo(pkg, packageState); @@ -1531,11 +1517,12 @@ public class PackageManagerService implements PackageSender, TestUtilityService selinuxChangeListener); m.installAllowlistedSystemPackages(); - ServiceManager.addService("package", m.mIPackageManager); + IPackageManagerImpl iPackageManager = m.new IPackageManagerImpl(); + ServiceManager.addService("package", iPackageManager); final PackageManagerNative pmn = new PackageManagerNative(m); ServiceManager.addService("package_native", pmn); LocalManagerRegistry.addManager(PackageManagerLocal.class, m.new PackageManagerLocalImpl()); - return Pair.create(m, m.mIPackageManager); + return Pair.create(m, iPackageManager); } /** Install/uninstall system packages for all users based on their user-type, as applicable. */ @@ -1641,8 +1628,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService mPackageDexOptimizer = testParams.packageDexOptimizer; mPackageParserCallback = testParams.packageParserCallback; mPendingBroadcasts = testParams.pendingPackageBroadcasts; - mIPackageManager = new IPackageManagerImpl(); - mPmInternal = testParams.pmInternal; mTestUtilityService = testParams.testUtilityService; mProcessLoggingHandler = testParams.processLoggingHandler; mProtectedPackages = testParams.protectedPackages; @@ -1703,7 +1688,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService public PackageManagerService(PackageManagerServiceInjector injector, boolean onlyCore, boolean factoryTest, final String buildFingerprint, final boolean isEngBuild, final boolean isUserDebugBuild, final int sdkVersion, final String incrementalVersion) { - mIPackageManager = new IPackageManagerImpl(); mIsEngBuild = isEngBuild; mIsUserDebugBuild = isUserDebugBuild; mSdkVersion = sdkVersion; @@ -1734,10 +1718,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService t.traceBegin("createSubComponents"); // Expose private service for system components to use. - mPmInternal = new PackageManagerInternalImpl(); + LocalServices.addService(PackageManagerInternal.class, new PackageManagerInternalImpl()); LocalServices.addService(TestUtilityService.class, this); mTestUtilityService = LocalServices.getService(TestUtilityService.class); - LocalServices.addService(PackageManagerInternal.class, mPmInternal); mUserManager = injector.getUserManagerService(); mUserNeedsBadging = new UserNeedsBadgingCache(mUserManager); mComponentResolver = injector.getComponentResolver(); @@ -1755,7 +1738,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService @Override public boolean hasFeature(String feature) { - return PackageManagerService.this.mIPackageManager.hasSystemFeature(feature, 0); + return PackageManagerService.this.hasSystemFeature(feature, 0); } }; @@ -1885,9 +1868,10 @@ public class PackageManagerService implements PackageSender, TestUtilityService final int dependencyCount = entry.dependencies.length; for (int j = 0; j < dependencyCount; j++) { final SharedLibraryInfo dependency = - getSharedLibraryInfo(entry.dependencies[j], undefinedVersion); + computer.getSharedLibraryInfo(entry.dependencies[j], undefinedVersion); if (dependency != null) { - getSharedLibraryInfo(name, undefinedVersion).addDependency(dependency); + computer.getSharedLibraryInfo(name, undefinedVersion) + .addDependency(dependency); } } } @@ -1899,7 +1883,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService t.traceEnd(); t.traceBegin("read user settings"); - mFirstBoot = !mSettings.readLPw(mLiveComputer, + mFirstBoot = !mSettings.readLPw(computer, mInjector.getUserManagerInternal().getUsers( /* excludePartial= */ true, /* excludeDying= */ false, @@ -1980,19 +1964,26 @@ public class PackageManagerService implements PackageSender, TestUtilityService // Resolve protected action filters. Only the setup wizard is allowed to // have a high priority filter for these actions. mSetupWizardPackage = getSetupWizardPackageNameImpl(computer); - mComponentResolver.fixProtectedFilterPriorities(mPmInternal.getSetupWizardPackageName()); - - mDefaultTextClassifierPackage = mIPackageManager.getDefaultTextClassifierPackageName(); - mSystemTextClassifierPackageName = - mIPackageManager.getSystemTextClassifierPackageName(); - mConfiguratorPackage = getDeviceConfiguratorPackageName(); - mAppPredictionServicePackage = mIPackageManager.getAppPredictionServicePackageName(); - mIncidentReportApproverPackage = - mIPackageManager.getIncidentReportApproverPackageName(); + mComponentResolver.fixProtectedFilterPriorities(mSetupWizardPackage); + + mDefaultTextClassifierPackage = ensureSystemPackageName(computer, + mContext.getString(R.string.config_servicesExtensionPackage)); + mSystemTextClassifierPackageName = ensureSystemPackageName(computer, + mContext.getString(R.string.config_defaultTextClassifierPackage)); + mConfiguratorPackage = ensureSystemPackageName(computer, + mContext.getString(R.string.config_deviceConfiguratorPackageName)); + mAppPredictionServicePackage = ensureSystemPackageName(computer, + getPackageFromComponentString(R.string.config_defaultAppPredictionService)); + mIncidentReportApproverPackage = ensureSystemPackageName(computer, + mContext.getString(R.string.config_incidentReportApproverPackage)); mRetailDemoPackage = getRetailDemoPackageName(); - mOverlayConfigSignaturePackage = getOverlayConfigSignaturePackageName(); - mRecentsPackage = getRecentsPackageName(); - mAmbientContextDetectionPackage = getAmbientContextDetectionPackageName(); + mOverlayConfigSignaturePackage = ensureSystemPackageName(computer, + mInjector.getSystemConfig().getOverlayConfigSignaturePackage()); + mRecentsPackage = ensureSystemPackageName(computer, + getPackageFromComponentString(R.string.config_recentsComponentName)); + mAmbientContextDetectionPackage = ensureSystemPackageName(computer, + getPackageFromComponentString( + R.string.config_defaultAmbientContextDetectionService)); // Now that we know all of the shared libraries, update all clients to have // the correct library paths. @@ -2126,8 +2117,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService mDomainVerificationManager.setProxy(domainVerificationProxy); - mServicesExtensionPackageName = getRequiredServicesExtensionPackageLPr(); - mSharedSystemSharedLibraryPackageName = getRequiredSharedLibrary( + mServicesExtensionPackageName = getRequiredServicesExtensionPackageLPr(computer); + mSharedSystemSharedLibraryPackageName = getRequiredSharedLibrary(computer, PackageManager.SYSTEM_SHARED_LIBRARY_SHARED, SharedLibraryInfo.VERSION_UNDEFINED); } else { @@ -2143,11 +2134,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService mRequiredPermissionControllerPackage = getRequiredPermissionControllerLPr(computer); mSettings.setPermissionControllerVersion( - mIPackageManager.getPackageInfo(mRequiredPermissionControllerPackage, 0, + computer.getPackageInfo(mRequiredPermissionControllerPackage, 0, UserHandle.USER_SYSTEM).getLongVersionCode()); // Resolve the sdk sandbox package - mRequiredSdkSandboxPackage = getRequiredSdkSandboxPackageName(); + mRequiredSdkSandboxPackage = getRequiredSdkSandboxPackageName(computer); // Initialize InstantAppRegistry's Instant App list for all users. for (AndroidPackage pkg : mPackages.values()) { @@ -2155,7 +2146,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService continue; } for (int userId : userIds) { - final PackageStateInternal ps = getPackageStateInternal(pkg.getPackageName()); + final PackageStateInternal ps = + computer.getPackageStateInternal(pkg.getPackageName()); if (ps == null || !ps.getUserStateOrDefault(userId).isInstantApp() || !ps.getUserStateOrDefault(userId).isInstalled()) { continue; @@ -2165,7 +2157,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService } mInstallerService = mInjector.getPackageInstallerService(); - final ComponentName instantAppResolverComponent = getInstantAppResolver(); + final ComponentName instantAppResolverComponent = getInstantAppResolver(computer); if (instantAppResolverComponent != null) { if (DEBUG_INSTANT) { Slog.d(TAG, "Set ephemeral resolver: " + instantAppResolverComponent); @@ -2191,7 +2183,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService // scanning). final Map<Integer, List<PackageInfo>> userPackages = new HashMap<>(); for (int userId : userIds) { - userPackages.put(userId, mIPackageManager.getInstalledPackages(/*flags*/ 0, userId) + userPackages.put(userId, computer.getInstalledPackages(/*flags*/ 0, userId) .getList()); } mDexManager.load(userPackages); @@ -2202,7 +2194,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService SystemClock.uptimeMillis() - startTime); } - // Rebild the live computer since some attributes have been rebuilt. + // Rebuild the live computer since some attributes have been rebuilt. mLiveComputer = createLiveComputer(); } // synchronized (mLock) @@ -2210,6 +2202,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService // CHECKSTYLE:ON IndentationCheck mModuleInfoProvider = mInjector.getModuleInfoProvider(); + mInjector.getSystemWrapper().enablePackageCaches(); // Now after opening every single application zip, make sure they @@ -2281,8 +2274,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @NonNull - private String getRequiredSharedLibrary(@NonNull String name, int version) { - SharedLibraryInfo libraryInfo = getSharedLibraryInfo(name, version); + private String getRequiredSharedLibrary(@NonNull Computer snapshot, @NonNull String name, + int version) { + SharedLibraryInfo libraryInfo = snapshot.getSharedLibraryInfo(name, version); if (libraryInfo == null) { throw new IllegalStateException("Missing required shared library:" + name); } @@ -2294,9 +2288,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @NonNull - private String getRequiredServicesExtensionPackageLPr() { + private String getRequiredServicesExtensionPackageLPr(@NonNull Computer computer) { String servicesExtensionPackage = - ensureSystemPackageName( + ensureSystemPackageName(computer, mContext.getString(R.string.config_servicesExtensionPackage)); if (TextUtils.isEmpty(servicesExtensionPackage)) { throw new RuntimeException( @@ -2375,7 +2369,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService for (int i = 0; i < N; i++) { final ResolveInfo cur = matches.get(i); final String packageName = cur.getComponentInfo().packageName; - if (mIPackageManager.checkPermission( + if (checkPermission( android.Manifest.permission.INTENT_FILTER_VERIFICATION_AGENT, packageName, UserHandle.USER_SYSTEM) != PackageManager.PERMISSION_GRANTED) { continue; @@ -2405,7 +2399,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService for (int i = 0; i < N; i++) { final ResolveInfo cur = matches.get(i); final String packageName = cur.getComponentInfo().packageName; - if (mIPackageManager.checkPermission( + if (checkPermission( android.Manifest.permission.DOMAIN_VERIFICATION_AGENT, packageName, UserHandle.USER_SYSTEM) != PackageManager.PERMISSION_GRANTED) { Slog.w(TAG, "Domain verification agent found but does not hold permission: " @@ -2414,7 +2408,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService } if (best == null || cur.priority > best.priority) { - if (mComputer.isComponentEffectivelyEnabled(cur.getComponentInfo(), + if (computer.isComponentEffectivelyEnabled(cur.getComponentInfo(), UserHandle.USER_SYSTEM)) { best = cur; } else { @@ -2430,7 +2424,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService return null; } - private @Nullable ComponentName getInstantAppResolver() { + @Nullable ComponentName getInstantAppResolver(@NonNull Computer snapshot) { final String[] packageArray = mContext.getResources().getStringArray(R.array.config_ephemeralResolverPackage); if (packageArray.length == 0 && !Build.IS_DEBUGGABLE) { @@ -2446,7 +2440,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService | MATCH_DIRECT_BOOT_UNAWARE | (!Build.IS_DEBUGGABLE ? MATCH_SYSTEM_ONLY : 0); final Intent resolverIntent = new Intent(Intent.ACTION_RESOLVE_INSTANT_APP_PACKAGE); - List<ResolveInfo> resolvers = queryIntentServicesInternal(resolverIntent, null, + List<ResolveInfo> resolvers = snapshot.queryIntentServicesInternal(resolverIntent, null, resolveFlags, UserHandle.USER_SYSTEM, callingUid, false /*includeInstantApps*/); final int N = resolvers.size(); if (N == 0) { @@ -2519,7 +2513,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService Iterator<ResolveInfo> iter = matches.iterator(); while (iter.hasNext()) { final ResolveInfo rInfo = iter.next(); - if (mIPackageManager.checkPermission( + if (checkPermission( Manifest.permission.INSTALL_PACKAGES, rInfo.activityInfo.packageName, 0) == PERMISSION_GRANTED || mIsEngBuild) { continue; @@ -2550,48 +2544,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService return matches.get(0).getComponentInfo().getComponentName(); } - /** - * @see #shouldFilterApplication(PackageStateInternal, int, ComponentName, int, int) - */ - boolean shouldFilterApplication( - @Nullable PackageStateInternal ps, int callingUid, int userId) { - return mComputer.shouldFilterApplication( - ps, callingUid, userId); - } - - private @PackageStartability int getPackageStartability(String packageName, - int callingUid, int userId) { - return mComputer.getPackageStartability(mSafeMode, packageName, callingUid, userId); - } - - /** - * Returns whether or not a full application can see an instant application. - * <p> - * Currently, there are four cases in which this can occur: - * <ol> - * <li>The calling application is a "special" process. Special processes - * are those with a UID < {@link Process#FIRST_APPLICATION_UID}.</li> - * <li>The calling application has the permission - * {@link android.Manifest.permission#ACCESS_INSTANT_APPS}.</li> - * <li>The calling application is the default launcher on the - * system partition.</li> - * <li>The calling application is the default app prediction service.</li> - * </ol> - */ - boolean canViewInstantApps(int callingUid, int userId) { - return mComputer.canViewInstantApps(callingUid, userId); - } - - private PackageInfo generatePackageInfo(@NonNull PackageStateInternal ps, - @PackageManager.PackageInfoFlagsBits long flags, int userId) { - return mComputer.generatePackageInfo(ps, flags, userId); - } - - int getPackageUidInternal(String packageName, - @PackageManager.PackageInfoFlagsBits long flags, int userId, int callingUid) { - return mComputer.getPackageUidInternal(packageName, flags, userId, callingUid); - } - public PermissionGroupInfo getPermissionGroupInfo(String groupName, int flags) { // Because this is accessed via the package manager service AIDL, // go through the permission manager service AIDL @@ -2600,19 +2552,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } /** - * Important: The provided filterCallingUid is used exclusively to filter out applications - * that can be seen based on user state. It's typically the original caller uid prior - * to clearing. Because it can only be provided by trusted code, its value can be - * trusted and will be used as-is; unlike userId which will be validated by this method. - */ - private ApplicationInfo getApplicationInfoInternal(String packageName, - @PackageManager.ApplicationInfoFlagsBits long flags, - int filterCallingUid, int userId) { - return mComputer.getApplicationInfoInternal(packageName, flags, - filterCallingUid, userId); - } - - /** * Blocking call to clear all cached app data above quota. */ public void freeAllAppCacheAboveQuota(String volumeUuid) throws IOException { @@ -2648,7 +2587,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService // 2. Consider preloaded data (after 1w honeymoon, unless aggressive) if (internalVolume && (aggressive || SystemProperties .getBoolean("persist.sys.preloads.file_cache_expired", false))) { - mIPackageManager.deletePreloadsFileCache(); + deletePreloadsFileCache(); if (file.getUsableSpace() >= bytes) return; } @@ -2769,43 +2708,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService return recommendedInstallLocation; } - /** - * Update given flags when being used to request {@link ResolveInfo}. - * <p>Instant apps are resolved specially, depending upon context. Minimally, - * {@code}flags{@code} must have the {@link PackageManager#MATCH_INSTANT} - * flag set. However, this flag is only honoured in three circumstances: - * <ul> - * <li>when called from a system process</li> - * <li>when the caller holds the permission {@code android.permission.ACCESS_INSTANT_APPS}</li> - * <li>when resolution occurs to start an activity with a {@code android.intent.action.VIEW} - * action and a {@code android.intent.category.BROWSABLE} category</li> - * </ul> - */ - long updateFlagsForResolve(long flags, int userId, int callingUid, - boolean wantInstantApps, boolean isImplicitImageCaptureIntentAndNotSetByDpc) { - return mComputer.updateFlagsForResolve(flags, userId, callingUid, - wantInstantApps, isImplicitImageCaptureIntentAndNotSetByDpc); - } - - /** - * Important: The provided filterCallingUid is used exclusively to filter out activities - * that can be seen based on user state. It's typically the original caller uid prior - * to clearing. Because it can only be provided by trusted code, its value can be - * trusted and will be used as-is; unlike userId which will be validated by this method. - */ - private ActivityInfo getActivityInfoInternal(ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, int filterCallingUid, int userId) { - return mComputer.getActivityInfoInternal(component, flags, - filterCallingUid, userId); - } - - @Nullable - List<VersionedPackage> getPackagesUsingSharedLibrary( - SharedLibraryInfo libInfo, @PackageManager.PackageInfoFlagsBits long flags, - int callingUid, int userId) { - return mComputer.getPackagesUsingSharedLibrary(libInfo, flags, callingUid, userId); - } - public ModuleInfo getModuleInfo(String packageName, @PackageManager.ModuleInfoFlags int flags) { return mModuleInfoProvider.getModuleInfo(packageName, flags); } @@ -2840,7 +2742,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService return mRequiredInstallerPackage; } - private void requestInstantAppResolutionPhaseTwo(AuxiliaryResolveInfo responseObj, + void requestInstantAppResolutionPhaseTwo(AuxiliaryResolveInfo responseObj, Intent origIntent, String resolvedType, String callingPackage, @Nullable String callingFeatureId, boolean isRequesterInstantApp, Bundle verificationBundle, int userId) { @@ -2852,31 +2754,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService mHandler.sendMessage(msg); } - /** - * From Android R, camera intents have to match system apps. The only exception to this is if - * the DPC has set the camera persistent preferred activity. This case was introduced - * because it is important that the DPC has the ability to set both system and non-system - * camera persistent preferred activities. - * - * @return {@code true} if the intent is a camera intent and the persistent preferred - * activity was not set by the DPC. - */ - @GuardedBy("mLock") - boolean isImplicitImageCaptureIntentAndNotSetByDpcLocked(Intent intent, int userId, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags) { - return mComputer.isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, userId, - resolvedType, flags); - } - - @GuardedBy("mLock") - ResolveInfo findPersistentPreferredActivityLP(Intent intent, - String resolvedType, - @PackageManager.ResolveInfoFlagsBits long flags, List<ResolveInfo> query, boolean debug, - int userId) { - return mComputer.findPersistentPreferredActivityLP(intent, - resolvedType, flags, query, debug, userId); - } - // findPreferredActivityBody returns two items: a "things changed" flag and a // ResolveInfo, which is the preferred activity itself. static class FindPreferredActivityBodyResult { @@ -2884,24 +2761,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService ResolveInfo mPreferredResolveInfo; } - FindPreferredActivityBodyResult findPreferredActivityInternal( - Intent intent, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, - List<ResolveInfo> query, boolean always, - boolean removeMatches, boolean debug, int userId, boolean queryMayBeFiltered) { - return mComputer.findPreferredActivityInternal( - intent, resolvedType, flags, - query, always, - removeMatches, debug, userId, queryMayBeFiltered); - } - - /** - * Returns the package name of the calling Uid if it's an instant app. If it isn't - * instant, returns {@code null}. - */ - String getInstantAppPackageName(int callingUid) { - return mComputer.getInstantAppPackageName(callingUid); - } - public @NonNull ParceledListSlice<ResolveInfo> queryIntentReceivers(@NonNull Computer snapshot, Intent intent, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, @UserIdInt int userId) { @@ -2909,24 +2768,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService snapshot, intent, resolvedType, flags, userId, Binder.getCallingUid())); } - @NonNull List<ResolveInfo> queryIntentServicesInternal(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId, - int callingUid, boolean includeInstantApps) { - return mComputer.queryIntentServicesInternal(intent, - resolvedType, flags, userId, callingUid, - includeInstantApps); - } - - private boolean isInstantAppInternal(String packageName, @UserIdInt int userId, - int callingUid) { - return mComputer.isInstantAppInternal(packageName, userId, - callingUid); - } - - boolean isCallerSameApp(String packageName, int uid) { - return mComputer.isCallerSameApp(packageName, uid); - } - public static void reportSettingsProblem(int priority, String msg) { logCriticalInfo(priority, msg); } @@ -2943,39 +2784,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService return packageName + STATIC_SHARED_LIB_DELIMITER + libraryVersion; } - /** - * Enforces the request is from the system or an app that has INTERACT_ACROSS_USERS - * or INTERACT_ACROSS_USERS_FULL permissions, if the {@code userId} is not for the caller. - * - * @param checkShell whether to prevent shell from access if there's a debugging restriction - * @param message the message to log on security exception - */ - void enforceCrossUserPermission(int callingUid, @UserIdInt int userId, - boolean requireFullPermission, boolean checkShell, String message) { - mComputer.enforceCrossUserPermission(callingUid, userId, - requireFullPermission, checkShell, message); - } - - /** - * Checks if the request is from the system or an app that has the appropriate cross-user - * permissions defined as follows: - * <ul> - * <li>INTERACT_ACROSS_USERS_FULL if {@code requireFullPermission} is true.</li> - * <li>INTERACT_ACROSS_USERS if the given {@code userId} is in a different profile group - * to the caller.</li> - * <li>Otherwise, INTERACT_ACROSS_PROFILES if the given {@code userId} is in the same profile - * group as the caller.</li> - * </ul> - * - * @param checkShell whether to prevent shell from access if there's a debugging restriction - * @param message the message to log on security exception - */ - private void enforceCrossUserOrProfilePermission(int callingUid, @UserIdInt int userId, - boolean requireFullPermission, boolean checkShell, String message) { - mComputer.enforceCrossUserOrProfilePermission(callingUid, userId, - requireFullPermission, checkShell, message); - } - public void performFstrimIfNeeded() { PackageManagerServiceUtils.enforceSystemOrRoot("Only the system can request fstrim"); @@ -3033,17 +2841,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService return mDexManager; } - @NonNull - List<PackageStateInternal> findSharedNonSystemLibraries( - @NonNull PackageStateInternal pkgSetting) { - return mComputer.findSharedNonSystemLibraries(pkgSetting); - } - - @Nullable - SharedLibraryInfo getSharedLibraryInfo(String name, long version) { - return mComputer.getSharedLibraryInfo(name, version); - } - public void shutdown() { mCompilerStats.writeNow(); mDexManager.writePackageDexUsageNow(); @@ -3141,14 +2938,14 @@ public class PackageManagerService implements PackageSender, TestUtilityService mPackageObserverHelper.notifyRemoved(packageName, uid); } - void sendPackageAddedForUser(String packageName, @NonNull PackageStateInternal packageState, - int userId, int dataLoaderType) { + void sendPackageAddedForUser(@NonNull Computer snapshot, String packageName, + @NonNull PackageStateInternal packageState, int userId, int dataLoaderType) { final PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId); final boolean isSystem = packageState.isSystem(); final boolean isInstantApp = userState.isInstantApp(); final int[] userIds = isInstantApp ? EMPTY_INT_ARRAY : new int[] { userId }; final int[] instantUserIds = isInstantApp ? new int[] { userId } : EMPTY_INT_ARRAY; - sendPackageAddedForNewUsers(packageName, isSystem /*sendBootCompleted*/, + sendPackageAddedForNewUsers(snapshot, packageName, isSystem /*sendBootCompleted*/, false /*startReceiver*/, packageState.getAppId(), userIds, instantUserIds, dataLoaderType); @@ -3160,15 +2957,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void sendPackageAddedForNewUsers(String packageName, boolean sendBootCompleted, - boolean includeStopped, @AppIdInt int appId, int[] userIds, int[] instantUserIds, - int dataLoaderType) { + public void sendPackageAddedForNewUsers(@NonNull Computer snapshot, String packageName, + boolean sendBootCompleted, boolean includeStopped, @AppIdInt int appId, int[] userIds, + int[] instantUserIds, int dataLoaderType) { if (ArrayUtils.isEmpty(userIds) && ArrayUtils.isEmpty(instantUserIds)) { return; } SparseArray<int[]> broadcastAllowList = mAppsFilter.getVisibilityAllowList( - getPackageStateInternal(packageName, Process.SYSTEM_UID), - userIds, getPackageStates()); + snapshot.getPackageStateInternal(packageName, Process.SYSTEM_UID), + userIds, snapshot.getPackageStates()); mHandler.post(() -> mBroadcastHelper.sendPackageAddedForNewUsers( packageName, appId, userIds, instantUserIds, dataLoaderType, broadcastAllowList)); if (sendBootCompleted && !ArrayUtils.isEmpty(userIds)) { @@ -3202,8 +2999,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService return false; } - private void enforceCanSetPackagesSuspendedAsUser(String callingPackage, int callingUid, - int userId, String callingMethod) { + private void enforceCanSetPackagesSuspendedAsUser(@NonNull Computer snapshot, + String callingPackage, int callingUid, int userId, String callingMethod) { if (callingUid == Process.ROOT_UID // Need to compare app-id to allow system dialogs access on secondary users || UserHandle.getAppId(callingUid) == Process.SYSTEM_UID) { @@ -3212,7 +3009,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService final String ownerPackage = mProtectedPackages.getDeviceOwnerOrProfileOwnerPackage(userId); if (ownerPackage != null) { - final int ownerUid = mIPackageManager.getPackageUid(ownerPackage, 0, userId); + final int ownerUid = snapshot.getPackageUid(ownerPackage, 0, userId); if (ownerUid == callingUid) { return; } @@ -3221,7 +3018,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SUSPEND_APPS, callingMethod); - final int packageUid = mIPackageManager.getPackageUid(callingPackage, 0, userId); + final int packageUid = snapshot.getPackageUid(callingPackage, 0, userId); final boolean allowedPackageUid = packageUid == callingUid; // TODO(b/139383163): remove special casing for shell and enforce INTERACT_ACROSS_USERS_FULL final boolean allowedShell = callingUid == SHELL_UID @@ -3242,13 +3039,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService allPackages, suspendingPackage::equals, userId); } - private boolean isSuspendingAnyPackages(String suspendingPackage, int userId) { - return mComputer.isSuspendingAnyPackages(suspendingPackage, userId); - } - - void removeAllDistractingPackageRestrictions(int userId) { - final String[] allPackages = mComputer.getAllAvailablePackageNames(); - removeDistractingPackageRestrictions(allPackages, userId); + void removeAllDistractingPackageRestrictions(@NonNull Computer snapshot, int userId) { + final String[] allPackages = snapshot.getAllAvailablePackageNames(); + removeDistractingPackageRestrictions(snapshot, allPackages, userId); } /** @@ -3260,11 +3053,12 @@ public class PackageManagerService implements PackageSender, TestUtilityService * @param packagesToChange The packages on which restrictions are to be removed. * @param userId the user for which changes are taking place. */ - private void removeDistractingPackageRestrictions(String[] packagesToChange, int userId) { + void removeDistractingPackageRestrictions(@NonNull Computer snapshot, + String[] packagesToChange, int userId) { final List<String> changedPackages = new ArrayList<>(); final IntArray changedUids = new IntArray(); for (String packageName : packagesToChange) { - final PackageStateInternal ps = getPackageStateInternal(packageName); + final PackageStateInternal ps = snapshot.getPackageStateInternal(packageName); if (ps != null && ps.getUserStateOrDefault(userId).getDistractionFlags() != 0) { changedPackages.add(ps.getPackageName()); changedUids.add(UserHandle.getUid(userId, ps.getAppId())); @@ -3287,7 +3081,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - private void setEnableRollbackCode(int token, int enableRollbackCode) { + void setEnableRollbackCode(int token, int enableRollbackCode) { final Message msg = mHandler.obtainMessage(ENABLE_ROLLBACK_STATUS); msg.arg1 = token; msg.arg2 = enableRollbackCode; @@ -3334,7 +3128,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService if (DEBUG_BACKUP) { Slog.i(TAG, "Package " + packageName + " sending normal FIRST_LAUNCH"); } - final boolean isInstantApp = isInstantAppInternal( + final boolean isInstantApp = snapshotComputer().isInstantAppInternal( packageName, userId, Process.SYSTEM_UID); final int[] userIds = isInstantApp ? EMPTY_INT_ARRAY : new int[] { userId }; final int[] instantUserIds = isInstantApp ? new int[] { userId } : EMPTY_INT_ARRAY; @@ -3384,30 +3178,22 @@ public class PackageManagerService implements PackageSender, TestUtilityService versionedPackage, observer, userId, deleteFlags, false); } - private String resolveExternalPackageName(AndroidPackage pkg) { - return mComputer.resolveExternalPackageName(pkg); - } - - String resolveInternalPackageName(String packageName, long versionCode) { - return mComputer.resolveInternalPackageName(packageName, versionCode); - } - - boolean isCallerVerifier(int callingUid) { + boolean isCallerVerifier(@NonNull Computer snapshot, int callingUid) { final int callingUserId = UserHandle.getUserId(callingUid); - return mRequiredVerifierPackage != null && callingUid == mIPackageManager.getPackageUid( + return mRequiredVerifierPackage != null && callingUid == snapshot.getPackageUid( mRequiredVerifierPackage, 0, callingUserId); } - public boolean isPackageDeviceAdminOnAnyUser(String packageName) { + public boolean isPackageDeviceAdminOnAnyUser(@NonNull Computer snapshot, String packageName) { final int callingUid = Binder.getCallingUid(); - if (mIPackageManager.checkUidPermission(android.Manifest.permission.MANAGE_USERS, - callingUid) != PERMISSION_GRANTED) { + if (snapshot.checkUidPermission(android.Manifest.permission.MANAGE_USERS, callingUid) + != PERMISSION_GRANTED) { EventLog.writeEvent(0x534e4554, "128599183", -1, ""); throw new SecurityException(android.Manifest.permission.MANAGE_USERS + " permission is required to call this API"); } - if (getInstantAppPackageName(callingUid) != null - && !isCallerSameApp(packageName, callingUid)) { + if (snapshot.getInstantAppPackageName(callingUid) != null + && !snapshot.isCallerSameApp(packageName, callingUid)) { return false; } return isPackageDeviceAdmin(packageName, UserHandle.USER_ALL); @@ -3456,14 +3242,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService return mDevicePolicyManager; } - private boolean clearApplicationUserDataLIF(String packageName, int userId) { + private boolean clearApplicationUserDataLIF(@NonNull Computer snapshot, String packageName, + int userId) { if (packageName == null) { Slog.w(TAG, "Attempt to delete null packageName."); return false; } // Try finding details about the requested package - AndroidPackage pkg = getPackage(packageName); + AndroidPackage pkg = snapshot.getPackage(packageName); if (pkg == null) { Slog.w(TAG, "Package named '" + packageName + "' doesn't exist."); return false; @@ -3486,8 +3273,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService } else { flags = 0; } - mAppDataHelper.prepareAppDataContentsLIF(pkg, getPackageStateInternal(packageName), userId, - flags); + mAppDataHelper.prepareAppDataContentsLIF(pkg, snapshot.getPackageStateInternal(packageName), + userId, flags); return true; } @@ -3538,10 +3325,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - int getUidTargetSdkVersion(int uid) { - return mComputer.getUidTargetSdkVersion(uid); - } - void postPreferredActivityChangedBroadcast(int userId) { mHandler.post(() -> mBroadcastHelper.sendPreferredActivityChangedBroadcast(userId)); } @@ -3562,18 +3345,19 @@ public class PackageManagerService implements PackageSender, TestUtilityService // Persistent preferred activity might have came into effect due to this // install. - mPreferredActivityHelper.updateDefaultHomeNotLocked(userId); + mPreferredActivityHelper.updateDefaultHomeNotLocked(snapshotComputer(), userId); } /** * Variant that takes a {@link WatchedIntentFilter} */ - public void addCrossProfileIntentFilter(WatchedIntentFilter intentFilter, String ownerPackage, - int sourceUserId, int targetUserId, int flags) { + public void addCrossProfileIntentFilter(@NonNull Computer snapshot, + WatchedIntentFilter intentFilter, String ownerPackage, int sourceUserId, + int targetUserId, int flags) { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, null); int callingUid = Binder.getCallingUid(); - enforceOwnerRights(ownerPackage, callingUid); + enforceOwnerRights(snapshot, ownerPackage, callingUid); PackageManagerServiceUtils.enforceShellRestriction(mInjector.getUserManagerInternal(), UserManager.DISALLOW_DEBUGGING_FEATURES, callingUid, sourceUserId); if (intentFilter.countActions() == 0) { @@ -3601,18 +3385,18 @@ public class PackageManagerService implements PackageSender, TestUtilityService } // Enforcing that callingUid is owning pkg on userId - private void enforceOwnerRights(String pkg, int callingUid) { + private void enforceOwnerRights(@NonNull Computer snapshot, String pkg, int callingUid) { // The system owns everything. if (UserHandle.getAppId(callingUid) == Process.SYSTEM_UID) { return; } - final String[] callerPackageNames = mIPackageManager.getPackagesForUid(callingUid); + final String[] callerPackageNames = snapshot.getPackagesForUid(callingUid); if (!ArrayUtils.contains(callerPackageNames, pkg)) { throw new SecurityException("Calling uid " + callingUid + " does not own package " + pkg); } final int callingUserId = UserHandle.getUserId(callingUid); - PackageInfo pi = mIPackageManager.getPackageInfo(pkg, 0, callingUserId); + PackageInfo pi = snapshot.getPackageInfo(pkg, 0, callingUserId); if (pi == null) { throw new IllegalArgumentException("Unknown package " + pkg + " on user " + callingUserId); @@ -3626,29 +3410,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService } final UserInfo parent = ums.getProfileParent(userId); final int launcherUid = (parent != null) ? parent.id : userId; - final ComponentName launcherComponent = getDefaultHomeActivity(launcherUid); + // TODO: Should this snapshot be moved further up? + final ComponentName launcherComponent = snapshotComputer() + .getDefaultHomeActivity(launcherUid); mBroadcastHelper.sendSessionCommitBroadcast(sessionInfo, userId, launcherUid, launcherComponent, mAppPredictionServicePackage); } - /** - * Report the 'Home' activity which is currently set as "always use this one". If non is set - * then reports the most likely home activity or null if there are more than one. - */ - private ComponentName getDefaultHomeActivity(int userId) { - return mComputer.getDefaultHomeActivity(userId); - } - - Intent getHomeIntent() { - return mComputer.getHomeIntent(); - } - - ComponentName getHomeActivitiesAsUser(List<ResolveInfo> allHomeCandidates, - int userId) { - return mComputer.getHomeActivitiesAsUser(allHomeCandidates, - userId); - } - private @Nullable String getSetupWizardPackageNameImpl(@NonNull Computer computer) { final Intent intent = new Intent(Intent.ACTION_MAIN); intent.addCategory(Intent.CATEGORY_SETUP_WIZARD); @@ -3682,10 +3450,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - private @NonNull String getRequiredSdkSandboxPackageName() { + @NonNull + private static String getRequiredSdkSandboxPackageName(@NonNull Computer computer) { final Intent intent = new Intent(SdkSandboxManagerLocal.SERVICE_INTERFACE); - final List<ResolveInfo> matches = queryIntentServicesInternal( + final List<ResolveInfo> matches = computer.queryIntentServicesInternal( intent, /* resolvedType= */ null, MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, @@ -3701,22 +3470,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Nullable - private String getDeviceConfiguratorPackageName() { - return ensureSystemPackageName(mContext.getString( - R.string.config_deviceConfiguratorPackageName)); - } - - public @Nullable String getAmbientContextDetectionPackageName() { - return ensureSystemPackageName(getPackageFromComponentString( - R.string.config_defaultAmbientContextDetectionService)); - } - - public String getOverlayConfigSignaturePackageName() { - return ensureSystemPackageName(mInjector.getSystemConfig() - .getOverlayConfigSignaturePackage()); - } - - @Nullable private String getRetailDemoPackageName() { final String predefinedPkgName = mContext.getString(R.string.config_retailDemoPackage); final String predefinedSignature = mContext.getString( @@ -3752,14 +3505,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Nullable - private String getRecentsPackageName() { - return ensureSystemPackageName( - getPackageFromComponentString(R.string.config_recentsComponentName)); - - } - - @Nullable - private String getPackageFromComponentString(@StringRes int stringResId) { + String getPackageFromComponentString(@StringRes int stringResId) { final String componentString = mContext.getString(stringResId); if (TextUtils.isEmpty(componentString)) { return null; @@ -3772,16 +3518,17 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Nullable - private String ensureSystemPackageName(@Nullable String packageName) { + String ensureSystemPackageName(@NonNull Computer snapshot, + @Nullable String packageName) { if (packageName == null) { return null; } final long token = Binder.clearCallingIdentity(); try { - if (mIPackageManager.getPackageInfo(packageName, MATCH_FACTORY_ONLY, + if (snapshot.getPackageInfo(packageName, MATCH_FACTORY_ONLY, UserHandle.USER_SYSTEM) == null) { PackageInfo packageInfo = - mIPackageManager.getPackageInfo(packageName, 0, UserHandle.USER_SYSTEM); + snapshot.getPackageInfo(packageName, 0, UserHandle.USER_SYSTEM); if (packageInfo != null) { EventLog.writeEvent(0x534e4554, "145981139", packageInfo.applicationInfo.uid, ""); @@ -3863,8 +3610,10 @@ public class PackageManagerService implements PackageSender, TestUtilityService private void setEnabledSettings(List<ComponentEnabledSetting> settings, int userId, String callingPackage) { final int callingUid = Binder.getCallingUid(); - enforceCrossUserPermission(callingUid, userId, false /* requireFullPermission */, - true /* checkShell */, "set enabled"); + // TODO: This method is not properly snapshotified beyond this call + final Computer preLockSnapshot = snapshotComputer(); + preLockSnapshot.enforceCrossUserPermission(callingUid, userId, + false /* requireFullPermission */, true /* checkShell */, "set enabled"); final int targetSize = settings.size(); for (int i = 0; i < targetSize; i++) { @@ -3920,6 +3669,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService final Map<String, PackageSetting> pkgSettings = new ArrayMap<>(targetSize); // reader synchronized (mLock) { + final Computer snapshot = snapshotComputer(); // Checks for target packages for (int i = 0; i < targetSize; i++) { final ComponentEnabledSetting setting = settings.get(i); @@ -3929,13 +3679,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService continue; } final boolean isCallerTargetApp = ArrayUtils.contains( - mIPackageManager.getPackagesForUid(callingUid), packageName); + snapshot.getPackagesForUid(callingUid), packageName); final PackageSetting pkgSetting = mSettings.getPackageLPr(packageName); // Limit who can change which apps if (!isCallerTargetApp) { // Don't allow apps that don't have permission to modify other apps if (!allowedByPermission - || shouldFilterApplication(pkgSetting, callingUid, userId)) { + || snapshot.shouldFilterApplication(pkgSetting, callingUid, userId)) { throw new SecurityException("Attempt to change component state; " + "pid=" + Binder.getCallingPid() + ", uid=" + callingUid @@ -4108,12 +3858,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService final long callingId = Binder.clearCallingIdentity(); try { + final Computer newSnapshot = snapshotComputer(); for (int i = 0; i < sendNowBroadcasts.size(); i++) { final String packageName = sendNowBroadcasts.keyAt(i); final ArrayList<String> components = sendNowBroadcasts.valueAt(i); final int packageUid = UserHandle.getUid( userId, pkgSettings.get(packageName).getAppId()); - sendPackageChangedBroadcast(packageName, false /* dontKillApp */, + sendPackageChangedBroadcast(newSnapshot, packageName, false /* dontKillApp */, components, packageUid, null /* reason */); } } finally { @@ -4137,13 +3888,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService pkgSetting.setEnabled(newState, userId, callingPackage); if ((newState == COMPONENT_ENABLED_STATE_DISABLED_USER || newState == COMPONENT_ENABLED_STATE_DISABLED) - && mIPackageManager.checkPermission(Manifest.permission.SUSPEND_APPS, - packageName, userId) == PERMISSION_GRANTED) { + && checkPermission(Manifest.permission.SUSPEND_APPS, packageName, userId) + == PERMISSION_GRANTED) { // This app should not generally be allowed to get disabled by the UI, but // if it ever does, we don't want to end up with some of the user's apps // permanently suspended. unsuspendForSuspendingPackage(computer, packageName, userId); - removeAllDistractingPackageRestrictions(userId); + removeAllDistractingPackageRestrictions(computer, userId); } success = true; } else { @@ -4194,25 +3945,20 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - void sendPackageChangedBroadcast(String packageName, + void sendPackageChangedBroadcast(@NonNull Computer snapshot, String packageName, boolean dontKillApp, ArrayList<String> componentNames, int packageUid, String reason) { final int userId = UserHandle.getUserId(packageUid); - final boolean isInstantApp = isInstantAppInternal(packageName, userId, Process.SYSTEM_UID); + final boolean isInstantApp = + snapshot.isInstantAppInternal(packageName, userId, Process.SYSTEM_UID); final int[] userIds = isInstantApp ? EMPTY_INT_ARRAY : new int[] { userId }; final int[] instantUserIds = isInstantApp ? new int[] { userId } : EMPTY_INT_ARRAY; - final SparseArray<int[]> broadcastAllowList = getBroadcastAllowList( + final SparseArray<int[]> broadcastAllowList = snapshot.getBroadcastAllowList( packageName, userIds, isInstantApp); mHandler.post(() -> mBroadcastHelper.sendPackageChangedBroadcast( packageName, dontKillApp, componentNames, packageUid, reason, userIds, instantUserIds, broadcastAllowList)); } - @Nullable - private SparseArray<int[]> getBroadcastAllowList(@NonNull String packageName, - @UserIdInt int[] userIds, boolean isInstantApp) { - return mComputer.getBroadcastAllowList(packageName, userIds, isInstantApp); - } - /** * Used by SystemServer */ @@ -4296,7 +4042,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService // Now that we're mostly running, clean up stale users and apps mUserManager.reconcileUsers(StorageManager.UUID_PRIVATE_INTERNAL); - storageEventHelper.reconcileApps(StorageManager.UUID_PRIVATE_INTERNAL); + storageEventHelper.reconcileApps(snapshotComputer(), StorageManager.UUID_PRIVATE_INTERNAL); mPermissionManager.onSystemReady(); @@ -4308,7 +4054,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService final int livingUserCount = livingUsers.size(); for (int i = 0; i < livingUserCount; i++) { final int userId = livingUsers.get(i).id; - if (mPmInternal.isPermissionUpgradeNeeded(userId)) { + if (mSettings.isPermissionUpgradeNeeded(userId)) { grantPermissionsUserIds = ArrayUtils.appendInt( grantPermissionsUserIds, userId); } @@ -4350,11 +4096,12 @@ public class PackageManagerService implements PackageSender, TestUtilityService if (packageName == null) { return; } - AndroidPackage pkg = mPackages.get(packageName); + final Computer snapshot = snapshotComputer(); + AndroidPackage pkg = snapshot.getPackage(packageName); if (pkg == null) { return; } - sendPackageChangedBroadcast(pkg.getPackageName(), + sendPackageChangedBroadcast(snapshot, pkg.getPackageName(), true /* dontKillApp */, new ArrayList<>(Collections.singletonList(pkg.getPackageName())), pkg.getUid(), @@ -4407,14 +4154,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService mSnapshotStatistics.dump(pw, " ", now, hits, -1, isBrief); } - /** - * Dump package manager states to the file according to a given dumping type of - * {@link DumpState}. - */ - void dumpComputer(int type, FileDescriptor fd, PrintWriter pw, DumpState dumpState) { - mComputer.dump(type, fd, pw, dumpState); - } - //TODO: b/111402650 private void disableSkuSpecificApps() { String[] apkList = mContext.getResources().getStringArray( @@ -4428,10 +4167,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService if (!TextUtils.isEmpty(sku) && ArrayUtils.contains(skuArray, sku)) { return; } + final Computer snapshot = snapshotComputer(); for (String packageName : apkList) { - mIPackageManager.setSystemAppHiddenUntilInstalled(packageName, true); + setSystemAppHiddenUntilInstalled(snapshot, packageName, true); for (UserInfo user : mInjector.getUserManagerInternal().getUsers(false)) { - mIPackageManager.setSystemAppInstallState(packageName, false, user.id); + setSystemAppInstallState(snapshot, packageName, false, user.id); } } } @@ -4524,7 +4264,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService mPermissionManager.writeLegacyPermissionStateTEMP(); mSettings.readPermissionStateForUserSyncLPr(userId); mPermissionManager.readLegacyPermissionStateTEMP(); - return mPmInternal.isPermissionUpgradeNeeded(userId); + return mSettings.isPermissionUpgradeNeeded(userId); } } @@ -4544,12 +4284,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - boolean userNeedsBadging(int userId) { - return mUserNeedsBadging.get(userId); - } - - private void deletePackageIfUnused(final String packageName) { - PackageStateInternal ps = getPackageStateInternal(packageName); + private void deletePackageIfUnused(@NonNull Computer snapshot, final String packageName) { + PackageStateInternal ps = snapshot.getPackageStateInternal(packageName); if (ps == null) { return; } @@ -4567,41 +4303,101 @@ public class PackageManagerService implements PackageSender, TestUtilityService 0, PackageManager.DELETE_ALL_USERS, true /*removedBySystem*/)); } - private AndroidPackage getPackage(String packageName) { - return mComputer.getPackage(packageName); + void deletePreloadsFileCache() { + mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CLEAR_APP_CACHE, + "deletePreloadsFileCache"); + File dir = Environment.getDataPreloadsFileCacheDirectory(); + Slog.i(PackageManagerService.TAG, "Deleting preloaded file cache " + dir); + FileUtils.deleteContents(dir); } - private AndroidPackage getPackage(int uid) { - return mComputer.getPackage(uid); - } + void setSystemAppHiddenUntilInstalled(@NonNull Computer snapshot, String packageName, + boolean hidden) { + final int callingUid = Binder.getCallingUid(); + final boolean calledFromSystemOrPhone = callingUid == Process.PHONE_UID + || callingUid == Process.SYSTEM_UID; + if (!calledFromSystemOrPhone) { + mContext.enforceCallingOrSelfPermission(Manifest.permission.SUSPEND_APPS, + "setSystemAppHiddenUntilInstalled"); + } - private SigningDetails getSigningDetails(@NonNull String packageName) { - return mComputer.getSigningDetails(packageName); - } + final PackageStateInternal stateRead = snapshot.getPackageStateInternal(packageName); + if (stateRead == null || !stateRead.isSystem() || stateRead.getPkg() == null) { + return; + } + if (stateRead.getPkg().isCoreApp() && !calledFromSystemOrPhone) { + throw new SecurityException("Only system or phone callers can modify core apps"); + } - private SigningDetails getSigningDetails(int uid) { - return mComputer.getSigningDetails(uid); + commitPackageStateMutation(null, mutator -> { + mutator.forPackage(packageName) + .setHiddenUntilInstalled(hidden); + mutator.forDisabledSystemPackage(packageName) + .setHiddenUntilInstalled(hidden); + }); } - private boolean filterAppAccess(AndroidPackage pkg, int callingUid, int userId) { - return mComputer.filterAppAccess(pkg, callingUid, userId); - } + boolean setSystemAppInstallState(@NonNull Computer snapshot, String packageName, + boolean installed, int userId) { + final int callingUid = Binder.getCallingUid(); + final boolean calledFromSystemOrPhone = callingUid == Process.PHONE_UID + || callingUid == Process.SYSTEM_UID; + if (!calledFromSystemOrPhone) { + mContext.enforceCallingOrSelfPermission(Manifest.permission.SUSPEND_APPS, + "setSystemAppHiddenUntilInstalled"); + } - private boolean filterAppAccess(String packageName, int callingUid, int userId) { - return mComputer.filterAppAccess(packageName, callingUid, userId); - } + final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); + // The target app should always be in system + if (packageState == null || !packageState.isSystem() || packageState.getPkg() == null) { + return false; + } + if (packageState.getPkg().isCoreApp() && !calledFromSystemOrPhone) { + throw new SecurityException("Only system or phone callers can modify core apps"); + } + // Check if the install state is the same + if (packageState.getUserStateOrDefault(userId).isInstalled() == installed) { + return false; + } - private boolean filterAppAccess(int uid, int callingUid) { - return mComputer.filterAppAccess(uid, callingUid); - } + final long callingId = Binder.clearCallingIdentity(); + try { + if (installed) { + // install the app from uninstalled state + mInstallPackageHelper.installExistingPackageAsUser( + packageName, + userId, + PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS, + PackageManager.INSTALL_REASON_DEVICE_SETUP, + null, + null); + return true; + } - @Nullable - private int[] getVisibilityAllowList(@NonNull String packageName, @UserIdInt int userId) { - return mComputer.getVisibilityAllowList(packageName, userId); + // uninstall the app from installed state + deletePackageVersioned( + new VersionedPackage(packageName, PackageManager.VERSION_CODE_HIGHEST), + new PackageManager.LegacyPackageDeleteObserver(null).getBinder(), + userId, + PackageManager.DELETE_SYSTEM_APP); + return true; + } finally { + Binder.restoreCallingIdentity(callingId); + } } - boolean canQueryPackage(int callingUid, @Nullable String targetPackageName) { - return mComputer.canQueryPackage(callingUid, targetPackageName); + void finishPackageInstall(int token, boolean didLaunch) { + PackageManagerServiceUtils.enforceSystemOrRoot( + "Only the system is allowed to finish installs"); + + if (PackageManagerService.DEBUG_INSTALL) { + Slog.v(PackageManagerService.TAG, "BM finishing package install for " + token); + } + Trace.asyncTraceEnd(TRACE_TAG_PACKAGE_MANAGER, "restore", token); + + final Message msg = mHandler.obtainMessage(PackageManagerService.POST_INSTALL, token, + didLaunch ? 1 : 0); + mHandler.sendMessage(msg); } void checkPackageStartable(@NonNull Computer snapshot, @NonNull String packageName, @@ -4689,71 +4485,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - public class IPackageManagerImpl extends IPackageManager.Stub { - - @Override - public boolean activitySupportsIntent(ComponentName component, Intent intent, - String resolvedType) { - return mComputer.activitySupportsIntent(mResolveComponentName, component, intent, - resolvedType); - } - - @Override - public void addCrossProfileIntentFilter(IntentFilter intentFilter, String ownerPackage, - int sourceUserId, int targetUserId, int flags) { - PackageManagerService.this.addCrossProfileIntentFilter( - new WatchedIntentFilter(intentFilter), ownerPackage, sourceUserId, targetUserId, - flags); - } - - // NOTE: Can't remove due to unsupported app usage - @Override - public boolean addPermission(PermissionInfo info) { - // Because this is accessed via the package manager service AIDL, - // go through the permission manager service AIDL - return mContext.getSystemService(PermissionManager.class).addPermission(info, false); - } - - // NOTE: Can't remove due to unsupported app usage - @Override - public boolean addPermissionAsync(PermissionInfo info) { - // Because this is accessed via the package manager service AIDL, - // go through the permission manager service AIDL - return mContext.getSystemService(PermissionManager.class).addPermission(info, true); - } - - @Override - public void addPersistentPreferredActivity(IntentFilter filter, ComponentName activity, - int userId) { - mPreferredActivityHelper.addPersistentPreferredActivity(new WatchedIntentFilter(filter), - activity, userId); - } - - @Override - public void addPreferredActivity(IntentFilter filter, int match, - ComponentName[] set, ComponentName activity, int userId, boolean removeExisting) { - mPreferredActivityHelper.addPreferredActivity(new WatchedIntentFilter(filter), match, - set, activity, true, userId, "Adding preferred", removeExisting); - } - - /* - * Returns if intent can be forwarded from the sourceUserId to the targetUserId - */ - @Override - public boolean canForwardTo(@NonNull Intent intent, @Nullable String resolvedType, - @UserIdInt int sourceUserId, @UserIdInt int targetUserId) { - return mComputer.canForwardTo(intent, resolvedType, sourceUserId, targetUserId); - } - - @Override - public boolean canRequestPackageInstalls(String packageName, int userId) { - return mComputer.canRequestPackageInstalls(packageName, Binder.getCallingUid(), userId, - true /* throwIfPermNotDeclared*/); - } + public class IPackageManagerImpl extends IPackageManagerBase { - @Override - public String[] canonicalToCurrentPackageNames(String[] names) { - return mComputer.canonicalToCurrentPackageNames(names); + public IPackageManagerImpl() { + super(PackageManagerService.this, mContext, mDexOptHelper, mModuleInfoProvider, + mPreferredActivityHelper, mResolveIntentHelper, mDomainVerificationManager, + mDomainVerificationConnection, mInstallerService, mPackageProperty, + mResolveComponentName, mInstantAppResolverSettingsComponent, + mRequiredSdkSandboxPackage, mServicesExtensionPackageName, + mSharedSystemSharedLibraryPackageName); } @Override @@ -4762,33 +4502,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService .checkPackageStartable(snapshotComputer(), packageName, userId); } - // NOTE: Can't remove due to unsupported app usage - @Override - public int checkPermission(String permName, String pkgName, int userId) { - return PackageManagerService.this.checkPermission(permName, pkgName, userId); - } - - @Override - public int checkSignatures(@NonNull String pkg1, @NonNull String pkg2) { - return mComputer.checkSignatures(pkg1, pkg2); - } - - @Override - public int checkUidPermission(String permName, int uid) { - return mComputer.checkUidPermission(permName, uid); - } - - @Override - public int checkUidSignatures(int uid1, int uid2) { - return mComputer.checkUidSignatures(uid1, uid2); - } - @Override public void clearApplicationProfileData(String packageName) { PackageManagerServiceUtils.enforceSystemOrRoot( "Only the system can clear all profile data"); - final AndroidPackage pkg = getPackage(packageName); + final Computer snapshot = snapshotComputer(); + final AndroidPackage pkg = snapshot.getPackage(packageName); try (PackageFreezer ignored = freezePackage(packageName, "clearApplicationProfileData")) { synchronized (mInstallLock) { mAppDataHelper.clearAppProfilesLIF(pkg); @@ -4803,10 +4523,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService android.Manifest.permission.CLEAR_APP_USER_DATA, null); final int callingUid = Binder.getCallingUid(); - enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */, + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */, false /* checkShell */, "clear application data"); - if (mComputer.getPackageStateFiltered(packageName, callingUid, userId) == null) { + if (snapshot.getPackageStateFiltered(packageName, callingUid, userId) == null) { if (observer != null) { mHandler.post(() -> { try { @@ -4831,7 +4552,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService try (PackageFreezer freezer = freezePackage(packageName, "clearApplicationUserData")) { synchronized (mInstallLock) { - succeeded = clearApplicationUserDataLIF(packageName, userId); + succeeded = clearApplicationUserDataLIF(snapshotComputer(), packageName, + userId); } mInstantAppRegistry.deleteInstantApplicationMetadata(packageName, userId); synchronized (mLock) { @@ -4849,8 +4571,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService } if (checkPermission(Manifest.permission.SUSPEND_APPS, packageName, userId) == PERMISSION_GRANTED) { - unsuspendForSuspendingPackage(snapshotComputer(), packageName, userId); - removeAllDistractingPackageRestrictions(userId); + final Computer snapshot = snapshotComputer(); + unsuspendForSuspendingPackage(snapshot, packageName, userId); + removeAllDistractingPackageRestrictions(snapshot, userId); flushPackageRestrictionsAsUserInternalLocked(userId); } } @@ -4870,7 +4593,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService mContext.enforceCallingOrSelfPermission( android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, null); final int callingUid = Binder.getCallingUid(); - enforceOwnerRights(ownerPackage, callingUid); + final Computer snapshot = snapshotComputer(); + enforceOwnerRights(snapshot, ownerPackage, callingUid); PackageManagerServiceUtils.enforceShellRestriction(mInjector.getUserManagerInternal(), UserManager.DISALLOW_DEBUGGING_FEATURES, callingUid, sourceUserId); synchronized (mLock) { @@ -4888,22 +4612,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void clearPackagePersistentPreferredActivities(String packageName, int userId) { - mPreferredActivityHelper.clearPackagePersistentPreferredActivities(packageName, userId); - } - - @Override - public void clearPackagePreferredActivities(String packageName) { - mPreferredActivityHelper.clearPackagePreferredActivities(packageName); - } - - @Override - public String[] currentToCanonicalPackageNames(String[] names) { - return mComputer.currentToCanonicalPackageNames(names); - } - - @Override - public void deleteApplicationCacheFiles(final String packageName, + public final void deleteApplicationCacheFiles(final String packageName, final IPackageDataObserver observer) { final int userId = UserHandle.getCallingUserId(); deleteApplicationCacheFilesAsUser(packageName, userId, observer); @@ -4928,17 +4637,18 @@ public class PackageManagerService implements PackageSender, TestUtilityService mContext.enforceCallingOrSelfPermission( android.Manifest.permission.INTERNAL_DELETE_CACHE_FILES, null); } - enforceCrossUserPermission(callingUid, userId, /* requireFullPermission= */ true, + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, userId, /* requireFullPermission= */ true, /* checkShell= */ false, "delete application cache files"); final int hasAccessInstantApps = mContext.checkCallingOrSelfPermission( android.Manifest.permission.ACCESS_INSTANT_APPS); - final AndroidPackage pkg = getPackage(packageName); - // Queue up an async operation since the package deletion may take a little while. mHandler.post(() -> { - final PackageStateInternal ps = - pkg == null ? null : getPackageStateInternal(pkg.getPackageName()); + // Snapshot in the Handler Runnable since this may be deferred quite a bit + // TODO: Is this and the later mInstallLock re-snapshot necessary? + final Computer newSnapshot = snapshotComputer(); + final PackageStateInternal ps = newSnapshot.getPackageStateInternal(packageName); boolean doClearData = true; if (ps != null) { final boolean targetIsInstantApp = @@ -4949,6 +4659,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService if (doClearData) { synchronized (mInstallLock) { final int flags = FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL; + // Snapshot again after mInstallLock? + final AndroidPackage pkg = snapshotComputer().getPackage(packageName); // We're only clearing cache files, so we don't care if the // app is unfrozen and still able to run mAppDataHelper.clearAppDataLIF(pkg, userId, @@ -4968,47 +4680,18 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void deleteExistingPackageAsUser(VersionedPackage versionedPackage, - final IPackageDeleteObserver2 observer, final int userId) { - PackageManagerService.this.deleteExistingPackageAsUser(versionedPackage, observer, - userId); - } - - @Override - public void deletePackageAsUser(String packageName, int versionCode, - IPackageDeleteObserver observer, int userId, int flags) { - deletePackageVersioned(new VersionedPackage(packageName, versionCode), - new PackageManager.LegacyPackageDeleteObserver(observer).getBinder(), userId, flags); - } - - @Override - public void deletePackageVersioned(VersionedPackage versionedPackage, - final IPackageDeleteObserver2 observer, final int userId, final int deleteFlags) { - PackageManagerService.this.deletePackageVersioned(versionedPackage, observer, - userId, deleteFlags); - } - - @Override - public void deletePreloadsFileCache() { - mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CLEAR_APP_CACHE, - "deletePreloadsFileCache"); - File dir = Environment.getDataPreloadsFileCacheDirectory(); - Slog.i(PackageManagerService.TAG, "Deleting preloaded file cache " + dir); - FileUtils.deleteContents(dir); - } - - @Override public void dumpProfiles(String packageName) { /* Only the shell, root, or the app user should be able to dump profiles. */ final int callingUid = Binder.getCallingUid(); - final String[] callerPackageNames = getPackagesForUid(callingUid); + final Computer snapshot = snapshotComputer(); + final String[] callerPackageNames = snapshot.getPackagesForUid(callingUid); if (callingUid != Process.SHELL_UID && callingUid != Process.ROOT_UID && !ArrayUtils.contains(callerPackageNames, packageName)) { throw new SecurityException("dumpProfiles"); } - AndroidPackage pkg = mComputer.getPackage(packageName); + AndroidPackage pkg = snapshot.getPackage(packageName); if (pkg == null) { throw new IllegalArgumentException("Unknown package: " + packageName); } @@ -5062,46 +4745,25 @@ public class PackageManagerService implements PackageSender, TestUtilityService }); } - @Override - public ResolveInfo findPersistentPreferredActivity(Intent intent, int userId) { - return mPreferredActivityHelper.findPersistentPreferredActivity(intent, userId); - } - - @Override - public void finishPackageInstall(int token, boolean didLaunch) { - PackageManagerServiceUtils.enforceSystemOrRoot( - "Only the system is allowed to finish installs"); - - if (PackageManagerService.DEBUG_INSTALL) { - Slog.v(PackageManagerService.TAG, "BM finishing package install for " + token); - } - Trace.asyncTraceEnd(TRACE_TAG_PACKAGE_MANAGER, "restore", token); - - final Message msg = mHandler.obtainMessage(PackageManagerService.POST_INSTALL, token, didLaunch ? 1 : 0); - mHandler.sendMessage(msg); - } - @WorkerThread @Override public void flushPackageRestrictionsAsUser(int userId) { - if (getInstantAppPackageName(Binder.getCallingUid()) != null) { + final Computer snapshot = snapshotComputer(); + final int callingUid = Binder.getCallingUid(); + if (snapshot.getInstantAppPackageName(callingUid) != null) { return; } if (!mUserManager.exists(userId)) { return; } - enforceCrossUserPermission(Binder.getCallingUid(), userId, false /* requireFullPermission*/, - false /* checkShell */, "flushPackageRestrictions"); + snapshot.enforceCrossUserPermission(callingUid, userId, + false /* requireFullPermission*/, false /* checkShell */, + "flushPackageRestrictions"); synchronized (mLock) { flushPackageRestrictionsAsUserInternalLocked(userId); } } - @Override - public void forceDexOpt(String packageName) { - mDexOptHelper.forceDexOpt(packageName); - } - @Override public void freeStorage(final String volumeUuid, final long freeStorageSize, @@ -5150,83 +4812,17 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public ActivityInfo getActivityInfo(ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, int userId) { - return mComputer.getActivityInfo(component, flags, userId); - } - - @NonNull - @Override - public ParceledListSlice<IntentFilter> getAllIntentFilters(@NonNull String packageName) { - return mComputer.getAllIntentFilters(packageName); - } - - @Override - public List<String> getAllPackages() { - return mComputer.getAllPackages(); - } - - // NOTE: Can't remove due to unsupported app usage - @NonNull - @Override - public String[] getAppOpPermissionPackages(@NonNull String permissionName) { - return mComputer.getAppOpPermissionPackages(permissionName); - } - - @Override - public String getAppPredictionServicePackageName() { - return ensureSystemPackageName( - getPackageFromComponentString(R.string.config_defaultAppPredictionService)); - } - - @PackageManager.EnabledState - @Override - public int getApplicationEnabledSetting(@NonNull String packageName, @UserIdInt int userId) { - return mComputer.getApplicationEnabledSetting(packageName, userId); - } - - /** - * Returns true if application is not found or there was an error. Otherwise it returns - * the hidden state of the package for the given user. - */ - @Override - public boolean getApplicationHiddenSettingAsUser(@NonNull String packageName, - @UserIdInt int userId) { - return mComputer.getApplicationHiddenSettingAsUser(packageName, userId); - } - - @Override - public ApplicationInfo getApplicationInfo(String packageName, - @PackageManager.ApplicationInfoFlagsBits long flags, int userId) { - return mComputer.getApplicationInfo(packageName, flags, userId); - } - - @Override - public IArtManager getArtManager() { - return mArtManagerService; - } - - @Override - public @Nullable String getAttentionServicePackageName() { - return ensureSystemPackageName( - getPackageFromComponentString(R.string.config_defaultAttentionService)); - } - - @Override - public boolean getBlockUninstallForUser(@NonNull String packageName, @UserIdInt int userId) { - return mComputer.getBlockUninstallForUser(packageName, userId); - } - - @Override public ChangedPackages getChangedPackages(int sequenceNumber, int userId) { final int callingUid = Binder.getCallingUid(); - if (getInstantAppPackageName(callingUid) != null) { + final Computer snapshot = snapshotComputer(); + if (snapshot.getInstantAppPackageName(callingUid) != null) { return null; } if (!mUserManager.exists(userId)) { return null; } - enforceCrossUserPermission(callingUid, userId, false, false, "getChangedPackages"); + snapshot.enforceCrossUserPermission(callingUid, userId, false, false, + "getChangedPackages"); final ChangedPackages changedPackages = mChangedPackagesTracker.getChangedPackages( sequenceNumber, userId); @@ -5234,8 +4830,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService final List<String> packageNames = changedPackages.getPackageNames(); for (int index = packageNames.size() - 1; index >= 0; index--) { // Filter out the changes if the calling package should not be able to see it. - final PackageSetting ps = mSettings.getPackageLPr(packageNames.get(index)); - if (shouldFilterApplication(ps, callingUid, userId)) { + final PackageStateInternal packageState = + snapshot.getPackageStateInternal(packageNames.get(index)); + if (snapshot.shouldFilterApplication(packageState, callingUid, userId)) { packageNames.remove(index); } } @@ -5245,41 +4842,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public int getComponentEnabledSetting(@NonNull ComponentName component, int userId) { - return mComputer.getComponentEnabledSetting(component, Binder.getCallingUid(), userId); - } - - @Override - public String getContentCaptureServicePackageName() { - return ensureSystemPackageName( - getPackageFromComponentString(R.string.config_defaultContentCaptureService)); - } - - @Nullable - @Override - public ParceledListSlice<SharedLibraryInfo> getDeclaredSharedLibraries( - @NonNull String packageName, @PackageManager.PackageInfoFlagsBits long flags, - @NonNull int userId) { - return mComputer.getDeclaredSharedLibraries(packageName, flags, userId); - } - - /** - * Non-Binder method, support for the backup/restore mechanism: write the - * default browser (etc) settings in its canonical XML format. Returns the default - * browser XML representation as a byte array, or null if there is none. - */ - @Override - public byte[] getDefaultAppsBackup(int userId) { - return mPreferredActivityHelper.getDefaultAppsBackup(userId); - } - - @Override - public String getDefaultTextClassifierPackageName() { - return ensureSystemPackageName( - mContext.getString(R.string.config_servicesExtensionPackage)); - } - - @Override public byte[] getDomainVerificationBackup(int userId) { if (Binder.getCallingUid() != Process.SYSTEM_UID) { throw new SecurityException("Only the system may call getDomainVerificationBackup()"); @@ -5301,17 +4863,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public int getFlagsForUid(int uid) { - return mComputer.getFlagsForUid(uid); - } - - @Nullable - @Override - public CharSequence getHarmfulAppWarning(@NonNull String packageName, @UserIdInt int userId) { - return mComputer.getHarmfulAppWarning(packageName, userId); - } - - @Override public IBinder getHoldLockToken() { if (!Build.IS_DEBUGGABLE) { throw new SecurityException("getHoldLockToken requires a debuggable build"); @@ -5327,72 +4878,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public ComponentName getHomeActivities(List<ResolveInfo> allHomeCandidates) { - if (getInstantAppPackageName(Binder.getCallingUid()) != null) { - return null; - } - return getHomeActivitiesAsUser(allHomeCandidates, UserHandle.getCallingUserId()); - } - - public String getIncidentReportApproverPackageName() { - return ensureSystemPackageName(mContext.getString( - R.string.config_incidentReportApproverPackage)); - } - - @Override - public int getInstallLocation() { - // allow instant app access - return android.provider.Settings.Global.getInt(mContext.getContentResolver(), - android.provider.Settings.Global.DEFAULT_INSTALL_LOCATION, - InstallLocationUtils.APP_INSTALL_AUTO); - } - - @PackageManager.InstallReason - @Override - public int getInstallReason(@NonNull String packageName, @UserIdInt int userId) { - return mComputer.getInstallReason(packageName, userId); - } - - @Override - @Nullable - public InstallSourceInfo getInstallSourceInfo(@NonNull String packageName) { - return mComputer.getInstallSourceInfo(packageName); - } - - @Override - public ParceledListSlice<ApplicationInfo> getInstalledApplications( - @PackageManager.ApplicationInfoFlagsBits long flags, int userId) { - final int callingUid = Binder.getCallingUid(); - return new ParceledListSlice<>( - mComputer.getInstalledApplications(flags, userId, callingUid)); - } - - @Override - public List<ModuleInfo> getInstalledModules(int flags) { - return mModuleInfoProvider.getInstalledModules(flags); - } - - @Override - public ParceledListSlice<PackageInfo> getInstalledPackages( - @PackageManager.PackageInfoFlagsBits long flags, int userId) { - return mComputer.getInstalledPackages(flags, userId); - } - - @Nullable - @Override - public String getInstallerPackageName(@NonNull String packageName) { - return mComputer.getInstallerPackageName(packageName); - } - - @Override public String getInstantAppAndroidId(String packageName, int userId) { - mContext.enforceCallingOrSelfPermission(android.Manifest.permission.ACCESS_INSTANT_APPS, - "getInstantAppAndroidId"); - enforceCrossUserPermission(Binder.getCallingUid(), userId, + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.ACCESS_INSTANT_APPS, "getInstantAppAndroidId"); + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(Binder.getCallingUid(), userId, true /* requireFullPermission */, false /* checkShell */, "getInstantAppAndroidId"); // Make sure the target is an Instant App. - if (!isInstantApp(packageName, userId)) { + if (!snapshot.isInstantApp(packageName, userId)) { return null; } return mInstantAppRegistry.getInstantAppAndroidId(packageName, userId); @@ -5404,13 +4898,14 @@ public class PackageManagerService implements PackageSender, TestUtilityService return null; } - enforceCrossUserPermission(Binder.getCallingUid(), userId, + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(Binder.getCallingUid(), userId, true /* requireFullPermission */, false /* checkShell */, "getInstantAppCookie"); - if (!isCallerSameApp(packageName, Binder.getCallingUid())) { + if (!snapshot.isCallerSameApp(packageName, Binder.getCallingUid())) { return null; } - PackageStateInternal packageState = getPackageStateInternal(packageName); + PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); if (packageState == null || packageState.getPkg() == null) { return null; } @@ -5423,11 +4918,12 @@ public class PackageManagerService implements PackageSender, TestUtilityService return null; } - if (!canViewInstantApps(Binder.getCallingUid(), userId)) { + final Computer snapshot = snapshotComputer(); + if (!snapshot.canViewInstantApps(Binder.getCallingUid(), userId)) { mContext.enforceCallingOrSelfPermission(Manifest.permission.ACCESS_INSTANT_APPS, "getInstantAppIcon"); } - enforceCrossUserPermission(Binder.getCallingUid(), userId, + snapshot.enforceCrossUserPermission(Binder.getCallingUid(), userId, true /* requireFullPermission */, false /* checkShell */, "getInstantAppIcon"); @@ -5435,76 +4931,31 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public ComponentName getInstantAppInstallerComponent() { - if (getInstantAppPackageName(Binder.getCallingUid()) != null) { - return null; - } - return mInstantAppInstallerActivity == null - ? null : mInstantAppInstallerActivity.getComponentName(); - } - - @Override - public @Nullable ComponentName getInstantAppResolverComponent() { - if (getInstantAppPackageName(Binder.getCallingUid()) != null) { - return null; - } - return getInstantAppResolver(); - } - - @Override - public ComponentName getInstantAppResolverSettingsComponent() { - return mInstantAppResolverSettingsComponent; - } - - @Override public ParceledListSlice<InstantAppInfo> getInstantApps(int userId) { - if (PackageManagerService.HIDE_EPHEMERAL_APIS) { + if (HIDE_EPHEMERAL_APIS) { return null; } - if (!canViewInstantApps(Binder.getCallingUid(), userId)) { + + final Computer snapshot = snapshotComputer(); + if (!snapshot.canViewInstantApps(Binder.getCallingUid(), userId)) { mContext.enforceCallingOrSelfPermission(Manifest.permission.ACCESS_INSTANT_APPS, "getEphemeralApplications"); } - enforceCrossUserPermission(Binder.getCallingUid(), userId, + snapshot.enforceCrossUserPermission(Binder.getCallingUid(), userId, true /* requireFullPermission */, false /* checkShell */, "getEphemeralApplications"); - Computer computer = snapshotComputer(); - List<InstantAppInfo> instantApps = mInstantAppRegistry.getInstantApps(computer, userId); + List<InstantAppInfo> instantApps = mInstantAppRegistry.getInstantApps(snapshot, userId); if (instantApps != null) { return new ParceledListSlice<>(instantApps); } return null; } - @Nullable - @Override - public InstrumentationInfo getInstrumentationInfo(@NonNull ComponentName component, int flags) { - return mComputer.getInstrumentationInfo(component, flags); - } - - @Deprecated - @Override - public @NonNull ParceledListSlice<IntentFilterVerificationInfo> getIntentFilterVerifications( - String packageName) { - return ParceledListSlice.emptyList(); - } - - @Deprecated - @Override - public int getIntentVerificationStatus(String packageName, int userId) { - return mDomainVerificationManager.getLegacyState(packageName, userId); - } - - @Nullable - @Override - public KeySet getKeySetByAlias(@NonNull String packageName, @NonNull String alias) { - return mComputer.getKeySetByAlias(packageName, alias); - } - @Override public ResolveInfo getLastChosenActivity(Intent intent, String resolvedType, int flags) { - return mPreferredActivityHelper.getLastChosenActivity(intent, resolvedType, flags); + return mPreferredActivityHelper.getLastChosenActivity(snapshotComputer(), intent, + resolvedType, flags); } @Override @@ -5516,13 +4967,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService @Override public List<String> getMimeGroup(String packageName, String mimeGroup) { - enforceOwnerRights(packageName, Binder.getCallingUid()); - return getMimeGroupInternal(packageName, mimeGroup); - } - - @Override - public ModuleInfo getModuleInfo(String packageName, @PackageManager.ModuleInfoFlags int flags) { - return PackageManagerService.this.getModuleInfo(packageName, flags); + final Computer snapshot = snapshotComputer(); + enforceOwnerRights(snapshot, packageName, Binder.getCallingUid()); + return getMimeGroupInternal(snapshot, packageName, mimeGroup); } @Override @@ -5532,99 +4979,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService return mMoveCallbacks.mLastStatus.get(moveId); } - @Nullable - @Override - public String getNameForUid(int uid) { - return mComputer.getNameForUid(uid); - } - - @Nullable - @Override - public String[] getNamesForUids(@NonNull int[] uids) { - return mComputer.getNamesForUids(uids); - } - - @Override - public int[] getPackageGids(String packageName, @PackageManager.PackageInfoFlagsBits long flags, - int userId) { - return mComputer.getPackageGids(packageName, flags, userId); - } - - @Override - public PackageInfo getPackageInfo(String packageName, - @PackageManager.PackageInfoFlagsBits long flags, int userId) { - return mComputer.getPackageInfo(packageName, flags, userId); - } - - @Override - public PackageInfo getPackageInfoVersioned(VersionedPackage versionedPackage, - @PackageManager.PackageInfoFlagsBits long flags, int userId) { - return mComputer.getPackageInfoInternal(versionedPackage.getPackageName(), - versionedPackage.getLongVersionCode(), flags, Binder.getCallingUid(), userId); - } - - @Override - public IPackageInstaller getPackageInstaller() { - // Return installer service for internal calls. - if (PackageManagerServiceUtils.isSystemOrRoot()) { - return mInstallerService; - } - // Return null for InstantApps. - if (snapshotComputer().getInstantAppPackageName(Binder.getCallingUid()) != null) { - return null; - } - return mInstallerService; - } - - @Override - public void getPackageSizeInfo(final String packageName, int userId, - final IPackageStatsObserver observer) { - throw new UnsupportedOperationException( - "Shame on you for calling the hidden API getPackageSizeInfo(). Shame!"); - } - - @Override - public int getPackageUid(@NonNull String packageName, - @PackageManager.PackageInfoFlagsBits long flags, @UserIdInt int userId) { - return mComputer.getPackageUid(packageName, flags, userId); - } - - /** - * <em>IMPORTANT:</em> Not all packages returned by this method may be known - * to the system. There are two conditions in which this may occur: - * <ol> - * <li>The package is on adoptable storage and the device has been removed</li> - * <li>The package is being removed and the internal structures are partially updated</li> - * </ol> - * The second is an artifact of the current data structures and should be fixed. See - * b/111075456 for one such instance. - * This binder API is cached. If the algorithm in this method changes, - * or if the underlying objecs (as returned by getSettingLPr()) change - * then the logic that invalidates the cache must be revisited. See - * calls to invalidateGetPackagesForUidCache() to locate the points at - * which the cache is invalidated. - */ - @Override - public String[] getPackagesForUid(int uid) { - final int callingUid = Binder.getCallingUid(); - final int userId = UserHandle.getUserId(uid); - mComputer.enforceCrossUserOrProfilePermission(callingUid, userId, - /* requireFullPermission */ false, - /* checkShell */ false, "getPackagesForUid"); - return mComputer.getPackagesForUid(uid); - } - - @Override - public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions( - @NonNull String[] permissions, @PackageManager.PackageInfoFlagsBits long flags, - @UserIdInt int userId) { - return mComputer.getPackagesHoldingPermissions(permissions, flags, userId); - } - @Override public String getPermissionControllerPackageName() { final int callingUid = Binder.getCallingUid(); - if (mComputer.getPackageStateFiltered(mRequiredPermissionControllerPackage, + final Computer snapshot = snapshotComputer(); + if (snapshot.getPackageStateFiltered(mRequiredPermissionControllerPackage, callingUid, UserHandle.getUserId(callingUid)) != null) { return mRequiredPermissionControllerPackage; } @@ -5632,73 +4991,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService throw new IllegalStateException("PermissionController is not found"); } - // NOTE: Can't remove due to unsupported app usage - @Override - public PermissionGroupInfo getPermissionGroupInfo(String groupName, int flags) { - return PackageManagerService.this.getPermissionGroupInfo(groupName, flags); - } - - @Override - public @NonNull ParceledListSlice<ApplicationInfo> getPersistentApplications(int flags) { - if (getInstantAppPackageName(Binder.getCallingUid()) != null) { - return ParceledListSlice.emptyList(); - } - return new ParceledListSlice<>(mComputer.getPersistentApplications(mSafeMode, flags)); - } - - @Override - public int getPreferredActivities(List<IntentFilter> outFilters, - List<ComponentName> outActivities, String packageName) { - return mPreferredActivityHelper.getPreferredActivities(outFilters, outActivities, - packageName, snapshotComputer()); - } - - /** - * Non-Binder method, support for the backup/restore mechanism: write the - * full set of preferred activities in its canonical XML format. Returns the - * XML output as a byte array, or null if there is none. - */ - @Override - public byte[] getPreferredActivityBackup(int userId) { - return mPreferredActivityHelper.getPreferredActivityBackup(userId); - } - - @Override - public int getPrivateFlagsForUid(int uid) { - return mComputer.getPrivateFlagsForUid(uid); - } - - @Override - public PackageManager.Property getProperty(String propertyName, String packageName, String className) { - Objects.requireNonNull(propertyName); - Objects.requireNonNull(packageName); - PackageStateInternal packageState = mComputer.getPackageStateFiltered(packageName, - Binder.getCallingUid(), UserHandle.getCallingUserId()); - if (packageState == null) { - return null; - } - return mPackageProperty.getProperty(propertyName, packageName, className); - } - - @Nullable - @Override - public ProviderInfo getProviderInfo(@NonNull ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId) { - return mComputer.getProviderInfo(component, flags, userId); - } - - @Override - public ActivityInfo getReceiverInfo(ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, int userId) { - return mComputer.getReceiverInfo(component, flags, userId); - } - - @Override - public @Nullable String getRotationResolverPackageName() { - return ensureSystemPackageName( - getPackageFromComponentString(R.string.config_defaultRotationResolverService)); - } - @Override public int getRuntimePermissionsVersion(@UserIdInt int userId) { Preconditions.checkArgumentNonnegative(userId); @@ -5707,65 +4999,25 @@ public class PackageManagerService implements PackageSender, TestUtilityService return mSettings.getDefaultRuntimePermissionsVersion(userId); } - @Nullable - @Override - public ServiceInfo getServiceInfo(@NonNull ComponentName component, - @PackageManager.ComponentInfoFlagsBits long flags, @UserIdInt int userId) { - return mComputer.getServiceInfo(component, flags, userId); - } - - @Override - public @NonNull String getServicesSystemSharedLibraryPackageName() { - return mServicesExtensionPackageName; - } - - @Override - public String getSetupWizardPackageName() { - if (Binder.getCallingUid() != Process.SYSTEM_UID) { - throw new SecurityException("Non-system caller"); - } - return mPmInternal.getSetupWizardPackageName(); - } - - @Override - public ParceledListSlice<SharedLibraryInfo> getSharedLibraries(String packageName, - @PackageManager.PackageInfoFlagsBits long flags, int userId) { - return mComputer.getSharedLibraries(packageName, flags, userId); - } - - @Override - public @NonNull String getSharedSystemSharedLibraryPackageName() { - return mSharedSystemSharedLibraryPackageName; - } - - @Nullable - @Override - public KeySet getSigningKeySet(@NonNull String packageName) { - return mComputer.getSigningKeySet(packageName); - } - @Override public String getSplashScreenTheme(@NonNull String packageName, int userId) { - PackageStateInternal packageState = - getPackageStateInstalledFiltered(packageName, Binder.getCallingUid(), userId); + final Computer snapshot = snapshotComputer(); + PackageStateInternal packageState = filterPackageStateForInstalledAndFiltered(snapshot, + packageName, Binder.getCallingUid(), userId); return packageState == null ? null : packageState.getUserStateOrDefault(userId).getSplashScreenTheme(); } @Override - public String getSdkSandboxPackageName() { - return mRequiredSdkSandboxPackage; - } - - @Override public Bundle getSuspendedPackageAppExtras(String packageName, int userId) { final int callingUid = Binder.getCallingUid(); - if (getPackageUid(packageName, 0, userId) != callingUid) { + final Computer snapshot = snapshot(); + if (snapshot.getPackageUid(packageName, 0, userId) != callingUid) { throw new SecurityException("Calling package " + packageName + " does not belong to calling uid " + callingUid); } - return mSuspendPackageHelper.getSuspendedPackageAppExtras( - packageName, userId, callingUid); + return mSuspendPackageHelper + .getSuspendedPackageAppExtras(snapshot, packageName, userId, callingUid); } @Override @@ -5785,34 +5037,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public String getSystemCaptionsServicePackageName() { - return ensureSystemPackageName( - getPackageFromComponentString(R.string.config_defaultSystemCaptionsService)); - } - - @Nullable - @Override - public String[] getSystemSharedLibraryNames() { - return mComputer.getSystemSharedLibraryNames(); - } - - @Override - public String getSystemTextClassifierPackageName() { - return ensureSystemPackageName( - mContext.getString(R.string.config_defaultTextClassifierPackage)); - } - - @Override - public int getTargetSdkVersion(@NonNull String packageName) { - return mComputer.getTargetSdkVersion(packageName); - } - - @Override - public int getUidForSharedUser(@NonNull String sharedUserName) { - return mComputer.getUidForSharedUser(sharedUserName); - } - - @Override public String[] getUnsuspendablePackagesForUser(String[] packageNames, int userId) { Objects.requireNonNull(packageNames, "packageNames cannot be null"); mContext.enforceCallingOrSelfPermission(Manifest.permission.SUSPEND_APPS, @@ -5838,19 +5062,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public String getWellbeingPackageName() { - final long identity = Binder.clearCallingIdentity(); - try { - return CollectionUtils.firstOrNull( - mContext.getSystemService(RoleManager.class).getRoleHolders( - RoleManager.ROLE_SYSTEM_WELLBEING)); - } finally { - Binder.restoreCallingIdentity(identity); - } - } - - @Override - public void grantImplicitAccess(int recipientUid, @NonNull String visibleAuthority) { + public void makeProviderVisible(int recipientUid, @NonNull String visibleAuthority) { final Computer snapshot = snapshotComputer(); final int recipientUserId = UserHandle.getUserId(recipientUid); final ProviderInfo providerInfo = @@ -5864,36 +5076,24 @@ public class PackageManagerService implements PackageSender, TestUtilityService false /*direct*/, false /* retainOnUpdate */); } - // NOTE: Can't remove due to unsupported app usage - @Override - public void grantRuntimePermission(String packageName, String permName, final int userId) { - // Because this is accessed via the package manager service AIDL, - // go through the permission manager service AIDL - mContext.getSystemService(PermissionManager.class) - .grantRuntimePermission(packageName, permName, UserHandle.of(userId)); - } - @Override - public boolean hasSigningCertificate(@NonNull String packageName, @NonNull byte[] certificate, - @PackageManager.CertificateInputType int type) { - return mComputer.hasSigningCertificate(packageName, certificate, type); - } - - @Override - public boolean hasSystemFeature(String name, int version) { - return PackageManagerService.this.hasSystemFeature(name, version); - } - - @Override - public boolean hasSystemUidErrors() { - // allow instant applications - return false; - } + public void makeUidVisible(int recipientUid, int visibleUid) { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.MAKE_UID_VISIBLE, "makeUidVisible"); + final int callingUid = Binder.getCallingUid(); + final int recipientUserId = UserHandle.getUserId(recipientUid); + final int visibleUserId = UserHandle.getUserId(visibleUid); + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, recipientUserId, + false /* requireFullPermission */, false /* checkShell */, "makeUidVisible"); + snapshot.enforceCrossUserPermission(callingUid, visibleUserId, + false /* requireFullPermission */, false /* checkShell */, "makeUidVisible"); + snapshot.enforceCrossUserPermission(recipientUid, visibleUserId, + false /* requireFullPermission */, false /* checkShell */, "makeUidVisible"); - @Override - public boolean hasUidSigningCertificate(int uid, @NonNull byte[] certificate, - @PackageManager.CertificateInputType int type) { - return mComputer.hasUidSigningCertificate(uid, certificate, type); + PackageManagerService.this.grantImplicitAccess(snapshot, recipientUserId, + null /*Intent*/, UserHandle.getAppId(recipientUid), visibleUid, + false /*direct*/, false /* retainOnUpdate */); } @Override @@ -5924,55 +5124,17 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public boolean isDeviceUpgrading() { - return PackageManagerService.this.isDeviceUpgrading(); - } - - @Override - public boolean isFirstBoot() { - return PackageManagerService.this.isFirstBoot(); - } - - @Override - public boolean isInstantApp(String packageName, int userId) { - return mComputer.isInstantApp(packageName, userId); - } - - @Override - public boolean isOnlyCoreApps() { - return PackageManagerService.this.isOnlyCoreApps(); - } - - @Override - public boolean isPackageAvailable(String packageName, int userId) { - return mComputer.isPackageAvailable(packageName, userId); - } - - @Override - public boolean isPackageDeviceAdminOnAnyUser(String packageName) { - return PackageManagerService.this.isPackageDeviceAdminOnAnyUser(packageName); - } - - @Override - public boolean isPackageSignedByKeySet(@NonNull String packageName, @NonNull KeySet ks) { - return mComputer.isPackageSignedByKeySet(packageName, ks); - } - - @Override - public boolean isPackageSignedByKeySetExactly(@NonNull String packageName, @NonNull KeySet ks) { - return mComputer.isPackageSignedByKeySetExactly(packageName, ks); - } - - @Override public boolean isPackageStateProtected(@NonNull String packageName, @UserIdInt int userId) { final int callingUid = Binder.getCallingUid(); final int callingAppId = UserHandle.getAppId(callingUid); - enforceCrossUserPermission(callingUid, userId, false /*requireFullPermission*/, + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, userId, false /*requireFullPermission*/, true /*checkShell*/, "isPackageStateProtected"); if (callingAppId != Process.SYSTEM_UID && callingAppId != Process.ROOT_UID - && checkUidPermission(MANAGE_DEVICE_ADMINS, callingUid) != PERMISSION_GRANTED) { + && snapshot.checkUidPermission(MANAGE_DEVICE_ADMINS, callingUid) + != PERMISSION_GRANTED) { throw new SecurityException("Caller must have the " + MANAGE_DEVICE_ADMINS + " permission."); } @@ -5981,11 +5143,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public boolean isPackageSuspendedForUser(@NonNull String packageName, @UserIdInt int userId) { - return mComputer.isPackageSuspendedForUser(packageName, userId); - } - - @Override public boolean isProtectedBroadcast(String actionName) { if (actionName != null) { // TODO: remove these terrible hacks @@ -6002,22 +5159,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - @Override - public boolean isSafeMode() { - // allow instant applications - return mSafeMode; - } - - @Override - public boolean isStorageLow() { - return PackageManagerService.this.isStorageLow(); - } - - @Override - public boolean isUidPrivileged(int uid) { - return mComputer.isUidPrivileged(uid); - } - /** * Logs process start information (including base APK hash) to the security log. * @hide @@ -6025,13 +5166,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService @Override public void logAppProcessStartIfNeeded(String packageName, String processName, int uid, String seinfo, String apkFile, int pid) { - if (getInstantAppPackageName(Binder.getCallingUid()) != null) { + final Computer snapshot = snapshotComputer(); + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { return; } if (!SecurityLog.isLoggingEnabled()) { return; } - mProcessLoggingHandler.logAppProcessStart(mContext, mPmInternal, apkFile, packageName, + mProcessLoggingHandler.logAppProcessStart(mContext, + LocalServices.getService(PackageManagerInternal.class), apkFile, packageName, processName, uid, seinfo, pid); } @@ -6083,25 +5226,29 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void notifyDexLoad(String loadingPackageName, Map<String, String> classLoaderContextMap, + public void notifyDexLoad(String loadingPackageName, + Map<String, String> classLoaderContextMap, String loaderIsa) { int callingUid = Binder.getCallingUid(); - if (PackageManagerService.PLATFORM_PACKAGE_NAME.equals(loadingPackageName) && callingUid != Process.SYSTEM_UID) { - Slog.w(PackageManagerService.TAG, "Non System Server process reporting dex loads as system server. uid=" - + callingUid); + if (PackageManagerService.PLATFORM_PACKAGE_NAME.equals(loadingPackageName) + && callingUid != Process.SYSTEM_UID) { + Slog.w(PackageManagerService.TAG, + "Non System Server process reporting dex loads as system server. uid=" + + callingUid); // Do not record dex loads from processes pretending to be system server. // Only the system server should be assigned the package "android", so reject calls // that don't satisfy the constraint. // // notifyDexLoad is a PM API callable from the app process. So in theory, apps could - // craft calls to this API and pretend to be system server. Doing so poses no particular - // danger for dex load reporting or later dexopt, however it is a sensible check to do - // in order to verify the expectations. + // craft calls to this API and pretend to be system server. Doing so poses no + // particular danger for dex load reporting or later dexopt, however it is a + // sensible check to do in order to verify the expectations. return; } int userId = UserHandle.getCallingUserId(); - ApplicationInfo ai = getApplicationInfo(loadingPackageName, /*flags*/ 0, userId); + ApplicationInfo ai = snapshot().getApplicationInfo(loadingPackageName, /*flags*/ 0, + userId); if (ai == null) { Slog.w(PackageManagerService.TAG, "Loading a package that does not exist for the calling user. package=" + loadingPackageName + ", user=" + userId); @@ -6115,11 +5262,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService public void notifyPackageUse(String packageName, int reason) { final int callingUid = Binder.getCallingUid(); final int callingUserId = UserHandle.getUserId(callingUid); + Computer snapshot = snapshotComputer(); final boolean notify; - if (getInstantAppPackageName(callingUid) != null) { - notify = isCallerSameApp(packageName, callingUid); + if (snapshot.getInstantAppPackageName(callingUid) != null) { + notify = snapshot.isCallerSameApp(packageName, callingUid); } else { - notify = !isInstantAppInternal(packageName, callingUserId, Process.SYSTEM_UID); + notify = !snapshot.isInstantAppInternal(packageName, callingUserId, + Process.SYSTEM_UID); } if (!notify) { return; @@ -6137,102 +5286,18 @@ public class PackageManagerService implements PackageSender, TestUtilityService updateComponentLabelIcon(componentName, nonLocalizedLabel, icon, userId); } - /** - * Ask the package manager to perform a dex-opt with the given compiler filter. - * - * Note: exposed only for the shell command to allow moving packages explicitly to a - * definite state. - */ - @Override - public boolean performDexOptMode(String packageName, - boolean checkProfiles, String targetCompilerFilter, boolean force, - boolean bootComplete, String splitName) { - return mDexOptHelper.performDexOptMode(packageName, checkProfiles, targetCompilerFilter, - force, bootComplete, splitName); - } - - /** - * Ask the package manager to perform a dex-opt with the given compiler filter on the - * secondary dex files belonging to the given package. - * - * Note: exposed only for the shell command to allow moving packages explicitly to a - * definite state. - */ - @Override - public boolean performDexOptSecondary(String packageName, String compilerFilter, - boolean force) { - return mDexOptHelper.performDexOptSecondary(packageName, compilerFilter, force); - } - - @NonNull - @Override - public ParceledListSlice<ProviderInfo> queryContentProviders(@Nullable String processName, - int uid, @PackageManager.ComponentInfoFlagsBits long flags, - @Nullable String metaDataKey) { - return mComputer.queryContentProviders(processName, uid, flags, metaDataKey); - } - - @NonNull - @Override - public ParceledListSlice<InstrumentationInfo> queryInstrumentation( - @NonNull String targetPackage, int flags) { - return mComputer.queryInstrumentation(targetPackage, flags); - } - - @Override - public @NonNull ParceledListSlice<ResolveInfo> queryIntentActivities(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { - try { - Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "queryIntentActivities"); - - return new ParceledListSlice<>(snapshotComputer().queryIntentActivitiesInternal(intent, - resolvedType, flags, userId)); - } finally { - Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); - } - } - - @Override - public @NonNull ParceledListSlice<ResolveInfo> queryIntentActivityOptions(ComponentName caller, - Intent[] specifics, String[] specificTypes, Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { - return new ParceledListSlice<>(mResolveIntentHelper.queryIntentActivityOptionsInternal( - snapshotComputer(), caller, specifics, specificTypes, intent, resolvedType, flags, - userId)); - } - - @Override - public @NonNull ParceledListSlice<ResolveInfo> queryIntentContentProviders(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { - return new ParceledListSlice<>(mResolveIntentHelper.queryIntentContentProvidersInternal( - snapshotComputer(), intent, resolvedType, flags, userId)); - } - - @Override - public @NonNull ParceledListSlice<ResolveInfo> queryIntentReceivers(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { - return new ParceledListSlice<>(mResolveIntentHelper.queryIntentReceiversInternal( - snapshotComputer(), intent, resolvedType, flags, userId, Binder.getCallingUid())); - } - - @Override - public @NonNull ParceledListSlice<ResolveInfo> queryIntentServices(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, int userId) { - final int callingUid = Binder.getCallingUid(); - return new ParceledListSlice<>(snapshotComputer().queryIntentServicesInternal( - intent, resolvedType, flags, userId, callingUid, false /*includeInstantApps*/)); - } - @Override public ParceledListSlice<PackageManager.Property> queryProperty( String propertyName, @PackageManager.PropertyLocation int componentType) { Objects.requireNonNull(propertyName); final int callingUid = Binder.getCallingUid(); final int callingUserId = UserHandle.getCallingUserId(); + final Computer snapshot = snapshotComputer(); final List<PackageManager.Property> result = mPackageProperty.queryProperty(propertyName, componentType, packageName -> { - final PackageStateInternal ps = getPackageStateInternal(packageName); - return shouldFilterApplication(ps, callingUid, callingUserId); + final PackageStateInternal ps = + snapshot.getPackageStateInternal(packageName); + return snapshot.shouldFilterApplication(ps, callingUid, callingUserId); }); if (result == null) { return ParceledListSlice.emptyList(); @@ -6240,11 +5305,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService return new ParceledListSlice<>(result); } - @Deprecated - public void querySyncProviders(List<String> outNames, List<ProviderInfo> outInfo) { - mComputer.querySyncProviders(mSafeMode, outNames, outInfo); - } - /** * Reconcile the information we have about the secondary dex files belonging to * {@code packageName} and the actual dex files. For all dex files that were @@ -6252,9 +5312,10 @@ public class PackageManagerService implements PackageSender, TestUtilityService */ @Override public void reconcileSecondaryDexFiles(String packageName) { - if (getInstantAppPackageName(Binder.getCallingUid()) != null) { + final Computer snapshot = snapshotComputer(); + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { return; - } else if (isInstantAppInternal( + } else if (snapshot.isInstantAppInternal( packageName, UserHandle.getCallingUserId(), Process.SYSTEM_UID)) { return; } @@ -6262,14 +5323,16 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void registerDexModule(String packageName, String dexModulePath, boolean isSharedModule, + public void registerDexModule(String packageName, String dexModulePath, + boolean isSharedModule, IDexModuleRegisterCallback callback) { int userId = UserHandle.getCallingUserId(); - ApplicationInfo ai = getApplicationInfo(packageName, /*flags*/ 0, userId); + ApplicationInfo ai = snapshot().getApplicationInfo(packageName, /*flags*/ 0, userId); DexManager.RegisterDexModuleResult result; if (ai == null) { - Slog.w(PackageManagerService.TAG, "Registering a dex module for a package that does not exist for the" + - " calling user. package=" + packageName + ", user=" + userId); + Slog.w(PackageManagerService.TAG, + "Registering a dex module for a package that does not exist for the" + + " calling user. package=" + packageName + ", user=" + userId); result = new DexManager.RegisterDexModuleResult(false, "Package not installed"); } else { result = mDexManager.registerDexModule(ai, dexModulePath, isSharedModule, userId); @@ -6278,9 +5341,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService if (callback != null) { mHandler.post(() -> { try { - callback.onDexModuleRegistered(dexModulePath, result.success, result.message); + callback.onDexModuleRegistered(dexModulePath, result.success, + result.message); } catch (RemoteException e) { - Slog.w(PackageManagerService.TAG, "Failed to callback after module registration " + dexModulePath, e); + Slog.w(PackageManagerService.TAG, + "Failed to callback after module registration " + dexModulePath, e); } }); } @@ -6293,52 +5358,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService mMoveCallbacks.register(callback); } - // NOTE: Can't remove due to unsupported app usage - @Override - public void removePermission(String permName) { - // Because this is accessed via the package manager service AIDL, - // go through the permission manager service AIDL - mContext.getSystemService(PermissionManager.class).removePermission(permName); - } - - @Override - public void replacePreferredActivity(IntentFilter filter, int match, - ComponentName[] set, ComponentName activity, int userId) { - mPreferredActivityHelper.replacePreferredActivity(new WatchedIntentFilter(filter), - match, set, activity, userId); - } - - @Override - public void resetApplicationPreferences(int userId) { - mPreferredActivityHelper.resetApplicationPreferences(userId); - } - - @Override - public ProviderInfo resolveContentProvider(String name, - @PackageManager.ResolveInfoFlagsBits long flags, int userId) { - return mComputer.resolveContentProvider(name, flags, userId, Binder.getCallingUid()); - } - - @Override - public ResolveInfo resolveIntent(Intent intent, String resolvedType, - @PackageManager.ResolveInfoFlagsBits long flags, int userId) { - return mResolveIntentHelper.resolveIntentInternal(snapshotComputer(), intent, resolvedType, - flags, 0 /*privateResolveFlags*/, userId, false, Binder.getCallingUid()); - } - - @Override - public ResolveInfo resolveService(Intent intent, String resolvedType, - @PackageManager.ResolveInfoFlagsBits long flags, int userId) { - final int callingUid = Binder.getCallingUid(); - return mResolveIntentHelper.resolveServiceInternal(snapshotComputer(), intent, resolvedType, - flags, userId, callingUid); - } - - @Override - public void restoreDefaultApps(byte[] backup, int userId) { - mPreferredActivityHelper.restoreDefaultApps(backup, userId); - } - @Override public void restoreDomainVerification(byte[] backup, int userId) { if (Binder.getCallingUid() != Process.SYSTEM_UID) { @@ -6366,11 +5385,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void restorePreferredActivities(byte[] backup, int userId) { - mPreferredActivityHelper.restorePreferredActivities(backup, userId); - } - - @Override public void sendDeviceCustomizationReadyBroadcast() { mContext.enforceCallingPermission(Manifest.permission.SEND_DEVICE_CUSTOMIZATION_READY, "sendDeviceCustomizationReadyBroadcast"); @@ -6386,16 +5400,17 @@ public class PackageManagerService implements PackageSender, TestUtilityService @Override public void setApplicationCategoryHint(String packageName, int categoryHint, String callerPackageName) { - if (getInstantAppPackageName(Binder.getCallingUid()) != null) { - throw new SecurityException("Instant applications don't have access to this method"); - } - mInjector.getSystemService(AppOpsManager.class).checkPackage(Binder.getCallingUid(), - callerPackageName); - final PackageStateMutator.InitialState initialState = recordInitialState(); final FunctionalUtils.ThrowingFunction<Computer, PackageStateMutator.Result> implementation = computer -> { + if (computer.getInstantAppPackageName(Binder.getCallingUid()) != null) { + throw new SecurityException( + "Instant applications don't have access to this method"); + } + mInjector.getSystemService(AppOpsManager.class) + .checkPackage(Binder.getCallingUid(), callerPackageName); + PackageStateInternal packageState = computer.getPackageStateFiltered(packageName, Binder.getCallingUid(), UserHandle.getCallingUserId()); if (packageState == null) { @@ -6447,7 +5462,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService int userId) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USERS, null); final int callingUid = Binder.getCallingUid(); - enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */, + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */, true /* checkShell */, "setApplicationHiddenSetting for user " + userId); if (hidden && isPackageDeviceAdmin(packageName, userId)) { @@ -6464,7 +5480,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService final long callingId = Binder.clearCallingIdentity(); try { final PackageStateInternal packageState = - mComputer.getPackageStateFiltered(packageName, callingUid, userId); + snapshot.getPackageStateFiltered(packageName, callingUid, userId); if (packageState == null) { return false; } @@ -6505,13 +5521,16 @@ public class PackageManagerService implements PackageSender, TestUtilityService commitPackageStateMutation(null, packageName, packageState1 -> packageState1.userState(userId).setHidden(hidden)); - final PackageStateInternal newPackageState = getPackageStateInternal(packageName); + final Computer newSnapshot = snapshotComputer(); + final PackageStateInternal newPackageState = + newSnapshot.getPackageStateInternal(packageName); if (hidden) { killApplication(packageName, newPackageState.getAppId(), userId, "hiding pkg"); sendApplicationHiddenForUser(packageName, newPackageState, userId); } else { - sendPackageAddedForUser(packageName, newPackageState, userId, DataLoaderType.NONE); + sendPackageAddedForUser(newSnapshot, packageName, newPackageState, userId, + DataLoaderType.NONE); } scheduleWritePackageRestrictions(userId); @@ -6526,7 +5545,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService int userId) { mContext.enforceCallingOrSelfPermission( Manifest.permission.DELETE_PACKAGES, null); - PackageStateInternal packageState = getPackageStateInternal(packageName); + final Computer snapshot = snapshotComputer(); + PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); if (packageState != null && packageState.getPkg() != null) { AndroidPackage pkg = packageState.getPkg(); // Cannot block uninstall SDK libs as they are controlled by SDK manager. @@ -6584,8 +5604,10 @@ public class PackageManagerService implements PackageSender, TestUtilityService + userId); } Objects.requireNonNull(packageNames, "packageNames cannot be null"); + final Computer snapshot = snapshotComputer(); if (restrictionFlags != 0 - && !mSuspendPackageHelper.isSuspendAllowedForUser(userId, callingUid)) { + && !mSuspendPackageHelper.isSuspendAllowedForUser(snapshot, userId, + callingUid)) { Slog.w(PackageManagerService.TAG, "Cannot restrict packages due to restrictions on user " + userId); return packageNames; } @@ -6595,16 +5617,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService final List<String> unactionedPackages = new ArrayList<>(packageNames.length); ArraySet<String> changesToCommit = new ArraySet<>(); - Computer computer = snapshotComputer(); final boolean[] canRestrict = (restrictionFlags != 0) - ? mSuspendPackageHelper.canSuspendPackageForUser(computer, packageNames, userId, + ? mSuspendPackageHelper.canSuspendPackageForUser(snapshot, packageNames, userId, callingUid) : null; for (int i = 0; i < packageNames.length; i++) { final String packageName = packageNames[i]; final PackageStateInternal packageState = - computer.getPackageStateInternal(packageName); + snapshot.getPackageStateInternal(packageName); if (packageState == null - || computer.shouldFilterApplication(packageState, callingUid, userId)) { + || snapshot.shouldFilterApplication(packageState, callingUid, userId)) { Slog.w(PackageManagerService.TAG, "Could not find package setting for package: " + packageName + ". Skipping..."); unactionedPackages.add(packageName); @@ -6648,11 +5669,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService final int callingUid = Binder.getCallingUid(); final int callingAppId = UserHandle.getAppId(callingUid); - enforceCrossUserPermission(callingUid, userId, true /*requireFullPermission*/, + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, userId, true /*requireFullPermission*/, true /*checkShell*/, "setHarmfulAppInfo"); if (callingAppId != Process.SYSTEM_UID && callingAppId != Process.ROOT_UID && - checkUidPermission(SET_HARMFUL_APP_WARNINGS, callingUid) != PERMISSION_GRANTED) { + snapshot.checkUidPermission(SET_HARMFUL_APP_WARNINGS, callingUid) + != PERMISSION_GRANTED) { throw new SecurityException("Caller must have the " + SET_HARMFUL_APP_WARNINGS + " permission."); } @@ -6667,11 +5690,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void setHomeActivity(ComponentName comp, int userId) { - mPreferredActivityHelper.setHomeActivity(comp, userId); - } - - @Override public boolean setInstallLocation(int loc) { mContext.enforceCallingOrSelfPermission(Manifest.permission.WRITE_SECURE_SETTINGS, null); @@ -6693,24 +5711,24 @@ public class PackageManagerService implements PackageSender, TestUtilityService final int callingUid = Binder.getCallingUid(); final int callingUserId = UserHandle.getUserId(callingUid); final FunctionalUtils.ThrowingCheckedFunction<Computer, Boolean, RuntimeException> - implementation = computer -> { - if (computer.getInstantAppPackageName(callingUid) != null) { + implementation = snapshot -> { + if (snapshot.getInstantAppPackageName(callingUid) != null) { return false; } PackageStateInternal targetPackageState = - computer.getPackageStateInternal(targetPackage); + snapshot.getPackageStateInternal(targetPackage); if (targetPackageState == null - || computer.shouldFilterApplication(targetPackageState, callingUid, + || snapshot.shouldFilterApplication(targetPackageState, callingUid, callingUserId)) { throw new IllegalArgumentException("Unknown target package: " + targetPackage); } PackageStateInternal installerPackageState = null; if (installerPackageName != null) { - installerPackageState = computer.getPackageStateInternal(installerPackageName); + installerPackageState = snapshot.getPackageStateInternal(installerPackageName); if (installerPackageState == null - || shouldFilterApplication( + || snapshot.shouldFilterApplication( installerPackageState, callingUid, callingUserId)) { throw new IllegalArgumentException("Unknown installer package: " + installerPackageName); @@ -6720,7 +5738,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService Signature[] callerSignature; final int appId = UserHandle.getAppId(callingUid); Pair<PackageStateInternal, SharedUserApi> either = - computer.getPackageOrSharedUser(appId); + snapshot.getPackageOrSharedUser(appId); if (either != null) { if (either.first != null) { callerSignature = either.first.getSigningDetails().getSignatures(); @@ -6748,7 +5766,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService String targetInstallerPackageName = targetPackageState.getInstallSource().installerPackageName; PackageStateInternal targetInstallerPkgSetting = targetInstallerPackageName == null - ? null : computer.getPackageStateInternal(targetInstallerPackageName); + ? null : snapshot.getPackageStateInternal(targetInstallerPackageName); if (targetInstallerPkgSetting != null) { if (compareSignatures(callerSignature, @@ -6804,7 +5822,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } } - targetPackageState = getPackageStateInternal(targetPackage); + targetPackageState = snapshotComputer().getPackageStateInternal(targetPackage); mSettings.addInstallerPackageNames(targetPackageState.getInstallSource()); } mAppsFilter.addPackage(targetPackageState); @@ -6818,14 +5836,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService return true; } - enforceCrossUserPermission(Binder.getCallingUid(), userId, + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(Binder.getCallingUid(), userId, true /* requireFullPermission */, true /* checkShell */, "setInstantAppCookie"); - if (!isCallerSameApp(packageName, Binder.getCallingUid())) { + if (!snapshot.isCallerSameApp(packageName, Binder.getCallingUid())) { return false; } - PackageStateInternal packageState = getPackageStateInternal(packageName); + PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); if (packageState == null || packageState.getPkg() == null) { return false; } @@ -6840,21 +5859,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService "setKeepUninstalledPackages requires KEEP_UNINSTALLED_PACKAGES permission"); Objects.requireNonNull(packageList); - setKeepUninstalledPackagesInternal(packageList); - } - - @Override - public void setLastChosenActivity(Intent intent, String resolvedType, int flags, - IntentFilter filter, int match, ComponentName activity) { - mPreferredActivityHelper.setLastChosenActivity(intent, resolvedType, flags, - new WatchedIntentFilter(filter), match, activity); + setKeepUninstalledPackagesInternal(snapshot(), packageList); } @Override public void setMimeGroup(String packageName, String mimeGroup, List<String> mimeTypes) { - enforceOwnerRights(packageName, Binder.getCallingUid()); + final Computer snapshot = snapshotComputer(); + enforceOwnerRights(snapshot, packageName, Binder.getCallingUid()); mimeTypes = CollectionUtils.emptyIfNull(mimeTypes); - final PackageStateInternal packageState = getPackageStateInternal(packageName); + final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); Set<String> existingMimeTypes = packageState.getMimeGroups().get(mimeGroup); if (existingMimeTypes == null) { throw new IllegalArgumentException("Unknown MIME group " + mimeGroup @@ -6889,11 +5902,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService PersistableBundle appExtras, PersistableBundle launcherExtras, SuspendDialogInfo dialogInfo, String callingPackage, int userId) { final int callingUid = Binder.getCallingUid(); - enforceCanSetPackagesSuspendedAsUser(callingPackage, callingUid, userId, + final Computer snapshot = snapshotComputer(); + enforceCanSetPackagesSuspendedAsUser(snapshot, callingPackage, callingUid, userId, "setPackagesSuspendedAsUser"); - return mSuspendPackageHelper.setPackagesSuspended(snapshotComputer(), packageNames, - suspended, appExtras, launcherExtras, dialogInfo, callingPackage, userId, - callingUid); + return mSuspendPackageHelper.setPackagesSuspended(snapshot, packageNames, suspended, + appExtras, launcherExtras, dialogInfo, callingPackage, userId, callingUid); } @Override @@ -6924,12 +5937,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService public void setSplashScreenTheme(@NonNull String packageName, @Nullable String themeId, int userId) { final int callingUid = Binder.getCallingUid(); - enforceCrossUserPermission(callingUid, userId, false /* requireFullPermission */, + final Computer snapshot = snapshotComputer(); + snapshot.enforceCrossUserPermission(callingUid, userId, false /* requireFullPermission */, false /* checkShell */, "setSplashScreenTheme"); - enforceOwnerRights(packageName, callingUid); + enforceOwnerRights(snapshot, packageName, callingUid); - PackageStateInternal packageState = getPackageStateInstalledFiltered(packageName, - callingUid, userId); + PackageStateInternal packageState = filterPackageStateForInstalledAndFiltered(snapshot, + packageName, callingUid, userId); if (packageState == null) { return; } @@ -6939,80 +5953,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void setSystemAppHiddenUntilInstalled(String packageName, boolean hidden) { - final int callingUid = Binder.getCallingUid(); - final boolean calledFromSystemOrPhone = callingUid == Process.PHONE_UID - || callingUid == Process.SYSTEM_UID; - if (!calledFromSystemOrPhone) { - mContext.enforceCallingOrSelfPermission(Manifest.permission.SUSPEND_APPS, - "setSystemAppHiddenUntilInstalled"); - } - - final PackageStateInternal stateRead = getPackageStateInternal(packageName); - if (stateRead == null || !stateRead.isSystem() || stateRead.getPkg() == null) { - return; - } - if (stateRead.getPkg().isCoreApp() && !calledFromSystemOrPhone) { - throw new SecurityException("Only system or phone callers can modify core apps"); - } - - commitPackageStateMutation(null, mutator -> { - mutator.forPackage(packageName) - .setHiddenUntilInstalled(hidden); - mutator.forDisabledSystemPackage(packageName) - .setHiddenUntilInstalled(hidden); - }); - } - - @Override - public boolean setSystemAppInstallState(String packageName, boolean installed, int userId) { - final int callingUid = Binder.getCallingUid(); - final boolean calledFromSystemOrPhone = callingUid == Process.PHONE_UID - || callingUid == Process.SYSTEM_UID; - if (!calledFromSystemOrPhone) { - mContext.enforceCallingOrSelfPermission(Manifest.permission.SUSPEND_APPS, - "setSystemAppHiddenUntilInstalled"); - } - - final PackageStateInternal packageState = getPackageStateInternal(packageName); - // The target app should always be in system - if (packageState == null || !packageState.isSystem() || packageState.getPkg() == null) { - return false; - } - if (packageState.getPkg().isCoreApp() && !calledFromSystemOrPhone) { - throw new SecurityException("Only system or phone callers can modify core apps"); - } - // Check if the install state is the same - if (packageState.getUserStateOrDefault(userId).isInstalled() == installed) { - return false; - } - - final long callingId = Binder.clearCallingIdentity(); - try { - if (installed) { - // install the app from uninstalled state - installExistingPackageAsUser( - packageName, - userId, - PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS, - PackageManager.INSTALL_REASON_DEVICE_SETUP, - null); - return true; - } - - // uninstall the app from installed state - deletePackageVersioned( - new VersionedPackage(packageName, PackageManager.VERSION_CODE_HIGHEST), - new PackageManager.LegacyPackageDeleteObserver(null).getBinder(), - userId, - PackageManager.DELETE_SYSTEM_APP); - return true; - } finally { - Binder.restoreCallingIdentity(callingId); - } - } - - @Override public void setUpdateAvailable(String packageName, boolean updateAvailable) { mContext.enforceCallingOrSelfPermission(Manifest.permission.INSTALL_PACKAGES, null); commitPackageStateMutation(null, packageName, state -> @@ -7026,19 +5966,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService mMoveCallbacks.unregister(callback); } - @Deprecated - @Override - public boolean updateIntentVerificationStatus(String packageName, int status, int userId) { - return mDomainVerificationManager.setLegacyUserState(packageName, userId, status); - } - - @Deprecated - @Override - public void verifyIntentFilter(int id, int verificationCode, List<String> failedDomains) { - DomainVerificationProxyV1.queueLegacyVerifyResult(mContext, mDomainVerificationConnection, - id, verificationCode, failedDomains, Binder.getCallingUid()); - } - @Override public void verifyPendingInstall(int id, int verificationCode) throws RemoteException { mContext.enforceCallingOrSelfPermission( @@ -7059,9 +5986,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService @Checksum.TypeMask int optional, @Checksum.TypeMask int required, @Nullable List trustedInstallers, @NonNull IOnChecksumsReadyListener onChecksumsReadyListener, int userId) { - requestChecksumsInternal(packageName, includeSplits, optional, required, trustedInstallers, - onChecksumsReadyListener, userId, mInjector.getBackgroundExecutor(), - mInjector.getBackgroundHandler()); + requestChecksumsInternal(snapshotComputer(), packageName, includeSplits, optional, + required, trustedInstallers, onChecksumsReadyListener, userId, + mInjector.getBackgroundExecutor(), mInjector.getBackgroundHandler()); } @Override @@ -7074,12 +6001,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public boolean canPackageQuery(@NonNull String sourcePackageName, - @NonNull String targetPackageName, @UserIdInt int userId) { - return mComputer.canPackageQuery(sourcePackageName, targetPackageName, userId); - } - - @Override public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { try { @@ -7097,8 +6018,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err, String[] args, ShellCallback callback, ResultReceiver resultReceiver) { - (new PackageManagerShellCommand(mIPackageManager, - mContext,mDomainVerificationManager.getShell())) + (new PackageManagerShellCommand(this, mContext, + mDomainVerificationManager.getShell())) .exec(this, in, out, err, args, callback, resultReceiver); } @@ -7113,143 +6034,126 @@ public class PackageManagerService implements PackageSender, TestUtilityService private class PackageManagerLocalImpl implements PackageManagerLocal { } - private class PackageManagerInternalImpl extends PackageManagerInternal { - @Override - public List<ApplicationInfo> getInstalledApplications( - @PackageManager.ApplicationInfoFlagsBits long flags, int userId, int callingUid) { - return PackageManagerService.this.mComputer.getInstalledApplications(flags, userId, - callingUid); - } - - @Override - public boolean isPlatformSigned(String packageName) { - PackageStateInternal packageState = getPackageStateInternal(packageName); - if (packageState == null) { - return false; - } - SigningDetails signingDetails = packageState.getSigningDetails(); - return signingDetails.hasAncestorOrSelf(mPlatformPackage.getSigningDetails()) - || mPlatformPackage.getSigningDetails().checkCapability(signingDetails, - SigningDetails.CertCapabilities.PERMISSION); - } + private class PackageManagerInternalImpl extends PackageManagerInternalBase { - @Override - public boolean isDataRestoreSafe(byte[] restoringFromSigHash, String packageName) { - SigningDetails sd = getSigningDetails(packageName); - if (sd == null) { - return false; - } - return sd.hasSha256Certificate(restoringFromSigHash, - SigningDetails.CertCapabilities.INSTALLED_DATA); - } - - @Override - public boolean isDataRestoreSafe(Signature restoringFromSig, String packageName) { - SigningDetails sd = getSigningDetails(packageName); - if (sd == null) { - return false; - } - return sd.hasCertificate(restoringFromSig, - SigningDetails.CertCapabilities.INSTALLED_DATA); + public PackageManagerInternalImpl() { + super(PackageManagerService.this); } + @NonNull @Override - public boolean hasSignatureCapability(int serverUid, int clientUid, - @SigningDetails.CertCapabilities int capability) { - SigningDetails serverSigningDetails = getSigningDetails(serverUid); - SigningDetails clientSigningDetails = getSigningDetails(clientUid); - return serverSigningDetails.checkCapability(clientSigningDetails, capability) - || clientSigningDetails.hasAncestorOrSelf(serverSigningDetails); - - } - - private SigningDetails getSigningDetails(@NonNull String packageName) { - return PackageManagerService.this.getSigningDetails(packageName); - } - - private SigningDetails getSigningDetails(int uid) { - return PackageManagerService.this.getSigningDetails(uid); + protected Context getContext() { + return mContext; } + @NonNull @Override - public boolean isInstantApp(String packageName, int userId) { - return PackageManagerService.this.mIPackageManager.isInstantApp(packageName, userId); + protected PermissionManagerServiceInternal getPermissionManager() { + return mPermissionManager; } + @NonNull @Override - public String getInstantAppPackageName(int uid) { - return PackageManagerService.this.getInstantAppPackageName(uid); + protected AppDataHelper getAppDataHelper() { + return mAppDataHelper; } + @NonNull @Override - public boolean filterAppAccess(AndroidPackage pkg, int callingUid, int userId) { - return PackageManagerService.this.filterAppAccess(pkg, callingUid, userId); + protected PackageObserverHelper getPackageObserverHelper() { + return mPackageObserverHelper; } + @NonNull @Override - public boolean filterAppAccess(String packageName, int callingUid, int userId) { - return PackageManagerService.this.filterAppAccess(packageName, callingUid, userId); + protected ResolveIntentHelper getResolveIntentHelper() { + return mResolveIntentHelper; } + @NonNull @Override - public boolean filterAppAccess(int uid, int callingUid) { - return PackageManagerService.this.filterAppAccess(uid, callingUid); + protected SuspendPackageHelper getSuspendPackageHelper() { + return mSuspendPackageHelper; } - @Nullable + @NonNull @Override - public int[] getVisibilityAllowList(@NonNull String packageName, int userId) { - return PackageManagerService.this.getVisibilityAllowList(packageName, userId); + protected ProtectedPackages getProtectedPackages() { + return mProtectedPackages; } + @NonNull @Override - public boolean canQueryPackage(int callingUid, @Nullable String packageName) { - return PackageManagerService.this.canQueryPackage(callingUid, packageName); + protected UserNeedsBadgingCache getUserNeedsBadging() { + return mUserNeedsBadging; } + @NonNull @Override - public AndroidPackage getPackage(String packageName) { - return PackageManagerService.this.getPackage(packageName); + protected InstantAppRegistry getInstantAppRegistry() { + return mInstantAppRegistry; } - @Nullable + @NonNull @Override - public AndroidPackageApi getAndroidPackage(@NonNull String packageName) { - return PackageManagerService.this.getPackage(packageName); + protected ApexManager getApexManager() { + return mApexManager; } + @NonNull @Override - public AndroidPackage getPackage(int uid) { - return PackageManagerService.this.getPackage(uid); + protected DexManager getDexManager() { + return mDexManager; } @Override - public List<AndroidPackage> getPackagesForAppId(int appId) { - return mComputer.getPackagesForAppId(appId); + public boolean isPlatformSigned(String packageName) { + PackageStateInternal packageState = snapshot().getPackageStateInternal(packageName); + if (packageState == null) { + return false; + } + SigningDetails signingDetails = packageState.getSigningDetails(); + return signingDetails.hasAncestorOrSelf(mPlatformPackage.getSigningDetails()) + || mPlatformPackage.getSigningDetails().checkCapability(signingDetails, + SigningDetails.CertCapabilities.PERMISSION); } - @Nullable @Override - public PackageStateInternal getPackageStateInternal(String packageName) { - return PackageManagerService.this.getPackageStateInternal(packageName); + public boolean isDataRestoreSafe(byte[] restoringFromSigHash, String packageName) { + final Computer snapshot = snapshot(); + SigningDetails sd = snapshot.getSigningDetails(packageName); + if (sd == null) { + return false; + } + return sd.hasSha256Certificate(restoringFromSigHash, + SigningDetails.CertCapabilities.INSTALLED_DATA); } - @Nullable @Override - public PackageState getPackageState(@NonNull String packageName) { - return PackageManagerService.this.getPackageState(packageName); + public boolean isDataRestoreSafe(Signature restoringFromSig, String packageName) { + final Computer snapshot = snapshot(); + SigningDetails sd = snapshot.getSigningDetails(packageName); + if (sd == null) { + return false; + } + return sd.hasCertificate(restoringFromSig, + SigningDetails.CertCapabilities.INSTALLED_DATA); } - @NonNull @Override - public ArrayMap<String, ? extends PackageStateInternal> getPackageStates() { - return PackageManagerService.this.getPackageStates(); + public boolean hasSignatureCapability(int serverUid, int clientUid, + @SigningDetails.CertCapabilities int capability) { + final Computer snapshot = snapshot(); + SigningDetails serverSigningDetails = snapshot.getSigningDetails(serverUid); + SigningDetails clientSigningDetails = snapshot.getSigningDetails(clientUid); + return serverSigningDetails.checkCapability(clientSigningDetails, capability) + || clientSigningDetails.hasAncestorOrSelf(serverSigningDetails); } @Override public PackageList getPackageList(@Nullable PackageListObserver observer) { final ArrayList<String> list = new ArrayList<>(); - forEachPackageState(packageState -> { + PackageManagerService.this.forEachPackageState(snapshot(), packageState -> { AndroidPackage pkg = packageState.getPkg(); if (pkg != null) { list.add(pkg.getPackageName()); @@ -7263,19 +6167,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void removePackageListObserver(PackageListObserver observer) { - mPackageObserverHelper.removeObserver(observer); - } - - @Override - public PackageStateInternal getDisabledSystemPackage(@NonNull String packageName) { - return snapshotComputer().getDisabledSystemPackage(packageName); - } - - @Override public @Nullable String getDisabledSystemPackageName(@NonNull String packageName) { - PackageStateInternal disabledPkgSetting = getDisabledSystemPackage( + PackageStateInternal disabledPkgSetting = snapshot().getDisabledSystemPackage( packageName); AndroidPackage disabledPkg = disabledPkgSetting == null ? null : disabledPkgSetting.getPkg(); @@ -7283,51 +6177,15 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public @NonNull String[] getKnownPackageNames(int knownPackage, int userId) { - return PackageManagerService.this.getKnownPackageNamesInternal(knownPackage, userId); - } - - @Override - public boolean isSameApp(@Nullable String packageName, int callingUid, int userId) { - if (packageName == null) { - return false; - } - - if (Process.isSdkSandboxUid(callingUid)) { - return packageName.equals(getSdkSandboxPackageName()); - } - int uid = getPackageUid(packageName, 0, userId); - return UserHandle.isSameApp(uid, callingUid); - } - - @Override public boolean isResolveActivityComponent(ComponentInfo component) { return mResolveActivity.packageName.equals(component.packageName) && mResolveActivity.name.equals(component.name); } @Override - public void setKeepUninstalledPackages(final List<String> packageList) { - PackageManagerService.this.setKeepUninstalledPackagesInternal(packageList); - } - - @Override - public boolean isPermissionsReviewRequired(String packageName, int userId) { - return mPermissionManager.isPermissionsReviewRequired(packageName, userId); - } - - @Override - public PackageInfo getPackageInfo( - String packageName, @PackageManager.PackageInfoFlagsBits long flags, - int filterCallingUid, int userId) { - return PackageManagerService.this.mComputer - .getPackageInfoInternal(packageName, PackageManager.VERSION_CODE_HIGHEST, - flags, filterCallingUid, userId); - } - - @Override public long getCeDataInode(String packageName, int userId) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); + final PackageStateInternal packageState = + snapshot().getPackageStateInternal(packageName); if (packageState == null) { return 0; } else { @@ -7336,18 +6194,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public Bundle getSuspendedPackageLauncherExtras(String packageName, int userId) { - return mSuspendPackageHelper.getSuspendedPackageLauncherExtras( - packageName, userId, Binder.getCallingUid()); - } - - @Override - public boolean isPackageSuspended(String packageName, int userId) { - return mSuspendPackageHelper.isPackageSuspended( - packageName, userId, Binder.getCallingUid()); - } - - @Override public void removeAllNonSystemPackageSuspensions(int userId) { final Computer computer = snapshotComputer(); final String[] allPackages = computer.getAllAvailablePackageNames(); @@ -7357,14 +6203,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void removeNonSystemPackageSuspensions(String packageName, int userId) { - mSuspendPackageHelper.removeSuspensionsBySuspendingPackage(snapshotComputer(), - new String[]{packageName}, - (suspendingPackage) -> !PLATFORM_PACKAGE_NAME.equals(suspendingPackage), - userId); - } - - @Override public void flushPackageRestrictions(int userId) { synchronized (mLock) { PackageManagerService.this.flushPackageRestrictionsAsUserInternalLocked(userId); @@ -7372,103 +6210,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void removeDistractingPackageRestrictions(String packageName, int userId) { - PackageManagerService.this.removeDistractingPackageRestrictions( - new String[]{packageName}, userId); - } - - @Override - public void removeAllDistractingPackageRestrictions(int userId) { - PackageManagerService.this.removeAllDistractingPackageRestrictions(userId); - } - - @Override - public String getSuspendingPackage(String suspendedPackage, int userId) { - return mSuspendPackageHelper.getSuspendingPackage( - suspendedPackage, userId, Binder.getCallingUid()); - } - - @Override - public SuspendDialogInfo getSuspendedDialogInfo(String suspendedPackage, - String suspendingPackage, int userId) { - return mSuspendPackageHelper.getSuspendedDialogInfo( - suspendedPackage, suspendingPackage, userId, Binder.getCallingUid()); - } - - @Override - public int getDistractingPackageRestrictions(String packageName, int userId) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); - return (packageState == null) ? RESTRICTION_NONE - : packageState.getUserStateOrDefault(userId).getDistractionFlags(); - } - - @Override - public int getPackageUid(String packageName, - @PackageManager.PackageInfoFlagsBits long flags, int userId) { - return PackageManagerService.this - .getPackageUidInternal(packageName, flags, userId, Process.SYSTEM_UID); - } - - @Override - public ApplicationInfo getApplicationInfo( - String packageName, @PackageManager.ApplicationInfoFlagsBits long flags, - int filterCallingUid, int userId) { - return PackageManagerService.this - .getApplicationInfoInternal(packageName, flags, filterCallingUid, userId); - } - - @Override - public ActivityInfo getActivityInfo( - ComponentName component, @PackageManager.ComponentInfoFlagsBits long flags, - int filterCallingUid, int userId) { - return PackageManagerService.this - .getActivityInfoInternal(component, flags, filterCallingUid, userId); - } - - @Override - public List<ResolveInfo> queryIntentActivities( - Intent intent, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, - int filterCallingUid, int userId) { - return snapshotComputer().queryIntentActivitiesInternal(intent, resolvedType, flags, - userId); - } - - @Override - public List<ResolveInfo> queryIntentReceivers(Intent intent, - String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, - int filterCallingUid, int userId) { - return PackageManagerService.this.mResolveIntentHelper.queryIntentReceiversInternal( - snapshotComputer(), intent, resolvedType, flags, userId, filterCallingUid); - } - - @Override - public List<ResolveInfo> queryIntentServices( - Intent intent, @PackageManager.ResolveInfoFlagsBits long flags, int callingUid, - int userId) { - final String resolvedType = intent.resolveTypeIfNeeded(mContext.getContentResolver()); - return PackageManagerService.this - .queryIntentServicesInternal(intent, resolvedType, flags, userId, callingUid, - false); - } - - @Override - public ComponentName getHomeActivitiesAsUser(List<ResolveInfo> allHomeCandidates, - int userId) { - return PackageManagerService.this.getHomeActivitiesAsUser(allHomeCandidates, userId); - } - - @Override - public ComponentName getDefaultHomeActivity(int userId) { - return PackageManagerService.this.getDefaultHomeActivity(userId); - } - - @Override - public ComponentName getSystemUiServiceComponent() { - return ComponentName.unflattenFromString(mContext.getResources().getString( - com.android.internal.R.string.config_systemUIServiceComponent)); - } - - @Override public void setDeviceAndProfileOwnerPackages( int deviceOwnerUserId, String deviceOwnerPackage, SparseArray<String> profileOwnerPackages) { @@ -7487,118 +6228,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void setDeviceOwnerProtectedPackages( - String deviceOwnerPackageName, List<String> packageNames) { - mProtectedPackages.setDeviceOwnerProtectedPackages( - deviceOwnerPackageName, packageNames); - } - - @Override - public boolean isPackageDataProtected(int userId, String packageName) { - return mProtectedPackages.isPackageDataProtected(userId, packageName); - } - - @Override - public boolean isPackageStateProtected(String packageName, int userId) { - return mProtectedPackages.isPackageStateProtected(userId, packageName); - } - - @Override - public boolean isPackageEphemeral(int userId, String packageName) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); - return packageState != null - && packageState.getUserStateOrDefault(userId).isInstantApp(); - } - - @Override - public boolean wasPackageEverLaunched(String packageName, int userId) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); - if (packageState == null) { - throw new IllegalArgumentException("Unknown package: " + packageName); - } - return !packageState.getUserStateOrDefault(userId).isNotLaunched(); - } - - @Override - public boolean isEnabledAndMatches(ParsedMainComponent component, long flags, int userId) { - return PackageStateUtils.isEnabledAndMatches( - getPackageStateInternal(component.getPackageName()), component, flags, userId); - } - - @Override - public boolean userNeedsBadging(int userId) { - synchronized (mLock) { - return PackageManagerService.this.userNeedsBadging(userId); - } - } - - @Override - public String getNameForUid(int uid) { - return mIPackageManager.getNameForUid(uid); - } - - @Override - public void requestInstantAppResolutionPhaseTwo(AuxiliaryResolveInfo responseObj, - Intent origIntent, String resolvedType, String callingPackage, - @Nullable String callingFeatureId, boolean isRequesterInstantApp, - Bundle verificationBundle, int userId) { - PackageManagerService.this.requestInstantAppResolutionPhaseTwo(responseObj, origIntent, - resolvedType, callingPackage, callingFeatureId, isRequesterInstantApp, - verificationBundle, userId); - } - - @Override - public void grantImplicitAccess(int userId, Intent intent, - int recipientAppId, int visibleUid, boolean direct) { - grantImplicitAccess(userId, intent, recipientAppId, visibleUid, direct, - false /* retainOnUpdate */); - } - - @Override - public void grantImplicitAccess(int userId, Intent intent, - int recipientAppId, int visibleUid, boolean direct, boolean retainOnUpdate) { - Computer computer = snapshotComputer(); - final AndroidPackage visiblePackage = computer.getPackage(visibleUid); - final int recipientUid = UserHandle.getUid(userId, recipientAppId); - if (visiblePackage == null || computer.getPackage(recipientUid) == null) { - return; - } - - final boolean instantApp = computer.isInstantAppInternal( - visiblePackage.getPackageName(), userId, visibleUid); - final boolean accessGranted; - if (instantApp) { - if (!direct) { - // if the interaction that lead to this granting access to an instant app - // was indirect (i.e.: URI permission grant), do not actually execute the - // grant. - return; - } - accessGranted = mInstantAppRegistry.grantInstantAccess(userId, intent, - recipientAppId, UserHandle.getAppId(visibleUid) /*instantAppId*/); - } else { - accessGranted = mAppsFilter.grantImplicitAccess(recipientUid, visibleUid, - retainOnUpdate); - } - - if (accessGranted) { - ApplicationPackageManager.invalidateGetPackagesForUidCache(); - } - } - - @Override - public boolean isInstantAppInstallerComponent(ComponentName component) { - final ActivityInfo instantAppInstallerActivity = mInstantAppInstallerActivity; - return instantAppInstallerActivity != null - && instantAppInstallerActivity.getComponentName().equals(component); - } - - @Override - public void pruneInstantApps() { - mInstantAppRegistry.pruneInstantApps(snapshotComputer()); - } - - @Override public void pruneCachedApksInApex(@NonNull List<PackageInfo> apexPackages) { if (mCacheDir == null) { return; @@ -7606,11 +6235,12 @@ public class PackageManagerService implements PackageSender, TestUtilityService final PackageCacher cacher = new PackageCacher(mCacheDir); synchronized (mLock) { + final Computer snapshot = snapshot(); for (int i = 0, size = apexPackages.size(); i < size; i++) { final List<String> apkNames = mApexManager.getApksInApex(apexPackages.get(i).packageName); for (int j = 0, apksInApex = apkNames.size(); j < apksInApex; j++) { - final AndroidPackage pkg = getPackage(apkNames.get(j)); + final AndroidPackage pkg = snapshot.getPackage(apkNames.get(j)); cacher.cleanCachedResult(new File(pkg.getPath())); } } @@ -7618,10 +6248,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public String getSetupWizardPackageName() { - return mSetupWizardPackage; - } - public void setExternalSourcesPolicy(ExternalSourcesPolicy policy) { if (policy != null) { mExternalSourcesPolicy = policy; @@ -7630,7 +6256,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService @Override public boolean isPackagePersistent(String packageName) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); + final PackageStateInternal packageState = + snapshot().getPackageStateInternal(packageName); if (packageState == null) { return false; } @@ -7641,16 +6268,20 @@ public class PackageManagerService implements PackageSender, TestUtilityService @Override public List<PackageInfo> getOverlayPackages(int userId) { + final Computer snapshot = snapshotComputer(); final ArrayList<PackageInfo> overlayPackages = new ArrayList<>(); - forEachPackageState(packageState -> { + final ArrayMap<String, ? extends PackageStateInternal> packageStates = + snapshot.getPackageStates(); + for (int index = 0; index < packageStates.size(); index++) { + final PackageStateInternal packageState = packageStates.valueAt(index); final AndroidPackage pkg = packageState.getPkg(); if (pkg != null && pkg.getOverlayTarget() != null) { - PackageInfo pkgInfo = generatePackageInfo(packageState, 0, userId); + PackageInfo pkgInfo = snapshot.generatePackageInfo(packageState, 0, userId); if (pkgInfo != null) { overlayPackages.add(pkgInfo); } } - }); + } return overlayPackages; } @@ -7658,7 +6289,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService @Override public List<String> getTargetPackageNames(int userId) { List<String> targetPackages = new ArrayList<>(); - forEachPackageState(packageState -> { + PackageManagerService.this.forEachPackageState(snapshot(), packageState -> { final AndroidPackage pkg = packageState.getPkg(); if (pkg != null && !pkg.isOverlay()) { targetPackages.add(pkg.getPackageName()); @@ -7676,30 +6307,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public ResolveInfo resolveIntent(Intent intent, String resolvedType, - @PackageManager.ResolveInfoFlagsBits long flags, - @PackageManagerInternal.PrivateResolveFlags long privateResolveFlags, int userId, - boolean resolveForStart, int filterCallingUid) { - return mResolveIntentHelper.resolveIntentInternal(snapshotComputer(), - intent, resolvedType, flags, privateResolveFlags, userId, resolveForStart, - filterCallingUid); - } - - @Override - public ResolveInfo resolveService(Intent intent, String resolvedType, - @PackageManager.ResolveInfoFlagsBits long flags, int userId, int callingUid) { - return mResolveIntentHelper.resolveServiceInternal(snapshotComputer(), intent, - resolvedType, flags, userId, callingUid); - } - - @Override - public ProviderInfo resolveContentProvider(String name, - @PackageManager.ResolveInfoFlagsBits long flags, int userId, int callingUid) { - return PackageManagerService.this.mComputer - .resolveContentProvider(name, flags, userId,callingUid); - } - - @Override public void addIsolatedUid(int isolatedUid, int ownerUid) { synchronized (mLock) { mIsolatedOwners.put(isolatedUid, ownerUid); @@ -7714,146 +6321,12 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public int getUidTargetSdkVersion(int uid) { - return PackageManagerService.this.getUidTargetSdkVersion(uid); - } - - @Override - public int getPackageTargetSdkVersion(String packageName) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); - if (packageState != null && packageState.getPkg() != null) { - return packageState.getPkg().getTargetSdkVersion(); - } - return Build.VERSION_CODES.CUR_DEVELOPMENT; - } - - @Override - public boolean canAccessInstantApps(int callingUid, int userId) { - return PackageManagerService.this.canViewInstantApps(callingUid, userId); - } - - @Override - public boolean canAccessComponent(int callingUid, @NonNull ComponentName component, - @UserIdInt int userId) { - return mComputer.canAccessComponent(callingUid, component, userId); - } - - @Override - public boolean hasInstantApplicationMetadata(String packageName, int userId) { - return mInstantAppRegistry.hasInstantApplicationMetadata(packageName, userId); - } - - @Override public void notifyPackageUse(String packageName, int reason) { synchronized (mLock) { PackageManagerService.this.notifyPackageUseInternal(packageName, reason); } } - @Override - public void onPackageProcessKilledForUninstall(String packageName) { - mHandler.post(() -> PackageManagerService.this.notifyInstallObserver(packageName, - true /* killApp */)); - } - - @Override - public SparseArray<String> getAppsWithSharedUserIds() { - return mComputer.getAppsWithSharedUserIds(); - } - - @Override - @NonNull - public String[] getSharedUserPackagesForPackage(String packageName, int userId) { - return mComputer.getSharedUserPackagesForPackage(packageName, userId); - } - - @Override - public ArrayMap<String, ProcessInfo> getProcessesForUid(int uid) { - return mComputer.getProcessesForUid(uid); - } - - @Override - public int[] getPermissionGids(String permissionName, int userId) { - return mPermissionManager.getPermissionGids(permissionName, userId); - } - - @Override - public boolean isOnlyCoreApps() { - return mIPackageManager.isOnlyCoreApps(); - } - - @Override - public void freeStorage(String volumeUuid, long bytes, - @StorageManager.AllocateFlags int flags) throws IOException { - PackageManagerService.this.freeStorage(volumeUuid, bytes, flags); - } - - @Override - public void freeAllAppCacheAboveQuota(@NonNull String volumeUuid) throws IOException { - PackageManagerService.this.freeAllAppCacheAboveQuota(volumeUuid); - } - - @Override - public void forEachPackageSetting(Consumer<PackageSetting> actionLocked) { - PackageManagerService.this.forEachPackageSetting(actionLocked); - } - - @Override - public void forEachPackageState(Consumer<PackageStateInternal> action) { - PackageManagerService.this.forEachPackageState(action); - } - - @Override - public void forEachPackage(Consumer<AndroidPackage> action) { - PackageManagerService.this.forEachPackage(action); - } - - @Override - public void forEachInstalledPackage(@NonNull Consumer<AndroidPackage> action, - @UserIdInt int userId) { - PackageManagerService.this.forEachInstalledPackage(action, userId); - } - - @Override - public ArraySet<String> getEnabledComponents(String packageName, int userId) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); - if (packageState == null) { - return new ArraySet<>(); - } - return packageState.getUserStateOrDefault(userId).getEnabledComponents(); - } - - @Override - public ArraySet<String> getDisabledComponents(String packageName, int userId) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); - if (packageState == null) { - return new ArraySet<>(); - } - return packageState.getUserStateOrDefault(userId).getDisabledComponents(); - } - - @Override - public @PackageManager.EnabledState int getApplicationEnabledState( - String packageName, int userId) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); - if (packageState == null) { - return COMPONENT_ENABLED_STATE_DEFAULT; - } - return packageState.getUserStateOrDefault(userId).getEnabledState(); - } - - @Override - public @PackageManager.EnabledState int getComponentEnabledSetting( - @NonNull ComponentName componentName, int callingUid, int userId) { - return PackageManagerService.this.mComputer.getComponentEnabledSettingInternal( - componentName, callingUid, userId); - } - - @Override - public void setEnableRollbackCode(int token, int enableRollbackCode) { - PackageManagerService.this.setEnableRollbackCode(token, enableRollbackCode); - } - /** * Ask the package manager to compile layouts in the given package. */ @@ -7869,11 +6342,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService return mArtManagerService.compileLayouts(pkg); } - @Override - public void finishPackageInstall(int token, boolean didLaunch) { - mIPackageManager.finishPackageInstall(token, didLaunch); - } - @Nullable @Override public String removeLegacyDefaultBrowserPackageName(int userId) { @@ -7883,16 +6351,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public boolean isApexPackage(String packageName) { - return PackageManagerService.this.mApexManager.isApexPackage(packageName); - } - - @Override - public List<String> getApksInApex(String apexPackageName) { - return PackageManagerService.this.mApexManager.getApksInApex(apexPackageName); - } - - @Override public void uninstallApex(String packageName, long versionCode, int userId, IntentSender intentSender, int flags) { final int callerUid = Binder.getCallingUid(); @@ -7967,11 +6425,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public boolean isCallerInstallerOfRecord(@NonNull AndroidPackage pkg, int callingUid) { - return mComputer.isCallerInstallerOfRecord(pkg, callingUid); - } - - @Override public boolean isPermissionUpgradeNeeded(int userId) { return mSettings.isPermissionUpgradeNeeded(userId); } @@ -7985,13 +6438,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public List<String> getMimeGroup(String packageName, String mimeGroup) { - return PackageManagerService.this.getMimeGroupInternal(packageName, mimeGroup); - } - - @Override public void setVisibilityLogging(String packageName, boolean enable) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); + final PackageStateInternal packageState = + snapshot().getPackageStateInternal(packageName); if (packageState == null) { throw new IllegalStateException("No package found for " + packageName); } @@ -7999,12 +6448,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public boolean isSystemPackage(@NonNull String packageName) { - return packageName.equals( - PackageManagerService.this.ensureSystemPackageName(packageName)); - } - - @Override public void clearBlockUninstallForUser(@UserIdInt int userId) { synchronized (mLock) { mSettings.clearBlockUninstallLPw(userId); @@ -8013,21 +6456,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void unsuspendForSuspendingPackage(final String packageName, int affectedUser) { - PackageManagerService.this.unsuspendForSuspendingPackage(snapshotComputer(), - packageName, affectedUser); - } - - @Override - public boolean isSuspendingAnyPackages(String suspendingPackage, int userId) { - return PackageManagerService.this.isSuspendingAnyPackages(suspendingPackage, userId); - } - - @Override public boolean registerInstalledLoadingProgressCallback(String packageName, PackageManagerInternal.InstalledLoadingProgressCallback callback, int userId) { - final PackageStateInternal ps = - getPackageStateInstalledFiltered(packageName, Binder.getCallingUid(), userId); + final Computer snapshot = snapshotComputer(); + final PackageStateInternal ps = filterPackageStateForInstalledAndFiltered(snapshot, + packageName, Binder.getCallingUid(), userId); if (ps == null) { return false; } @@ -8048,8 +6481,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService @Override public IncrementalStatesInfo getIncrementalStatesInfo( @NonNull String packageName, int filterCallingUid, int userId) { - final PackageStateInternal ps = - getPackageStateInstalledFiltered(packageName, filterCallingUid, userId); + final Computer snapshot = snapshotComputer(); + final PackageStateInternal ps = filterPackageStateForInstalledAndFiltered(snapshot, + packageName, filterCallingUid, userId); if (ps == null) { return null; } @@ -8057,74 +6491,23 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void requestChecksums(@NonNull String packageName, boolean includeSplits, - @Checksum.TypeMask int optional, @Checksum.TypeMask int required, - @Nullable List trustedInstallers, - @NonNull IOnChecksumsReadyListener onChecksumsReadyListener, int userId, - @NonNull Executor executor, @NonNull Handler handler) { - requestChecksumsInternal(packageName, includeSplits, optional, required, - trustedInstallers, onChecksumsReadyListener, userId, executor, handler); - } - - @Override - public boolean isPackageFrozen(@NonNull String packageName, - int callingUid, int userId) { - return PackageManagerService.this.getPackageStartability( - packageName, callingUid, userId) == PACKAGE_STARTABILITY_FROZEN; - } - - @Override - public long deleteOatArtifactsOfPackage(String packageName) { - return PackageManagerService.this.deleteOatArtifactsOfPackage(packageName); - } - - @Override - public void reconcileAppsData(int userId, @StorageManager.StorageFlags int flags, - boolean migrateAppsData) { - PackageManagerService.this.mAppDataHelper.reconcileAppsData(userId, flags, - migrateAppsData); - } - - @Override - @NonNull - public ArraySet<PackageStateInternal> getSharedUserPackages(int sharedUserAppId) { - return PackageManagerService.this.mComputer.getSharedUserPackages(sharedUserAppId); - } - - @Override - @Nullable - public SharedUserApi getSharedUserApi(int sharedUserAppId) { - return mComputer.getSharedUser(sharedUserAppId); - } - - @NonNull - @Override - public PackageStateMutator.InitialState recordInitialState() { - return PackageManagerService.this.recordInitialState(); - } - - @Nullable - @Override - public PackageStateMutator.Result commitPackageStateMutation( - @Nullable PackageStateMutator.InitialState state, - @NonNull Consumer<PackageStateMutator> consumer) { - return PackageManagerService.this.commitPackageStateMutation(state, consumer); - } - - @NonNull - @Override - public Computer snapshot() { - return snapshotComputer(); - } + public boolean isSameApp(@Nullable String packageName, int callingUid, int userId) { + if (packageName == null) { + return false; + } - @Override - public void shutdown() { - PackageManagerService.this.shutdown(); + if (Process.isSdkSandboxUid(callingUid)) { + return packageName.equals(mRequiredSdkSandboxPackage); + } + Computer snapshot = snapshot(); + int uid = snapshot.getPackageUid(packageName, 0, userId); + return UserHandle.isSameApp(uid, callingUid); } @Override - public DynamicCodeLogger getDynamicCodeLogger() { - return PackageManagerService.this.getDexManager().getDynamicCodeLogger(); + public void onPackageProcessKilledForUninstall(String packageName) { + mHandler.post(() -> PackageManagerService.this.notifyInstallObserver(packageName, + true /* killApp */)); } } @@ -8239,24 +6622,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService return mSettings.getDisabledSystemPkgLPr(packageName); } - @VisibleForTesting(visibility = Visibility.PRIVATE) - @Nullable - PackageStateInternal getPackageStateInternal(String packageName) { - return mComputer.getPackageStateInternal(packageName); - } - - @Nullable - PackageStateInternal getPackageStateInternal(String packageName, int callingUid) { - return mComputer.getPackageStateInternal(packageName, callingUid); - } - - @Nullable - PackageStateInternal getPackageStateInstalledFiltered(@NonNull String packageName, - int callingUid, @UserIdInt int userId) { - return filterPackageStateForInstalledAndFiltered(mComputer, packageName, callingUid, - userId); - } - @Nullable private PackageStateInternal filterPackageStateForInstalledAndFiltered( @NonNull Computer computer, @NonNull String packageName, int callingUid, @@ -8272,22 +6637,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - @Nullable - private PackageState getPackageState(String packageName) { - return mComputer.getPackageStateCopied(packageName); - } - - @NonNull - ArrayMap<String, ? extends PackageStateInternal> getPackageStates() { - Computer computer = snapshotComputer(); - if (computer == mLiveComputer) { - return new ArrayMap<>(computer.getPackageStates()); - } else { - return computer.getPackageStates(); - } - } - - private void forEachPackageSetting(Consumer<PackageSetting> actionLocked) { + @Deprecated + void forEachPackageSetting(Consumer<PackageSetting> actionLocked) { synchronized (mLock) { int size = mSettings.getPackagesLocked().size(); for (int index = 0; index < size; index++) { @@ -8296,13 +6647,13 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - void forEachPackageState(Consumer<PackageStateInternal> consumer) { - forEachPackageState(mComputer.getPackageStates(), consumer); + void forEachPackageState(@NonNull Computer snapshot, Consumer<PackageStateInternal> consumer) { + forEachPackageState(snapshot.getPackageStates(), consumer); } - void forEachPackage(Consumer<AndroidPackage> consumer) { + void forEachPackage(@NonNull Computer snapshot, Consumer<AndroidPackage> consumer) { final ArrayMap<String, ? extends PackageStateInternal> packageStates = - mComputer.getPackageStates(); + snapshot.getPackageStates(); int size = packageStates.size(); for (int index = 0; index < size; index++) { PackageStateInternal packageState = packageStates.valueAt(index); @@ -8322,7 +6673,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - void forEachInstalledPackage(@NonNull Consumer<AndroidPackage> action, + void forEachInstalledPackage(@NonNull Computer snapshot, @NonNull Consumer<AndroidPackage> action, @UserIdInt int userId) { Consumer<PackageStateInternal> actionWrapped = packageState -> { if (packageState.getPkg() != null @@ -8330,7 +6681,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService action.accept(packageState.getPkg()); } }; - forEachPackageState(mComputer.getPackageStates(), actionWrapped); + forEachPackageState(snapshot.getPackageStates(), actionWrapped); } boolean isHistoricalPackageUsageAvailable() { @@ -8345,15 +6696,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService return mCompilerStats.getOrCreatePackageStats(pkgName); } - /** - * Returns true if the system or user is explicitly preventing an otherwise valid installer to - * complete an install. This includes checks like unknown sources and user restrictions. - */ - public boolean isInstallDisabledForPackage(String packageName, int uid, int userId) { - return mComputer.isInstallDisabledForPackage(packageName, uid, userId); - } - - private void grantImplicitAccess(@NonNull Computer snapshot, @UserIdInt int userId, + void grantImplicitAccess(@NonNull Computer snapshot, @UserIdInt int userId, Intent intent, @AppIdInt int recipientAppId, int visibleUid, boolean direct, boolean retainOnUpdate) { final AndroidPackage visiblePackage = snapshot.getPackage(visibleUid); @@ -8384,8 +6727,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - boolean canHaveOatDir(String packageName) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); + boolean canHaveOatDir(@NonNull Computer snapshot, String packageName) { + final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); if (packageState == null || packageState.getPkg() == null) { return false; } @@ -8393,8 +6736,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService packageState.getTransientState().isUpdatedSystemApp()); } - long deleteOatArtifactsOfPackage(String packageName) { - PackageStateInternal packageState = getPackageStateInternal(packageName); + long deleteOatArtifactsOfPackage(@NonNull Computer snapshot, String packageName) { + PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); if (packageState == null || packageState.getPkg() == null) { return -1; // error code of deleteOptimizedFiles } @@ -8402,13 +6745,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService ArtUtils.createArtPackageInfo(packageState.getPkg(), packageState)); } - @NonNull - Set<String> getUnusedPackages(long downgradeTimeThresholdMillis) { - return mComputer.getUnusedPackages(downgradeTimeThresholdMillis); - } - - private List<String> getMimeGroupInternal(String packageName, String mimeGroup) { - final PackageStateInternal packageState = getPackageStateInternal(packageName); + List<String> getMimeGroupInternal(@NonNull Computer snapshot, String packageName, + String mimeGroup) { + final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); if (packageState == null) { return Collections.emptyList(); } @@ -8473,16 +6812,16 @@ public class PackageManagerService implements PackageSender, TestUtilityService * Returns the array containing per-uid timeout configuration. * This is derived from DeviceConfig flags. */ - public @NonNull PerUidReadTimeouts[] getPerUidReadTimeouts() { + public @NonNull PerUidReadTimeouts[] getPerUidReadTimeouts(@NonNull Computer snapshot) { PerUidReadTimeouts[] result = mPerUidReadTimeoutsCache; if (result == null) { - result = parsePerUidReadTimeouts(); + result = parsePerUidReadTimeouts(snapshot); mPerUidReadTimeoutsCache = result; } return result; } - private @NonNull PerUidReadTimeouts[] parsePerUidReadTimeouts() { + private @NonNull PerUidReadTimeouts[] parsePerUidReadTimeouts(@NonNull Computer snapshot) { final String defaultTimeouts = getDefaultTimeouts(); final String knownDigestersList = getKnownDigestersList(); final List<PerPackageReadTimeouts> perPackageReadTimeouts = @@ -8496,7 +6835,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService final List<PerUidReadTimeouts> result = new ArrayList<>(perPackageReadTimeouts.size()); for (int i = 0, size = perPackageReadTimeouts.size(); i < size; ++i) { final PerPackageReadTimeouts perPackage = perPackageReadTimeouts.get(i); - final PackageStateInternal ps = getPackageStateInternal(perPackage.packageName); + final PackageStateInternal ps = + snapshot.getPackageStateInternal(perPackage.packageName); if (ps == null) { if (DEBUG_PER_UID_READ_TIMEOUTS) { Slog.i(TAG, "PerUidReadTimeouts: package not found = " @@ -8546,7 +6886,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService return result.toArray(new PerUidReadTimeouts[result.size()]); } - private void setKeepUninstalledPackagesInternal(List<String> packageList) { + void setKeepUninstalledPackagesInternal(@NonNull Computer snapshot, List<String> packageList) { Preconditions.checkNotNull(packageList); synchronized (mKeepUninstalledPackages) { List<String> toRemove = new ArrayList<>(mKeepUninstalledPackages); @@ -8556,7 +6896,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService mKeepUninstalledPackages.addAll(packageList); for (int i = 0; i < toRemove.size(); i++) { - deletePackageIfUnused(toRemove.get(i)); + deletePackageIfUnused(snapshot, toRemove.get(i)); } } } @@ -8603,43 +6943,44 @@ public class PackageManagerService implements PackageSender, TestUtilityService mInstrumentation.put(name, instrumentation); } - String[] getKnownPackageNamesInternal(int knownPackage, int userId) { + String[] getKnownPackageNamesInternal(@NonNull Computer snapshot, int knownPackage, + int userId) { switch (knownPackage) { case PackageManagerInternal.PACKAGE_BROWSER: return new String[] { mDefaultAppProvider.getDefaultBrowser(userId) }; case PackageManagerInternal.PACKAGE_INSTALLER: - return mComputer.filterOnlySystemPackages(mRequiredInstallerPackage); + return snapshot.filterOnlySystemPackages(mRequiredInstallerPackage); case PackageManagerInternal.PACKAGE_UNINSTALLER: - return mComputer.filterOnlySystemPackages(mRequiredUninstallerPackage); + return snapshot.filterOnlySystemPackages(mRequiredUninstallerPackage); case PackageManagerInternal.PACKAGE_SETUP_WIZARD: - return mComputer.filterOnlySystemPackages(mSetupWizardPackage); + return snapshot.filterOnlySystemPackages(mSetupWizardPackage); case PackageManagerInternal.PACKAGE_SYSTEM: return new String[]{"android"}; case PackageManagerInternal.PACKAGE_VERIFIER: - return mComputer.filterOnlySystemPackages(mRequiredVerifierPackage); + return snapshot.filterOnlySystemPackages(mRequiredVerifierPackage); case PackageManagerInternal.PACKAGE_SYSTEM_TEXT_CLASSIFIER: - return mComputer.filterOnlySystemPackages( + return snapshot.filterOnlySystemPackages( mDefaultTextClassifierPackage, mSystemTextClassifierPackageName); case PackageManagerInternal.PACKAGE_PERMISSION_CONTROLLER: - return mComputer.filterOnlySystemPackages(mRequiredPermissionControllerPackage); + return snapshot.filterOnlySystemPackages(mRequiredPermissionControllerPackage); case PackageManagerInternal.PACKAGE_CONFIGURATOR: - return mComputer.filterOnlySystemPackages(mConfiguratorPackage); + return snapshot.filterOnlySystemPackages(mConfiguratorPackage); case PackageManagerInternal.PACKAGE_INCIDENT_REPORT_APPROVER: - return mComputer.filterOnlySystemPackages(mIncidentReportApproverPackage); + return snapshot.filterOnlySystemPackages(mIncidentReportApproverPackage); case PackageManagerInternal.PACKAGE_AMBIENT_CONTEXT_DETECTION: - return mComputer.filterOnlySystemPackages(mAmbientContextDetectionPackage); + return snapshot.filterOnlySystemPackages(mAmbientContextDetectionPackage); case PackageManagerInternal.PACKAGE_APP_PREDICTOR: - return mComputer.filterOnlySystemPackages(mAppPredictionServicePackage); + return snapshot.filterOnlySystemPackages(mAppPredictionServicePackage); case PackageManagerInternal.PACKAGE_COMPANION: - return mComputer.filterOnlySystemPackages(COMPANION_PACKAGE_NAME); + return snapshot.filterOnlySystemPackages(COMPANION_PACKAGE_NAME); case PackageManagerInternal.PACKAGE_RETAIL_DEMO: return TextUtils.isEmpty(mRetailDemoPackage) ? ArrayUtils.emptyArray(String.class) : new String[] {mRetailDemoPackage}; case PackageManagerInternal.PACKAGE_OVERLAY_CONFIG_SIGNATURE: - return mComputer.filterOnlySystemPackages(getOverlayConfigSignaturePackageName()); + return snapshot.filterOnlySystemPackages(mOverlayConfigSignaturePackage); case PackageManagerInternal.PACKAGE_RECENTS: - return mComputer.filterOnlySystemPackages(mRecentsPackage); + return snapshot.filterOnlySystemPackages(mRecentsPackage); default: return ArrayUtils.emptyArray(String.class); } @@ -8659,10 +7000,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService mDefaultAppProvider.setDefaultBrowser(packageName, async, userId); } - ResolveInfo getInstantAppInstallerInfo() { - return mInstantAppInstallerInfo; - } - PackageUsage getPackageUsage() { return mPackageUsage; } @@ -8754,10 +7091,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService } } - ResolveInfo getResolveInfo() { - return mResolveInfo; - } - ApplicationInfo getCoreAndroidApplication() { return mAndroidApplication; } diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 62e9d372f09d..15753cd24e85 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -2540,8 +2540,10 @@ class PackageManagerShellCommand extends ShellCommand { privAppPermissions = SystemConfig.getInstance() .getSystemExtPrivAppPermissions(pkg); } else if (isApexApp(pkg)) { + final String apexName = ApexManager.getInstance().getApexModuleNameForPackageName( + getApexPackageNameContainingPackage(pkg)); privAppPermissions = SystemConfig.getInstance() - .getApexPrivAppPermissions(getApexPackageNameContainingPackage(pkg), pkg); + .getApexPrivAppPermissions(apexName, pkg); } else { privAppPermissions = SystemConfig.getInstance().getPrivAppPermissions(pkg); } @@ -2567,8 +2569,10 @@ class PackageManagerShellCommand extends ShellCommand { privAppPermissions = SystemConfig.getInstance() .getSystemExtPrivAppDenyPermissions(pkg); } else if (isApexApp(pkg)) { + final String apexName = ApexManager.getInstance().getApexModuleNameForPackageName( + getApexPackageNameContainingPackage(pkg)); privAppPermissions = SystemConfig.getInstance() - .getApexPrivAppDenyPermissions(getApexPackageNameContainingPackage(pkg), pkg); + .getApexPrivAppDenyPermissions(apexName, pkg); } else { privAppPermissions = SystemConfig.getInstance().getPrivAppDenyPermissions(pkg); } diff --git a/services/core/java/com/android/server/pm/PackageSender.java b/services/core/java/com/android/server/pm/PackageSender.java index d380098d44b3..656d5962e1a9 100644 --- a/services/core/java/com/android/server/pm/PackageSender.java +++ b/services/core/java/com/android/server/pm/PackageSender.java @@ -16,6 +16,7 @@ package com.android.server.pm; +import android.annotation.NonNull; import android.annotation.Nullable; import android.content.IIntentReceiver; import android.os.Bundle; @@ -30,9 +31,9 @@ interface PackageSender { Bundle extras, int flags, String targetPkg, IIntentReceiver finishedReceiver, int[] userIds, int[] instantUserIds, @Nullable SparseArray<int[]> broadcastAllowList, @Nullable Bundle bOptions); - void sendPackageAddedForNewUsers(String packageName, boolean sendBootCompleted, - boolean includeStopped, int appId, int[] userIds, int[] instantUserIds, - int dataLoaderType); + void sendPackageAddedForNewUsers(@NonNull Computer snapshot, String packageName, + boolean sendBootCompleted, boolean includeStopped, int appId, int[] userIds, + int[] instantUserIds, int dataLoaderType); void notifyPackageAdded(String packageName, int uid); void notifyPackageChanged(String packageName, int uid); void notifyPackageRemoved(String packageName, int uid); diff --git a/services/core/java/com/android/server/pm/PreferredActivityHelper.java b/services/core/java/com/android/server/pm/PreferredActivityHelper.java index 7253ae4e7cb0..9befd6e09eb4 100644 --- a/services/core/java/com/android/server/pm/PreferredActivityHelper.java +++ b/services/core/java/com/android/server/pm/PreferredActivityHelper.java @@ -25,6 +25,7 @@ import static com.android.server.pm.PackageManagerService.DEBUG_PREFERRED; import static com.android.server.pm.PackageManagerService.TAG; import android.annotation.NonNull; +import android.annotation.UserIdInt; import android.content.ComponentName; import android.content.Intent; import android.content.IntentFilter; @@ -74,17 +75,18 @@ final class PreferredActivityHelper { mPm = pm; } - private ResolveInfo findPreferredActivityNotLocked(Intent intent, String resolvedType, - @PackageManager.ResolveInfoFlagsBits long flags, List<ResolveInfo> query, - boolean always, boolean removeMatches, boolean debug, int userId) { - return findPreferredActivityNotLocked( - intent, resolvedType, flags, query, always, removeMatches, debug, userId, + private ResolveInfo findPreferredActivityNotLocked(@NonNull Computer snapshot, Intent intent, + String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, + List<ResolveInfo> query, boolean always, boolean removeMatches, boolean debug, + @UserIdInt int userId) { + return findPreferredActivityNotLocked(snapshot, intent, resolvedType, flags, query, always, + removeMatches, debug, userId, UserHandle.getAppId(Binder.getCallingUid()) >= Process.FIRST_APPLICATION_UID); } // TODO: handle preferred activities missing while user has amnesia /** <b>must not hold {@link PackageManagerService.mLock}</b> */ - public ResolveInfo findPreferredActivityNotLocked( + public ResolveInfo findPreferredActivityNotLocked(@NonNull Computer snapshot, Intent intent, String resolvedType, @PackageManager.ResolveInfoFlagsBits long flags, List<ResolveInfo> query, boolean always, boolean removeMatches, boolean debug, int userId, boolean queryMayBeFiltered) { @@ -95,7 +97,7 @@ final class PreferredActivityHelper { if (!mPm.mUserManager.exists(userId)) return null; PackageManagerService.FindPreferredActivityBodyResult body = - mPm.findPreferredActivityInternal( + snapshot.findPreferredActivityInternal( intent, resolvedType, flags, query, always, removeMatches, debug, userId, queryMayBeFiltered); if (body.mChanged) { @@ -117,7 +119,7 @@ final class PreferredActivityHelper { mPm.clearPackagePreferredActivitiesLPw(packageName, changedUsers, userId); } if (changedUsers.size() > 0) { - updateDefaultHomeNotLocked(changedUsers); + updateDefaultHomeNotLocked(mPm.snapshotComputer(), changedUsers); mPm.postPreferredActivityChangedBroadcast(userId); mPm.scheduleWritePackageRestrictions(userId); } @@ -128,7 +130,7 @@ final class PreferredActivityHelper { * * @return Whether the ACTION_PREFERRED_ACTIVITY_CHANGED broadcast has been scheduled. */ - public boolean updateDefaultHomeNotLocked(int userId) { + public boolean updateDefaultHomeNotLocked(@NonNull Computer snapshot, @UserIdInt int userId) { if (Thread.holdsLock(mPm.mLock)) { Slog.wtf(TAG, "Calling thread " + Thread.currentThread().getName() + " is holding mLock", new Throwable()); @@ -139,10 +141,10 @@ final class PreferredActivityHelper { // before that. return false; } - final Intent intent = mPm.getHomeIntent(); - final List<ResolveInfo> resolveInfos = mPm.snapshotComputer().queryIntentActivitiesInternal( + final Intent intent = snapshot.getHomeIntent(); + final List<ResolveInfo> resolveInfos = snapshot.queryIntentActivitiesInternal( intent, null, MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, userId); - final ResolveInfo preferredResolveInfo = findPreferredActivityNotLocked( + final ResolveInfo preferredResolveInfo = findPreferredActivityNotLocked(snapshot, intent, null, 0, resolveInfos, true, false, false, userId); final String packageName = preferredResolveInfo != null && preferredResolveInfo.activityInfo != null @@ -151,8 +153,7 @@ final class PreferredActivityHelper { if (TextUtils.equals(currentPackageName, packageName)) { return false; } - final String[] callingPackages = mPm.mIPackageManager - .getPackagesForUid(Binder.getCallingUid()); + final String[] callingPackages = snapshot.getPackagesForUid(Binder.getCallingUid()); if (callingPackages != null && ArrayUtils.contains(callingPackages, mPm.mRequiredPermissionControllerPackage)) { // PermissionController manages default home directly. @@ -174,23 +175,21 @@ final class PreferredActivityHelper { /** * Variant that takes a {@link WatchedIntentFilter} */ - public void addPreferredActivity(WatchedIntentFilter filter, int match, - ComponentName[] set, ComponentName activity, boolean always, int userId, + public void addPreferredActivity(@NonNull Computer snapshot, WatchedIntentFilter filter, + int match, ComponentName[] set, ComponentName activity, boolean always, int userId, String opname, boolean removeExisting) { // writer int callingUid = Binder.getCallingUid(); - mPm.enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */, + snapshot.enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */, false /* checkShell */, "add preferred activity"); if (mPm.mContext.checkCallingOrSelfPermission( android.Manifest.permission.SET_PREFERRED_APPLICATIONS) != PackageManager.PERMISSION_GRANTED) { - synchronized (mPm.mLock) { - if (mPm.getUidTargetSdkVersion(callingUid) - < Build.VERSION_CODES.FROYO) { - Slog.w(TAG, "Ignoring addPreferredActivity() from uid " - + callingUid); - return; - } + if (snapshot.getUidTargetSdkVersion(callingUid) + < Build.VERSION_CODES.FROYO) { + Slog.w(TAG, "Ignoring addPreferredActivity() from uid " + + callingUid); + return; } mPm.mContext.enforceCallingOrSelfPermission( android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null); @@ -214,7 +213,8 @@ final class PreferredActivityHelper { new PreferredActivity(filter, match, set, activity, always)); mPm.scheduleWritePackageRestrictions(userId); } - if (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) { + // Re-snapshot after mLock + if (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(mPm.snapshotComputer(), userId))) { mPm.postPreferredActivityChangedBroadcast(userId); } } @@ -222,8 +222,8 @@ final class PreferredActivityHelper { /** * Variant that takes a {@link WatchedIntentFilter} */ - public void replacePreferredActivity(WatchedIntentFilter filter, int match, - ComponentName[] set, ComponentName activity, int userId) { + public void replacePreferredActivity(@NonNull Computer snapshot, WatchedIntentFilter filter, + int match, ComponentName[] set, ComponentName activity, int userId) { if (filter.countActions() != 1) { throw new IllegalArgumentException( "replacePreferredActivity expects filter to have only 1 action."); @@ -238,13 +238,14 @@ final class PreferredActivityHelper { } final int callingUid = Binder.getCallingUid(); - mPm.enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */, + snapshot.enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */, false /* checkShell */, "replace preferred activity"); if (mPm.mContext.checkCallingOrSelfPermission( android.Manifest.permission.SET_PREFERRED_APPLICATIONS) != PackageManager.PERMISSION_GRANTED) { synchronized (mPm.mLock) { - if (mPm.getUidTargetSdkVersion(callingUid) + // TODO: Remove lock? + if (mPm.snapshotComputer().getUidTargetSdkVersion(callingUid) < Build.VERSION_CODES.FROYO) { Slog.w(TAG, "Ignoring replacePreferredActivity() from uid " + Binder.getCallingUid()); @@ -296,21 +297,23 @@ final class PreferredActivityHelper { } } } - addPreferredActivity(filter, match, set, activity, true, userId, + + // Retake a snapshot after editing with lock held + addPreferredActivity(mPm.snapshotComputer(), filter, match, set, activity, true, userId, "Replacing preferred", false); } - public void clearPackagePreferredActivities(String packageName) { + public void clearPackagePreferredActivities(@NonNull Computer snapshot, String packageName) { final int callingUid = Binder.getCallingUid(); - if (mPm.getInstantAppPackageName(callingUid) != null) { + if (snapshot.getInstantAppPackageName(callingUid) != null) { return; } - final PackageStateInternal packageState = mPm.getPackageStateInternal(packageName); - if (packageState == null || !mPm.isCallerSameApp(packageName, callingUid)) { + final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); + if (packageState == null || !snapshot.isCallerSameApp(packageName, callingUid)) { if (mPm.mContext.checkCallingOrSelfPermission( android.Manifest.permission.SET_PREFERRED_APPLICATIONS) != PackageManager.PERMISSION_GRANTED) { - if (mPm.getUidTargetSdkVersion(callingUid) + if (snapshot.getUidTargetSdkVersion(callingUid) < Build.VERSION_CODES.FROYO) { Slog.w(TAG, "Ignoring clearPackagePreferredActivities() from uid " + callingUid); @@ -320,7 +323,7 @@ final class PreferredActivityHelper { android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null); } } - if (packageState != null && mPm.shouldFilterApplication(packageState, callingUid, + if (packageState != null && snapshot.shouldFilterApplication(packageState, callingUid, UserHandle.getUserId(callingUid))) { return; } @@ -329,23 +332,23 @@ final class PreferredActivityHelper { } /** <b>must not hold {@link #PackageManagerService.mLock}</b> */ - void updateDefaultHomeNotLocked(SparseBooleanArray userIds) { + void updateDefaultHomeNotLocked(@NonNull Computer snapshot, SparseBooleanArray userIds) { if (Thread.holdsLock(mPm.mLock)) { Slog.wtf(TAG, "Calling thread " + Thread.currentThread().getName() + " is holding mLock", new Throwable()); } for (int i = userIds.size() - 1; i >= 0; --i) { final int userId = userIds.keyAt(i); - updateDefaultHomeNotLocked(userId); + updateDefaultHomeNotLocked(snapshot, userId); } } - public void setHomeActivity(ComponentName comp, int userId) { - if (mPm.getInstantAppPackageName(Binder.getCallingUid()) != null) { + public void setHomeActivity(@NonNull Computer snapshot, ComponentName comp, int userId) { + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { return; } ArrayList<ResolveInfo> homeActivities = new ArrayList<>(); - mPm.getHomeActivitiesAsUser(homeActivities, userId); + snapshot.getHomeActivitiesAsUser(homeActivities, userId); boolean found = false; @@ -364,7 +367,7 @@ final class PreferredActivityHelper { throw new IllegalArgumentException("Component " + comp + " cannot be home on user " + userId); } - replacePreferredActivity(getHomeFilter(), IntentFilter.MATCH_CATEGORY_EMPTY, + replacePreferredActivity(snapshot, getHomeFilter(), IntentFilter.MATCH_CATEGORY_EMPTY, set, comp, userId); } @@ -401,7 +404,7 @@ final class PreferredActivityHelper { mPm.scheduleWritePackageRestrictions(userId); } if (isHomeFilter(filter)) { - updateDefaultHomeNotLocked(userId); + updateDefaultHomeNotLocked(mPm.snapshotComputer(), userId); } mPm.postPreferredActivityChangedBroadcast(userId); } @@ -417,7 +420,7 @@ final class PreferredActivityHelper { changed = mPm.mSettings.clearPackagePersistentPreferredActivities(packageName, userId); } if (changed) { - updateDefaultHomeNotLocked(userId); + updateDefaultHomeNotLocked(mPm.snapshotComputer(), userId); mPm.postPreferredActivityChangedBroadcast(userId); mPm.scheduleWritePackageRestrictions(userId); } @@ -506,7 +509,7 @@ final class PreferredActivityHelper { synchronized (mPm.mLock) { mPm.mSettings.readPreferredActivitiesLPw(readParser, readUserId); } - updateDefaultHomeNotLocked(readUserId); + updateDefaultHomeNotLocked(mPm.snapshotComputer(), readUserId); }); } catch (Exception e) { if (DEBUG_BACKUP) { @@ -598,7 +601,7 @@ final class PreferredActivityHelper { mPm.mPermissionManager.resetRuntimePermissions(pkg, userId); } } - updateDefaultHomeNotLocked(userId); + updateDefaultHomeNotLocked(mPm.snapshotComputer(), userId); resetNetworkPolicies(userId); mPm.scheduleWritePackageRestrictions(userId); } finally { @@ -610,12 +613,11 @@ final class PreferredActivityHelper { mPm.mInjector.getLocalService(NetworkPolicyManagerInternal.class).resetUserState(userId); } - // TODO: This method should not touch the Computer directly - public int getPreferredActivities(List<IntentFilter> outFilters, - List<ComponentName> outActivities, String packageName, Computer computer) { + public int getPreferredActivities(@NonNull Computer snapshot, List<IntentFilter> outFilters, + List<ComponentName> outActivities, String packageName) { List<WatchedIntentFilter> temp = WatchedIntentFilter.toWatchedIntentFilterList(outFilters); - int result = getPreferredActivitiesInternal(temp, outActivities, packageName, computer); + int result = getPreferredActivitiesInternal(snapshot, temp, outActivities, packageName); outFilters.clear(); for (int i = 0; i < temp.size(); i++) { outFilters.add(temp.get(i).getIntentFilter()); @@ -626,16 +628,17 @@ final class PreferredActivityHelper { /** * Variant that takes a {@link WatchedIntentFilter} */ - private int getPreferredActivitiesInternal(List<WatchedIntentFilter> outFilters, - List<ComponentName> outActivities, String packageName, Computer computer) { + private int getPreferredActivitiesInternal(@NonNull Computer snapshot, + List<WatchedIntentFilter> outFilters, List<ComponentName> outActivities, + String packageName) { final int callingUid = Binder.getCallingUid(); - if (mPm.getInstantAppPackageName(callingUid) != null) { + if (snapshot.getInstantAppPackageName(callingUid) != null) { return 0; } int num = 0; final int userId = UserHandle.getCallingUserId(); - PreferredIntentResolver pir = computer.getPreferredActivities(userId); + PreferredIntentResolver pir = snapshot.getPreferredActivities(userId); if (pir != null) { final Iterator<PreferredActivity> it = pir.filterIterator(); while (it.hasNext()) { @@ -643,8 +646,9 @@ final class PreferredActivityHelper { final String prefPackageName = pa.mPref.mComponent.getPackageName(); if (packageName == null || (prefPackageName.equals(packageName) && pa.mPref.mAlways)) { - if (mPm.shouldFilterApplication( - mPm.getPackageStateInternal(prefPackageName), callingUid, userId)) { + if (snapshot.shouldFilterApplication( + snapshot.getPackageStateInternal(prefPackageName), callingUid, + userId)) { continue; } if (outFilters != null) { @@ -660,7 +664,8 @@ final class PreferredActivityHelper { return num; } - public ResolveInfo findPersistentPreferredActivity(Intent intent, int userId) { + public ResolveInfo findPersistentPreferredActivity(@NonNull Computer snapshot, Intent intent, + int userId) { if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.SYSTEM_UID)) { throw new SecurityException( "findPersistentPreferredActivity can only be run by the system"); @@ -671,24 +676,23 @@ final class PreferredActivityHelper { final int callingUid = Binder.getCallingUid(); intent = PackageManagerServiceUtils.updateIntentForResolve(intent); final String resolvedType = intent.resolveTypeIfNeeded(mPm.mContext.getContentResolver()); - final long flags = mPm.updateFlagsForResolve( + final long flags = snapshot.updateFlagsForResolve( 0, userId, callingUid, false /*includeInstantApps*/, - mPm.isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, userId, resolvedType, + snapshot.isImplicitImageCaptureIntentAndNotSetByDpc(intent, userId, resolvedType, 0)); - final List<ResolveInfo> query = mPm.snapshotComputer().queryIntentActivitiesInternal(intent, + final List<ResolveInfo> query = snapshot.queryIntentActivitiesInternal(intent, resolvedType, flags, userId); - synchronized (mPm.mLock) { - return mPm.findPersistentPreferredActivityLP(intent, resolvedType, flags, query, false, - userId); - } + return snapshot.findPersistentPreferredActivity(intent, resolvedType, flags, query, false, + userId); } /** * Variant that takes a {@link WatchedIntentFilter} */ - public void setLastChosenActivity(Intent intent, String resolvedType, int flags, - WatchedIntentFilter filter, int match, ComponentName activity) { - if (mPm.getInstantAppPackageName(Binder.getCallingUid()) != null) { + public void setLastChosenActivity(@NonNull Computer snapshot, Intent intent, + String resolvedType, int flags, WatchedIntentFilter filter, int match, + ComponentName activity) { + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { return; } final int userId = UserHandle.getCallingUserId(); @@ -702,25 +706,26 @@ final class PreferredActivityHelper { filter.dump(new PrintStreamPrinter(System.out), " "); } intent.setComponent(null); - final List<ResolveInfo> query = mPm.snapshotComputer().queryIntentActivitiesInternal(intent, + final List<ResolveInfo> query = snapshot.queryIntentActivitiesInternal(intent, resolvedType, flags, userId); // Find any earlier preferred or last chosen entries and nuke them - findPreferredActivityNotLocked( - intent, resolvedType, flags, query, false, true, false, userId); + findPreferredActivityNotLocked(snapshot, intent, resolvedType, flags, query, false, true, + false, userId); // Add the new activity as the last chosen for this filter - addPreferredActivity(filter, match, null, activity, false, userId, + addPreferredActivity(snapshot, filter, match, null, activity, false, userId, "Setting last chosen", false); } - public ResolveInfo getLastChosenActivity(Intent intent, String resolvedType, int flags) { - if (mPm.getInstantAppPackageName(Binder.getCallingUid()) != null) { + public ResolveInfo getLastChosenActivity(@NonNull Computer snapshot, Intent intent, + String resolvedType, int flags) { + if (snapshot.getInstantAppPackageName(Binder.getCallingUid()) != null) { return null; } final int userId = UserHandle.getCallingUserId(); if (DEBUG_PREFERRED) Log.v(TAG, "Querying last chosen activity for " + intent); - final List<ResolveInfo> query = mPm.snapshotComputer().queryIntentActivitiesInternal(intent, + final List<ResolveInfo> query = snapshot.queryIntentActivitiesInternal(intent, resolvedType, flags, userId); - return findPreferredActivityNotLocked( - intent, resolvedType, flags, query, false, false, false, userId); + return findPreferredActivityNotLocked(snapshot, intent, resolvedType, flags, query, false, + false, false, userId); } } diff --git a/services/core/java/com/android/server/pm/PreferredComponent.java b/services/core/java/com/android/server/pm/PreferredComponent.java index 4ec042f79052..2a1ca2c41e64 100644 --- a/services/core/java/com/android/server/pm/PreferredComponent.java +++ b/services/core/java/com/android/server/pm/PreferredComponent.java @@ -57,7 +57,6 @@ public class PreferredComponent { private String mParseError; private final Callbacks mCallbacks; - private final String mSetupWizardPackageName; public interface Callbacks { public boolean onReadTag(String tagName, TypedXmlPullParser parser) @@ -72,7 +71,6 @@ public class PreferredComponent { mAlways = always; mShortComponent = component.flattenToShortString(); mParseError = null; - mSetupWizardPackageName = null; if (set != null) { final int N = set.length; String[] myPackages = new String[N]; @@ -174,8 +172,6 @@ public class PreferredComponent { mSetPackages = myPackages; mSetClasses = myClasses; mSetComponents = myComponents; - final PackageManagerInternal packageManagerInternal = LocalServices.getService(PackageManagerInternal.class); - mSetupWizardPackageName = packageManagerInternal.getSetupWizardPackageName(); } public String getParseError() { @@ -209,6 +205,7 @@ public class PreferredComponent { final int NQ = query.size(); final int NS = mSetPackages.length; final PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class); + String setupWizardPackageName = pmi.getSetupWizardPackageName(); int numMatch = 0; for (int i=0; i<NQ; i++) { ResolveInfo ri = query.get(i); @@ -217,7 +214,7 @@ public class PreferredComponent { // ignore SetupWizard package's launcher capability because it is only existed // during SetupWizard is running - if (excludeSetupWizardPackage && ai.packageName.equals(mSetupWizardPackageName)) { + if (excludeSetupWizardPackage && ai.packageName.equals(setupWizardPackageName)) { continue; } @@ -307,6 +304,8 @@ public class PreferredComponent { if (!excludeSetupWizardPackage && NS < NQ) { return false; } + final PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class); + String setupWizardPackageName = pmi.getSetupWizardPackageName(); for (int i=0; i<NQ; i++) { ResolveInfo ri = query.get(i); ActivityInfo ai = ri.activityInfo; @@ -314,7 +313,7 @@ public class PreferredComponent { // ignore SetupWizard package's launcher capability because it is only existed // during SetupWizard is running - if (excludeSetupWizardPackage && ai.packageName.equals(mSetupWizardPackageName)) { + if (excludeSetupWizardPackage && ai.packageName.equals(setupWizardPackageName)) { continue; } diff --git a/services/core/java/com/android/server/pm/RemovePackageHelper.java b/services/core/java/com/android/server/pm/RemovePackageHelper.java index 88df843ec8c5..b181cdd92379 100644 --- a/services/core/java/com/android/server/pm/RemovePackageHelper.java +++ b/services/core/java/com/android/server/pm/RemovePackageHelper.java @@ -118,7 +118,8 @@ final class RemovePackageHelper { public void removePackageLI(AndroidPackage pkg, boolean chatty) { // Remove the parent package setting - PackageStateInternal ps = mPm.getPackageStateInternal(pkg.getPackageName()); + PackageStateInternal ps = mPm.snapshotComputer() + .getPackageStateInternal(pkg.getPackageName()); if (ps != null) { removePackageLI(ps.getPackageName(), chatty); } else if (DEBUG_REMOVE && chatty) { @@ -271,8 +272,8 @@ final class RemovePackageHelper { synchronized (mPm.mLock) { mPm.mDomainVerificationManager.clearPackage(deletedPs.getPackageName()); mPm.mSettings.getKeySetManagerService().removeAppKeySetDataLPw(packageName); - mPm.mAppsFilter.removePackage(mPm.getPackageStateInternal(packageName), - false /* isReplace */); + mPm.mAppsFilter.removePackage(mPm.snapshotComputer() + .getPackageStateInternal(packageName), false /* isReplace */); removedAppId = mPm.mSettings.removePackageLPw(packageName); if (outInfo != null) { outInfo.mRemovedAppId = removedAppId; @@ -298,7 +299,8 @@ final class RemovePackageHelper { if (changedUsers.size() > 0) { final PreferredActivityHelper preferredActivityHelper = new PreferredActivityHelper(mPm); - preferredActivityHelper.updateDefaultHomeNotLocked(changedUsers); + preferredActivityHelper.updateDefaultHomeNotLocked(mPm.snapshotComputer(), + changedUsers); mPm.postPreferredActivityChangedBroadcast(UserHandle.USER_ALL); } } diff --git a/services/core/java/com/android/server/pm/ResolveIntentHelper.java b/services/core/java/com/android/server/pm/ResolveIntentHelper.java index 25356a489217..b74670b77a11 100644 --- a/services/core/java/com/android/server/pm/ResolveIntentHelper.java +++ b/services/core/java/com/android/server/pm/ResolveIntentHelper.java @@ -115,7 +115,7 @@ final class ResolveIntentHelper { if (!mUserManager.exists(userId)) return null; final int callingUid = Binder.getCallingUid(); flags = computer.updateFlagsForResolve(flags, userId, filterCallingUid, resolveForStart, - computer.isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, userId, + computer.isImplicitImageCaptureIntentAndNotSetByDpc(intent, userId, resolvedType, flags)); computer.enforceCrossUserPermission(callingUid, userId, false /*requireFullPermission*/, false /*checkShell*/, "resolve intent"); @@ -170,9 +170,9 @@ final class ResolveIntentHelper { } // If we have saved a preference for a preferred activity for // this Intent, use that. - ResolveInfo ri = mPreferredActivityHelper.findPreferredActivityNotLocked(intent, - resolvedType, flags, query, true, false, debug, userId, - queryMayBeFiltered); + ResolveInfo ri = mPreferredActivityHelper.findPreferredActivityNotLocked(computer, + intent, resolvedType, flags, query, true, false, debug, + userId, queryMayBeFiltered); if (ri != null) { return ri; } @@ -317,7 +317,7 @@ final class ResolveIntentHelper { final String instantAppPkgName = computer.getInstantAppPackageName(filterCallingUid); flags = computer.updateFlagsForResolve(flags, userId, filterCallingUid, false /*includeInstantApps*/, - computer.isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, userId, + computer.isImplicitImageCaptureIntentAndNotSetByDpc(intent, userId, resolvedType, flags)); Intent originalIntent = null; ComponentName comp = intent.getComponent(); @@ -562,7 +562,7 @@ final class ResolveIntentHelper { final int callingUid = Binder.getCallingUid(); flags = computer.updateFlagsForResolve(flags, userId, callingUid, false /*includeInstantApps*/, - computer.isImplicitImageCaptureIntentAndNotSetByDpcLocked(intent, userId, + computer.isImplicitImageCaptureIntentAndNotSetByDpc(intent, userId, resolvedType, flags)); computer.enforceCrossUserPermission(callingUid, userId, false /*requireFullPermission*/, false /*checkShell*/, "query intent activity options"); diff --git a/services/core/java/com/android/server/pm/SharedLibrariesImpl.java b/services/core/java/com/android/server/pm/SharedLibrariesImpl.java index 3fe079034cf2..479a404c88bf 100644 --- a/services/core/java/com/android/server/pm/SharedLibrariesImpl.java +++ b/services/core/java/com/android/server/pm/SharedLibrariesImpl.java @@ -741,9 +741,11 @@ public final class SharedLibrariesImpl implements SharedLibrariesRead, Watchable } SharedLibraryInfo libraryInfo = versionedLib.valueAt(libIdx); + final Computer snapshot = mPm.snapshotComputer(); + // Remove the shared library overlays from its dependent packages. for (int currentUserId : mPm.mUserManager.getUserIds()) { - final List<VersionedPackage> dependents = mPm.getPackagesUsingSharedLibrary( + final List<VersionedPackage> dependents = snapshot.getPackagesUsingSharedLibrary( libraryInfo, 0, Process.SYSTEM_UID, currentUserId); if (dependents == null) { continue; diff --git a/services/core/java/com/android/server/pm/StorageEventHelper.java b/services/core/java/com/android/server/pm/StorageEventHelper.java index bb7e55a4bf40..df19d3e58bfd 100644 --- a/services/core/java/com/android/server/pm/StorageEventHelper.java +++ b/services/core/java/com/android/server/pm/StorageEventHelper.java @@ -26,13 +26,13 @@ import static com.android.server.pm.PackageManagerService.SCAN_INITIAL; import static com.android.server.pm.PackageManagerService.TAG; import static com.android.server.pm.PackageManagerServiceUtils.logCriticalInfo; +import android.annotation.NonNull; import android.app.ResourcesManager; import android.content.IIntentReceiver; import android.content.pm.PackageManager; import android.content.pm.PackagePartitions; import android.content.pm.UserInfo; import android.content.pm.VersionedPackage; -import com.android.server.pm.pkg.parsing.ParsingPackageUtils; import android.os.Environment; import android.os.FileUtils; import android.os.UserHandle; @@ -48,6 +48,7 @@ import android.util.Slog; import com.android.internal.policy.AttributeCache; import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.pm.pkg.PackageStateInternal; +import com.android.server.pm.pkg.parsing.ParsingPackageUtils; import java.io.File; import java.util.ArrayList; @@ -78,7 +79,7 @@ public final class StorageEventHelper extends StorageEventListener { // Clean up any users or apps that were removed or recreated // while this volume was missing mPm.mUserManager.reconcileUsers(volumeUuid); - reconcileApps(volumeUuid); + reconcileApps(mPm.snapshotComputer(), volumeUuid); // Clean up any install sessions that expired or were // cancelled while this volume was missing @@ -299,8 +300,8 @@ public final class StorageEventHelper extends StorageEventListener { * aren't expected, either due to uninstallation or reinstallation on * another volume. */ - public void reconcileApps(String volumeUuid) { - List<String> absoluteCodePaths = collectAbsoluteCodePaths(); + public void reconcileApps(@NonNull Computer snapshot, String volumeUuid) { + List<String> absoluteCodePaths = collectAbsoluteCodePaths(snapshot); List<File> filesToDelete = null; final File[] files = FileUtils.listFilesOrEmpty( @@ -345,10 +346,10 @@ public final class StorageEventHelper extends StorageEventListener { } } - private List<String> collectAbsoluteCodePaths() { + private List<String> collectAbsoluteCodePaths(@NonNull Computer snapshot) { List<String> codePaths = new ArrayList<>(); final ArrayMap<String, ? extends PackageStateInternal> packageStates = - mPm.getPackageStates(); + snapshot.getPackageStates(); final int packageCount = packageStates.size(); for (int i = 0; i < packageCount; i++) { final PackageStateInternal ps = packageStates.valueAt(i); diff --git a/services/core/java/com/android/server/pm/SuspendPackageHelper.java b/services/core/java/com/android/server/pm/SuspendPackageHelper.java index 3ef5599385ce..588dfaf6db78 100644 --- a/services/core/java/com/android/server/pm/SuspendPackageHelper.java +++ b/services/core/java/com/android/server/pm/SuspendPackageHelper.java @@ -100,14 +100,14 @@ public final class SuspendPackageHelper { * @return The names of failed packages. */ @Nullable - String[] setPackagesSuspended(@NonNull Computer computer, @Nullable String[] packageNames, + String[] setPackagesSuspended(@NonNull Computer snapshot, @Nullable String[] packageNames, boolean suspended, @Nullable PersistableBundle appExtras, @Nullable PersistableBundle launcherExtras, @Nullable SuspendDialogInfo dialogInfo, @NonNull String callingPackage, @UserIdInt int userId, int callingUid) { if (ArrayUtils.isEmpty(packageNames)) { return packageNames; } - if (suspended && !isSuspendAllowedForUser(userId, callingUid)) { + if (suspended && !isSuspendAllowedForUser(snapshot, userId, callingUid)) { Slog.w(TAG, "Cannot suspend due to restrictions on user " + userId); return packageNames; } @@ -123,7 +123,7 @@ public final class SuspendPackageHelper { ArraySet<String> modifiedPackages = new ArraySet<>(); final boolean[] canSuspend = suspended - ? canSuspendPackageForUser(computer, packageNames, userId, callingUid) : null; + ? canSuspendPackageForUser(snapshot, packageNames, userId, callingUid) : null; for (int i = 0; i < packageNames.length; i++) { final String packageName = packageNames[i]; if (callingPackage.equals(packageName)) { @@ -133,9 +133,9 @@ public final class SuspendPackageHelper { continue; } final PackageStateInternal packageState = - computer.getPackageStateInternal(packageName); + snapshot.getPackageStateInternal(packageName); if (packageState == null - || computer.shouldFilterApplication(packageState, callingUid, userId)) { + || snapshot.shouldFilterApplication(packageState, callingUid, userId)) { Slog.w(TAG, "Could not find package setting for package: " + packageName + ". Skipping suspending/un-suspending."); unmodifiablePackages.add(packageName); @@ -191,9 +191,11 @@ public final class SuspendPackageHelper { } }); + final Computer newSnapshot = mPm.snapshotComputer(); + if (!changedPackagesList.isEmpty()) { final String[] changedPackages = changedPackagesList.toArray(new String[0]); - sendPackagesSuspendedForUser( + sendPackagesSuspendedForUser(newSnapshot, suspended ? Intent.ACTION_PACKAGES_SUSPENDED : Intent.ACTION_PACKAGES_UNSUSPENDED, changedPackages, changedUids.toArray(), userId); @@ -202,7 +204,7 @@ public final class SuspendPackageHelper { } // Send the suspension changed broadcast to ensure suspension state is not stale. if (!modifiedPackages.isEmpty()) { - sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENSION_CHANGED, + sendPackagesSuspendedForUser(newSnapshot, Intent.ACTION_PACKAGES_SUSPENSION_CHANGED, modifiedPackages.toArray(new String[0]), modifiedUids.toArray(), userId); } return unmodifiablePackages.toArray(new String[0]); @@ -217,14 +219,14 @@ public final class SuspendPackageHelper { * @return The names of packages which are Unsuspendable. */ @NonNull - String[] getUnsuspendablePackagesForUser(@NonNull Computer computer, + String[] getUnsuspendablePackagesForUser(@NonNull Computer snapshot, @NonNull String[] packageNames, @UserIdInt int userId, int callingUid) { - if (!isSuspendAllowedForUser(userId, callingUid)) { + if (!isSuspendAllowedForUser(snapshot, userId, callingUid)) { Slog.w(TAG, "Cannot suspend due to restrictions on user " + userId); return packageNames; } final ArraySet<String> unactionablePackages = new ArraySet<>(); - final boolean[] canSuspend = canSuspendPackageForUser(computer, packageNames, userId, + final boolean[] canSuspend = canSuspendPackageForUser(snapshot, packageNames, userId, callingUid); for (int i = 0; i < packageNames.length; i++) { if (!canSuspend[i]) { @@ -232,7 +234,7 @@ public final class SuspendPackageHelper { continue; } final PackageStateInternal packageState = - computer.getPackageStateFiltered(packageNames[i], callingUid, userId); + snapshot.getPackageStateFiltered(packageNames[i], callingUid, userId); if (packageState == null) { Slog.w(TAG, "Could not find package setting for package: " + packageNames[i]); unactionablePackages.add(packageNames[i]); @@ -250,8 +252,9 @@ public final class SuspendPackageHelper { * @return The app extras of the suspended package. */ @Nullable - Bundle getSuspendedPackageAppExtras(@NonNull String packageName, int userId, int callingUid) { - final PackageStateInternal ps = mPm.getPackageStateInternal(packageName, callingUid); + Bundle getSuspendedPackageAppExtras(@NonNull Computer snapshot, @NonNull String packageName, + int userId, int callingUid) { + final PackageStateInternal ps = snapshot.getPackageStateInternal(packageName, callingUid); if (ps == null) { return null; } @@ -329,12 +332,14 @@ public final class SuspendPackageHelper { } }); + final Computer newSnapshot = mPm.snapshotComputer(); + mPm.scheduleWritePackageRestrictions(userId); if (!unsuspendedPackages.isEmpty()) { final String[] packageArray = unsuspendedPackages.toArray( new String[unsuspendedPackages.size()]); sendMyPackageSuspendedOrUnsuspended(packageArray, false, userId); - sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_UNSUSPENDED, + sendPackagesSuspendedForUser(newSnapshot, Intent.ACTION_PACKAGES_UNSUSPENDED, packageArray, unsuspendedUids.toArray(), userId); } } @@ -348,10 +353,10 @@ public final class SuspendPackageHelper { * @return The launcher extras. */ @Nullable - Bundle getSuspendedPackageLauncherExtras(@NonNull String packageName, int userId, - int callingUid) { - final PackageStateInternal packageState = mPm.getPackageStateInternal( - packageName, callingUid); + Bundle getSuspendedPackageLauncherExtras(@NonNull Computer snapshot, + @NonNull String packageName, int userId, int callingUid) { + final PackageStateInternal packageState = + snapshot.getPackageStateInternal(packageName, callingUid); if (packageState == null) { return null; } @@ -376,9 +381,10 @@ public final class SuspendPackageHelper { * @param callingUid The caller's uid. * @return {@code true}, if the given package is suspended. */ - boolean isPackageSuspended(@NonNull String packageName, int userId, int callingUid) { - final PackageStateInternal packageState = mPm.getPackageStateInternal( - packageName, callingUid); + boolean isPackageSuspended(@NonNull Computer snapshot, @NonNull String packageName, int userId, + int callingUid) { + final PackageStateInternal packageState = + snapshot.getPackageStateInternal(packageName, callingUid); return packageState != null && packageState.getUserStateOrDefault(userId) .isSuspended(); } @@ -392,8 +398,9 @@ public final class SuspendPackageHelper { * @return The name of suspending package. */ @Nullable - String getSuspendingPackage(@NonNull String suspendedPackage, int userId, int callingUid) { - final PackageStateInternal packageState = mPm.getPackageStateInternal( + String getSuspendingPackage(@NonNull Computer snapshot, @NonNull String suspendedPackage, + int userId, int callingUid) { + final PackageStateInternal packageState = snapshot.getPackageStateInternal( suspendedPackage, callingUid); if (packageState == null) { return null; @@ -424,9 +431,10 @@ public final class SuspendPackageHelper { * @return The dialog info. */ @Nullable - SuspendDialogInfo getSuspendedDialogInfo(@NonNull String suspendedPackage, - @NonNull String suspendingPackage, int userId, int callingUid) { - final PackageStateInternal packageState = mPm.getPackageStateInternal( + SuspendDialogInfo getSuspendedDialogInfo(@NonNull Computer snapshot, + @NonNull String suspendedPackage, @NonNull String suspendingPackage, int userId, + int callingUid) { + final PackageStateInternal packageState = snapshot.getPackageStateInternal( suspendedPackage, callingUid); if (packageState == null) { return null; @@ -454,9 +462,9 @@ public final class SuspendPackageHelper { * @param callingUid The caller's uid. * @return {@code true} if the user is allowed to suspend packages by the caller. */ - boolean isSuspendAllowedForUser(int userId, int callingUid) { + boolean isSuspendAllowedForUser(@NonNull Computer snapshot, int userId, int callingUid) { final UserManagerService userManager = mInjector.getUserManagerService(); - return isCallerDeviceOrProfileOwner(userId, callingUid) + return isCallerDeviceOrProfileOwner(snapshot, userId, callingUid) || (!userManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL, userId) && !userManager.hasUserRestriction(UserManager.DISALLOW_UNINSTALL_APPS, userId)); } @@ -471,21 +479,23 @@ public final class SuspendPackageHelper { * @return An array containing results of the checks */ @NonNull - boolean[] canSuspendPackageForUser(@NonNull Computer computer, @NonNull String[] packageNames, + boolean[] canSuspendPackageForUser(@NonNull Computer snapshot, @NonNull String[] packageNames, int userId, int callingUid) { final boolean[] canSuspend = new boolean[packageNames.length]; - final boolean isCallerOwner = isCallerDeviceOrProfileOwner(userId, callingUid); + final boolean isCallerOwner = isCallerDeviceOrProfileOwner(snapshot, userId, callingUid); final long token = Binder.clearCallingIdentity(); try { final DefaultAppProvider defaultAppProvider = mInjector.getDefaultAppProvider(); final String activeLauncherPackageName = defaultAppProvider.getDefaultHome(userId); final String dialerPackageName = defaultAppProvider.getDefaultDialer(userId); - final String requiredInstallerPackage = getKnownPackageName(PACKAGE_INSTALLER, userId); + final String requiredInstallerPackage = + getKnownPackageName(snapshot, PACKAGE_INSTALLER, userId); final String requiredUninstallerPackage = - getKnownPackageName(PACKAGE_UNINSTALLER, userId); - final String requiredVerifierPackage = getKnownPackageName(PACKAGE_VERIFIER, userId); + getKnownPackageName(snapshot, PACKAGE_UNINSTALLER, userId); + final String requiredVerifierPackage = + getKnownPackageName(snapshot, PACKAGE_VERIFIER, userId); final String requiredPermissionControllerPackage = - getKnownPackageName(PACKAGE_PERMISSION_CONTROLLER, userId); + getKnownPackageName(snapshot, PACKAGE_PERMISSION_CONTROLLER, userId); for (int i = 0; i < packageNames.length; i++) { canSuspend[i] = false; final String packageName = packageNames[i]; @@ -530,7 +540,7 @@ public final class SuspendPackageHelper { + "\": protected package"); continue; } - if (!isCallerOwner && computer.getBlockUninstall(userId, packageName)) { + if (!isCallerOwner && snapshot.getBlockUninstall(userId, packageName)) { Slog.w(TAG, "Cannot suspend package \"" + packageName + "\": blocked by admin"); continue; @@ -539,7 +549,7 @@ public final class SuspendPackageHelper { // Cannot suspend static shared libs as they are considered // a part of the using app (emulating static linking). Also // static libs are installed always on internal storage. - PackageStateInternal packageState = computer.getPackageStateInternal(packageName); + PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); AndroidPackage pkg = packageState == null ? null : packageState.getPkg(); if (pkg != null) { // Cannot suspend SDK libs as they are controlled by SDK manager. @@ -580,8 +590,8 @@ public final class SuspendPackageHelper { * @param userId The user where packages reside. */ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE) - void sendPackagesSuspendedForUser(@NonNull String intent, @NonNull String[] pkgList, - @NonNull int[] uidList, int userId) { + void sendPackagesSuspendedForUser(@NonNull Computer snapshot, @NonNull String intent, + @NonNull String[] pkgList, @NonNull int[] uidList, int userId) { final List<List<String>> pkgsToSend = new ArrayList(pkgList.length); final List<IntArray> uidsToSend = new ArrayList(pkgList.length); final List<SparseArray<int[]>> allowListsToSend = new ArrayList(pkgList.length); @@ -592,8 +602,8 @@ public final class SuspendPackageHelper { final String pkgName = pkgList[i]; final int uid = uidList[i]; SparseArray<int[]> allowList = mInjector.getAppsFilter().getVisibilityAllowList( - mPm.getPackageStateInternal(pkgName, SYSTEM_UID), - userIds, mPm.getPackageStates()); + snapshot.getPackageStateInternal(pkgName, SYSTEM_UID), + userIds, snapshot.getPackageStates()); if (allowList == null) { allowList = new SparseArray<>(0); } @@ -628,19 +638,22 @@ public final class SuspendPackageHelper { } } - private String getKnownPackageName(@KnownPackage int knownPackage, int userId) { - final String[] knownPackages = mPm.getKnownPackageNamesInternal(knownPackage, userId); + private String getKnownPackageName(@NonNull Computer snapshot, @KnownPackage int knownPackage, + int userId) { + final String[] knownPackages = + mPm.getKnownPackageNamesInternal(snapshot, knownPackage, userId); return knownPackages.length > 0 ? knownPackages[0] : null; } - private boolean isCallerDeviceOrProfileOwner(int userId, int callingUid) { + private boolean isCallerDeviceOrProfileOwner(@NonNull Computer snapshot, int userId, + int callingUid) { if (callingUid == SYSTEM_UID) { return true; } final String ownerPackage = mProtectedPackages.getDeviceOwnerOrProfileOwnerPackage(userId); if (ownerPackage != null) { - return callingUid == mPm.getPackageUidInternal( - ownerPackage, 0, userId, callingUid); + return callingUid == snapshot.getPackageUidInternal(ownerPackage, 0, userId, + callingUid); } return false; } @@ -659,9 +672,10 @@ public final class SuspendPackageHelper { return; } final int[] targetUserIds = new int[] {userId}; + final Computer snapshot = mPm.snapshotComputer(); for (String packageName : affectedPackages) { final Bundle appExtras = suspended - ? getSuspendedPackageAppExtras(packageName, userId, SYSTEM_UID) + ? getSuspendedPackageAppExtras(snapshot, packageName, userId, SYSTEM_UID) : null; final Bundle intentExtras; if (appExtras != null) { diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 33476ed2678e..eae7658587f7 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -4148,11 +4148,11 @@ public class UserManagerService extends IUserManager.Stub { continue; } if (filter.direction == DefaultCrossProfileIntentFilter.Direction.TO_PARENT) { - mPm.addCrossProfileIntentFilter( + mPm.addCrossProfileIntentFilter(mPm.snapshotComputer(), filter.filter, mContext.getOpPackageName(), profileUserId, parentUserId, filter.flags); } else { - mPm.addCrossProfileIntentFilter( + mPm.addCrossProfileIntentFilter(mPm.snapshotComputer(), filter.filter, mContext.getOpPackageName(), parentUserId, profileUserId, filter.flags); } diff --git a/services/core/java/com/android/server/pm/WatchedIntentFilter.java b/services/core/java/com/android/server/pm/WatchedIntentFilter.java index 30f276e8386a..5d7a2a3bd426 100644 --- a/services/core/java/com/android/server/pm/WatchedIntentFilter.java +++ b/services/core/java/com/android/server/pm/WatchedIntentFilter.java @@ -84,7 +84,7 @@ public class WatchedIntentFilter } // Convert an {@link IntentFilter} to a {@link WatchedIntentFilter} - protected WatchedIntentFilter(IntentFilter f) { + public WatchedIntentFilter(IntentFilter f) { mFilter = new IntentFilter(f); } diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java index e28a6ea8ea6b..7e4da945709b 100644 --- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java +++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java @@ -31,13 +31,13 @@ import android.content.pm.dex.ArtManagerInternal; import android.content.pm.dex.DexMetadataHelper; import android.content.pm.dex.ISnapshotRuntimeProfileCallback; import android.content.pm.dex.PackageOptimizationInfo; -import com.android.server.pm.pkg.parsing.PackageInfoWithoutStateUtils; import android.os.Binder; import android.os.Build; import android.os.Handler; import android.os.ParcelFileDescriptor; import android.os.Process; import android.os.RemoteException; +import android.os.ServiceManager; import android.os.SystemProperties; import android.os.UserHandle; import android.system.Os; @@ -55,6 +55,7 @@ import com.android.server.pm.Installer; import com.android.server.pm.Installer.InstallerException; import com.android.server.pm.PackageManagerServiceCompilerMapping; import com.android.server.pm.parsing.pkg.AndroidPackage; +import com.android.server.pm.pkg.parsing.PackageInfoWithoutStateUtils; import dalvik.system.DexFile; import dalvik.system.VMRuntime; @@ -92,7 +93,7 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { private static final String BOOT_IMAGE_PROFILE_NAME = "android.prof"; private final Context mContext; - private final IPackageManager mPackageManager; + private IPackageManager mPackageManager; private final Object mInstallLock; @GuardedBy("mInstallLock") private final Installer mInstaller; @@ -103,10 +104,9 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { verifyTronLoggingConstants(); } - public ArtManagerService(Context context, IPackageManager pm, Installer installer, + public ArtManagerService(Context context, Installer installer, Object installLock) { mContext = context; - mPackageManager = pm; mInstaller = installer; mInstallLock = installLock; mHandler = new Handler(BackgroundThread.getHandler().getLooper()); @@ -114,6 +114,15 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { LocalServices.addService(ArtManagerInternal.class, new ArtManagerInternalImpl()); } + @NonNull + private IPackageManager getPackageManager() { + if (mPackageManager == null) { + mPackageManager = IPackageManager.Stub.asInterface( + ServiceManager.getService("package")); + } + return mPackageManager; + } + private boolean checkAndroidPermissions(int callingUid, String callingPackage) { // Callers always need this permission mContext.enforceCallingOrSelfPermission( @@ -157,7 +166,7 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { } PackageInfo info = null; try { - info = mPackageManager.getPackageInfo(packageName, /*flags*/ 0, /*userId*/ 0); + info = getPackageManager().getPackageInfo(packageName, /*flags*/ 0, /*userId*/ 0); } catch (RemoteException ignored) { // Should not happen. } @@ -221,7 +230,7 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { // TODO(calin): consider adding an API to PMS which can retrieve the // PackageParser.Package. - info = mPackageManager.getPackageInfo(packageName, /*flags*/ 0, /*userId*/ 0); + info = getPackageManager().getPackageInfo(packageName, /*flags*/ 0, /*userId*/ 0); } catch (RemoteException ignored) { // Should not happen. } diff --git a/services/core/java/com/android/server/pm/dex/DexManager.java b/services/core/java/com/android/server/pm/dex/DexManager.java index 5371454db43c..17109e97ddf1 100644 --- a/services/core/java/com/android/server/pm/dex/DexManager.java +++ b/services/core/java/com/android/server/pm/dex/DexManager.java @@ -23,6 +23,8 @@ import static com.android.server.pm.dex.PackageDexUsage.PackageUseInfo; import static java.util.function.Function.identity; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageManager; @@ -33,6 +35,7 @@ import android.os.BatteryManager; import android.os.FileUtils; import android.os.PowerManager; import android.os.RemoteException; +import android.os.ServiceManager; import android.os.SystemProperties; import android.os.UserHandle; import android.os.storage.StorageManager; @@ -109,7 +112,7 @@ public class DexManager { // record class loaders or ISAs.) private final DynamicCodeLogger mDynamicCodeLogger; - private final IPackageManager mPackageManager; + private IPackageManager mPackageManager; private final PackageDexOptimizer mPackageDexOptimizer; private final Object mInstallLock; @GuardedBy("mInstallLock") @@ -128,16 +131,22 @@ public class DexManager { private static int DEX_SEARCH_FOUND_SPLIT = 2; // dex file is a split apk private static int DEX_SEARCH_FOUND_SECONDARY = 3; // dex file is a secondary dex - public DexManager(Context context, IPackageManager pms, PackageDexOptimizer pdo, - Installer installer, Object installLock) { + public DexManager(Context context, PackageDexOptimizer pdo, Installer installer, + Object installLock) { + this(context, pdo, installer, installLock, null); + } + + @VisibleForTesting + public DexManager(Context context, PackageDexOptimizer pdo, Installer installer, + Object installLock, @Nullable IPackageManager packageManager) { mContext = context; mPackageCodeLocationsCache = new HashMap<>(); mPackageDexUsage = new PackageDexUsage(); - mPackageManager = pms; mPackageDexOptimizer = pdo; mInstaller = installer; mInstallLock = installLock; - mDynamicCodeLogger = new DynamicCodeLogger(pms, installer); + mDynamicCodeLogger = new DynamicCodeLogger(installer); + mPackageManager = packageManager; // This is currently checked to handle tests that pass in a null context. // TODO(b/174783329): Modify the tests to pass in a mocked Context, PowerManager, @@ -157,6 +166,15 @@ public class DexManager { } } + @NonNull + private IPackageManager getPackageManager() { + if (mPackageManager == null) { + mPackageManager = IPackageManager.Stub.asInterface( + ServiceManager.getService("package")); + } + return mPackageManager; + } + public DynamicCodeLogger getDynamicCodeLogger() { return mDynamicCodeLogger; } @@ -529,7 +547,7 @@ public class DexManager { PackageInfo pkg; try { - pkg = mPackageManager.getPackageInfo(packageName, /*flags*/0, + pkg = getPackageManager().getPackageInfo(packageName, /*flags*/0, dexUseInfo.getOwnerUserId()); } catch (RemoteException e) { throw new AssertionError(e); @@ -673,7 +691,7 @@ public class DexManager { // to get back the real app uid and its storage kind. These are only used // to perform extra validation in installd. // TODO(calin): maybe a bit overkill. - pkg = mPackageManager.getPackageInfo(packageName, /*flags*/0, + pkg = getPackageManager().getPackageInfo(packageName, /*flags*/0, dexUseInfo.getOwnerUserId()); } catch (RemoteException ignore) { // Can't happen, DexManager is local. diff --git a/services/core/java/com/android/server/pm/dex/DynamicCodeLogger.java b/services/core/java/com/android/server/pm/dex/DynamicCodeLogger.java index 75b4e38e42f5..9b94e993f967 100644 --- a/services/core/java/com/android/server/pm/dex/DynamicCodeLogger.java +++ b/services/core/java/com/android/server/pm/dex/DynamicCodeLogger.java @@ -19,11 +19,13 @@ package com.android.server.pm.dex; import static com.android.server.pm.dex.PackageDynamicCodeLoading.FILE_TYPE_DEX; import static com.android.server.pm.dex.PackageDynamicCodeLoading.FILE_TYPE_NATIVE; +import android.annotation.NonNull; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageManager; import android.content.pm.PackageInfo; import android.os.FileUtils; import android.os.RemoteException; +import android.os.ServiceManager; import android.os.UserHandle; import android.os.storage.StorageManager; import android.util.EventLog; @@ -58,20 +60,30 @@ public class DynamicCodeLogger { private static final String DCL_DEX_SUBTAG = "dcl"; private static final String DCL_NATIVE_SUBTAG = "dcln"; - private final IPackageManager mPackageManager; + private IPackageManager mPackageManager; private final PackageDynamicCodeLoading mPackageDynamicCodeLoading; private final Installer mInstaller; - DynamicCodeLogger(IPackageManager pms, Installer installer) { - this(pms, installer, new PackageDynamicCodeLoading()); + DynamicCodeLogger(Installer installer) { + mInstaller = installer; + mPackageDynamicCodeLoading = new PackageDynamicCodeLoading(); } @VisibleForTesting - DynamicCodeLogger(IPackageManager pms, Installer installer, - PackageDynamicCodeLoading packageDynamicCodeLoading) { - mPackageManager = pms; - mPackageDynamicCodeLoading = packageDynamicCodeLoading; + DynamicCodeLogger(@NonNull IPackageManager packageManager, @NonNull Installer installer, + @NonNull PackageDynamicCodeLoading packageDynamicCodeLoading) { + mPackageManager = packageManager; mInstaller = installer; + mPackageDynamicCodeLoading = packageDynamicCodeLoading; + } + + @NonNull + private IPackageManager getPackageManager() { + if (mPackageManager == null) { + mPackageManager = IPackageManager.Stub.asInterface( + ServiceManager.getService("package")); + } + return mPackageManager; } public Set<String> getAllPackagesWithDynamicCodeLoading() { @@ -104,7 +116,7 @@ public class DynamicCodeLogger { try { PackageInfo ownerInfo = - mPackageManager.getPackageInfo(packageName, /*flags*/ 0, userId); + getPackageManager().getPackageInfo(packageName, /*flags*/ 0, userId); appInfo = ownerInfo == null ? null : ownerInfo.applicationInfo; } catch (RemoteException ignored) { // Can't happen, we're local. @@ -167,7 +179,7 @@ public class DynamicCodeLogger { loadingUid = appInfo.uid; } else { try { - loadingUid = mPackageManager.getPackageUid(loadingPackageName, /*flags*/ 0, + loadingUid = getPackageManager().getPackageUid(loadingPackageName, /*flags*/ 0, userId); } catch (RemoteException ignored) { // Can't happen, we're local. @@ -223,7 +235,7 @@ public class DynamicCodeLogger { public void recordNative(int loadingUid, String path) { String[] packages; try { - packages = mPackageManager.getPackagesForUid(loadingUid); + packages = getPackageManager().getPackagesForUid(loadingUid); if (packages == null || packages.length == 0) { return; } diff --git a/services/core/java/com/android/server/pm/dex/OWNERS b/services/core/java/com/android/server/pm/dex/OWNERS index 052a4ca52afd..5ca8ddd1fe17 100644 --- a/services/core/java/com/android/server/pm/dex/OWNERS +++ b/services/core/java/com/android/server/pm/dex/OWNERS @@ -1,3 +1,4 @@ alanstokes@google.com jiakaiz@google.com ngeoffray@google.com +mast@google.com diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 90842619c31e..d0609307e6a8 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -3291,10 +3291,13 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } else if (pkg.isSystemExt()) { permissions = systemConfig.getSystemExtPrivAppPermissions(pkg.getPackageName()); } else if (containingApexPackageName != null) { + final ApexManager apexManager = ApexManager.getInstance(); + final String apexName = apexManager.getApexModuleNameForPackageName( + containingApexPackageName); final Set<String> privAppPermissions = systemConfig.getPrivAppPermissions( pkg.getPackageName()); final Set<String> apexPermissions = systemConfig.getApexPrivAppPermissions( - containingApexPackageName, pkg.getPackageName()); + apexName, pkg.getPackageName()); if (privAppPermissions != null) { // TODO(andreionea): Remove check as soon as all apk-in-apex // permission allowlists are migrated. diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 60ede3bcda4d..80877382f75a 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -1664,6 +1664,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void hideCurrentInputMethodForBubbles() { + enforceStatusBarService(); final long token = Binder.clearCallingIdentity(); try { InputMethodManagerInternal.get().hideCurrentInputMethod( diff --git a/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java b/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java index 30e261725a73..092853f298c2 100644 --- a/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java +++ b/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java @@ -39,7 +39,7 @@ import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener; import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; -import android.telephony.TelephonyManager.CarrierPrivilegesListener; +import android.telephony.TelephonyManager.CarrierPrivilegesCallback; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; @@ -98,8 +98,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { @NonNull private final OnSubscriptionsChangedListener mSubscriptionChangedListener; @NonNull - private final List<CarrierPrivilegesListener> mCarrierPrivilegesChangedListeners = - new ArrayList<>(); + private final List<CarrierPrivilegesCallback> mCarrierPrivilegesCallbacks = new ArrayList<>(); @NonNull private TelephonySubscriptionSnapshot mCurrentSnapshot; @@ -151,20 +150,21 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { executor, mSubscriptionChangedListener); mTelephonyManager.registerTelephonyCallback(executor, mActiveDataSubIdListener); - registerCarrierPrivilegesListeners(); + registerCarrierPrivilegesCallbacks(); } - private void registerCarrierPrivilegesListeners() { + // TODO(b/221306368): Refactor with the new onCarrierServiceChange in the new CPCallback + private void registerCarrierPrivilegesCallbacks() { final HandlerExecutor executor = new HandlerExecutor(mHandler); final int modemCount = mTelephonyManager.getActiveModemCount(); try { for (int i = 0; i < modemCount; i++) { - CarrierPrivilegesListener carrierPrivilegesListener = - new CarrierPrivilegesListener() { + CarrierPrivilegesCallback carrierPrivilegesCallback = + new CarrierPrivilegesCallback() { @Override public void onCarrierPrivilegesChanged( - @NonNull List<String> privilegedPackageNames, - @NonNull int[] privilegedUids) { + @NonNull Set<String> privilegedPackageNames, + @NonNull Set<Integer> privilegedUids) { // Re-trigger the synchronous check (which is also very cheap due // to caching in CarrierPrivilegesTracker). This allows consistency // with the onSubscriptionsChangedListener and broadcasts. @@ -172,9 +172,9 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { } }; - mTelephonyManager.addCarrierPrivilegesListener( - i, executor, carrierPrivilegesListener); - mCarrierPrivilegesChangedListeners.add(carrierPrivilegesListener); + mTelephonyManager.registerCarrierPrivilegesCallback( + i, executor, carrierPrivilegesCallback); + mCarrierPrivilegesCallbacks.add(carrierPrivilegesCallback); } } catch (IllegalArgumentException e) { Slog.wtf(TAG, "Encounted exception registering carrier privileges listeners", e); @@ -191,15 +191,15 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { mSubscriptionManager.removeOnSubscriptionsChangedListener(mSubscriptionChangedListener); mTelephonyManager.unregisterTelephonyCallback(mActiveDataSubIdListener); - unregisterCarrierPrivilegesListeners(); + unregisterCarrierPrivilegesCallbacks(); } - private void unregisterCarrierPrivilegesListeners() { - for (CarrierPrivilegesListener carrierPrivilegesListener : - mCarrierPrivilegesChangedListeners) { - mTelephonyManager.removeCarrierPrivilegesListener(carrierPrivilegesListener); + private void unregisterCarrierPrivilegesCallbacks() { + for (CarrierPrivilegesCallback carrierPrivilegesCallback : + mCarrierPrivilegesCallbacks) { + mTelephonyManager.unregisterCarrierPrivilegesCallback(carrierPrivilegesCallback); } - mCarrierPrivilegesChangedListeners.clear(); + mCarrierPrivilegesCallbacks.clear(); } /** @@ -283,7 +283,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { } private void handleActionMultiSimConfigChanged(Context context, Intent intent) { - unregisterCarrierPrivilegesListeners(); + unregisterCarrierPrivilegesCallbacks(); // Clear invalid slotIds from the mReadySubIdsBySlotId map. final int modemCount = mTelephonyManager.getActiveModemCount(); @@ -296,7 +296,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { } } - registerCarrierPrivilegesListeners(); + registerCarrierPrivilegesCallbacks(); handleSubscriptionsChanged(); } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 677babea4dd4..883ce99d313d 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2476,7 +2476,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } private boolean transferSplashScreenIfNeeded() { - if (!mHandleExitSplashScreen || mStartingSurface == null || mStartingWindow == null + if (finishing || !mHandleExitSplashScreen || mStartingSurface == null + || mStartingWindow == null || mTransferringSplashScreenState == TRANSFER_SPLASH_SCREEN_FINISH) { return false; } @@ -2914,7 +2915,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A */ boolean supportsPictureInPicture() { return mAtmService.mSupportsPictureInPicture && isActivityTypeStandardOrUndefined() - && info.supportsPictureInPicture(); + && info.supportsPictureInPicture() + && (mDisplayContent != null && mDisplayContent.mDwpcHelper.isWindowingModeSupported( + WINDOWING_MODE_PINNED)); } /** diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java index 64f426187fd2..eb5ca9c2f43b 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java @@ -402,7 +402,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { activities.add(r.info); }); } - if (!displayContent.mDwpcHelper.canContainActivities(activities)) { + if (!displayContent.mDwpcHelper.canContainActivities(activities, + displayContent.getWindowingMode())) { return false; } } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index d1b9a7895058..59ba4e770b5d 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -4270,17 +4270,17 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp */ @VisibleForTesting SurfaceControl computeImeParent() { + if (mImeLayeringTarget != null && mImeInputTarget != null + && mImeLayeringTarget.mActivityRecord != mImeInputTarget.getActivityRecord()) { + // Do not change parent if the window hasn't requested IME. + return null; + } // Attach it to app if the target is part of an app and such app is covering the entire // screen. If it's not covering the entire screen the IME might extend beyond the apps // bounds. if (shouldImeAttachedToApp()) { - if (mImeLayeringTarget.mActivityRecord != mImeInputTarget.getActivityRecord()) { - // Do not change parent if the window hasn't requested IME. - return null; - } return mImeLayeringTarget.mActivityRecord.getSurfaceControl(); } - // Otherwise, we just attach it to where the display area policy put it. return mImeWindowsContainer.getParent() != null ? mImeWindowsContainer.getParent().getSurfaceControl() : null; diff --git a/services/core/java/com/android/server/wm/DisplayWindowPolicyControllerHelper.java b/services/core/java/com/android/server/wm/DisplayWindowPolicyControllerHelper.java index 60d2a5da9286..27d46ecfb91a 100644 --- a/services/core/java/com/android/server/wm/DisplayWindowPolicyControllerHelper.java +++ b/services/core/java/com/android/server/wm/DisplayWindowPolicyControllerHelper.java @@ -18,6 +18,7 @@ package com.android.server.wm; import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.WindowConfiguration; import android.content.pm.ActivityInfo; import android.os.UserHandle; import android.util.ArraySet; @@ -63,13 +64,14 @@ class DisplayWindowPolicyControllerHelper { } /** - * @see DisplayWindowPolicyController#canContainActivities(List) + * @see DisplayWindowPolicyController#canContainActivities(List, int) */ - public boolean canContainActivities(@NonNull List<ActivityInfo> activities) { + public boolean canContainActivities(@NonNull List<ActivityInfo> activities, + @WindowConfiguration.WindowingMode int windowingMode) { if (mDisplayWindowPolicyController == null) { return true; } - return mDisplayWindowPolicyController.canContainActivities(activities); + return mDisplayWindowPolicyController.canContainActivities(activities, windowingMode); } /** @@ -126,6 +128,17 @@ class DisplayWindowPolicyControllerHelper { } } + /** + * @see DisplayWindowPolicyController#isWindowingModeSupported(int) + */ + public final boolean isWindowingModeSupported( + @WindowConfiguration.WindowingMode int windowingMode) { + if (mDisplayWindowPolicyController == null) { + return true; + } + return mDisplayWindowPolicyController.isWindowingModeSupported(windowingMode); + } + void dump(String prefix, PrintWriter pw) { if (mDisplayWindowPolicyController != null) { pw.println(); diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index 398816b331cb..3951c567e89c 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -424,14 +424,12 @@ class InsetsPolicy { return state; } } else if (w.mActivityRecord != null && w.mActivityRecord.mImeInsetsFrozenUntilStartInput) { - // During switching tasks with gestural navigation, if the IME is attached to - // one app window on that time, even the next app window is behind the IME window, - // conceptually the window should not receive the IME insets if the next window is - // not eligible IME requester and ready to show IME on top of it. - final boolean shouldImeAttachedToApp = mDisplayContent.shouldImeAttachedToApp(); + // During switching tasks with gestural navigation, before the next IME input target + // starts the input, we should adjust and freeze the last IME visibility of the window + // in case delivering obsoleted IME insets state during transitioning. final InsetsSource originalImeSource = originalState.peekSource(ITYPE_IME); - if (shouldImeAttachedToApp && originalImeSource != null) { + if (originalImeSource != null) { final boolean imeVisibility = w.mActivityRecord.mLastImeShown || w.getRequestedVisibility(ITYPE_IME); final InsetsState state = copyState ? new InsetsState(originalState) diff --git a/services/core/java/com/android/server/wm/MirrorActiveUids.java b/services/core/java/com/android/server/wm/MirrorActiveUids.java index 4e7f1d4cca18..b9aa9599babe 100644 --- a/services/core/java/com/android/server/wm/MirrorActiveUids.java +++ b/services/core/java/com/android/server/wm/MirrorActiveUids.java @@ -19,7 +19,7 @@ package com.android.server.wm; import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT; import android.app.ActivityManager.ProcessState; -import android.util.SparseArray; +import android.util.SparseIntArray; import java.io.PrintWriter; @@ -29,15 +29,14 @@ import java.io.PrintWriter; * adjustment) or getting state from window manager (background start check). */ class MirrorActiveUids { - private final SparseArray<UidRecord> mUidStates = new SparseArray<>(); + /** Uid -> process state. */ + private final SparseIntArray mUidStates = new SparseIntArray(); + + /** Uid -> number of non-app visible windows belong to the uid. */ + private final SparseIntArray mNumNonAppVisibleWindowMap = new SparseIntArray(); synchronized void onUidActive(int uid, int procState) { - UidRecord r = mUidStates.get(uid); - if (r == null) { - r = new UidRecord(); - mUidStates.put(uid, r); - } - r.mProcState = procState; + mUidStates.put(uid, procState); } synchronized void onUidInactive(int uid) { @@ -45,22 +44,28 @@ class MirrorActiveUids { } synchronized void onUidProcStateChanged(int uid, int procState) { - final UidRecord r = mUidStates.get(uid); - if (r != null) { - r.mProcState = procState; + final int index = mUidStates.indexOfKey(uid); + if (index >= 0) { + mUidStates.setValueAt(index, procState); } } synchronized @ProcessState int getUidState(int uid) { - final UidRecord r = mUidStates.get(uid); - return r != null ? r.mProcState : PROCESS_STATE_NONEXISTENT; + return mUidStates.get(uid, PROCESS_STATE_NONEXISTENT); } /** Called when the surface of non-application (exclude toast) window is shown or hidden. */ synchronized void onNonAppSurfaceVisibilityChanged(int uid, boolean visible) { - final UidRecord r = mUidStates.get(uid); - if (r != null) { - r.mNumNonAppVisibleWindow += visible ? 1 : -1; + final int index = mNumNonAppVisibleWindowMap.indexOfKey(uid); + if (index >= 0) { + final int num = mNumNonAppVisibleWindowMap.valueAt(index) + (visible ? 1 : -1); + if (num > 0) { + mNumNonAppVisibleWindowMap.setValueAt(index, num); + } else { + mNumNonAppVisibleWindowMap.removeAt(index); + } + } else if (visible) { + mNumNonAppVisibleWindowMap.append(uid, 1); } } @@ -70,23 +75,15 @@ class MirrorActiveUids { * {@link VisibleActivityProcessTracker}. */ synchronized boolean hasNonAppVisibleWindow(int uid) { - final UidRecord r = mUidStates.get(uid); - return r != null && r.mNumNonAppVisibleWindow > 0; + return mNumNonAppVisibleWindowMap.get(uid) > 0; } synchronized void dump(PrintWriter pw, String prefix) { - pw.print(prefix + "NumNonAppVisibleWindowByUid:["); - for (int i = mUidStates.size() - 1; i >= 0; i--) { - final UidRecord r = mUidStates.valueAt(i); - if (r.mNumNonAppVisibleWindow > 0) { - pw.print(" " + mUidStates.keyAt(i) + ":" + r.mNumNonAppVisibleWindow); - } + pw.print(prefix + "NumNonAppVisibleWindowUidMap:["); + for (int i = mNumNonAppVisibleWindowMap.size() - 1; i >= 0; i--) { + pw.print(" " + mNumNonAppVisibleWindowMap.keyAt(i) + ":" + + mNumNonAppVisibleWindowMap.valueAt(i)); } pw.println("]"); } - - private static final class UidRecord { - @ProcessState int mProcState; - int mNumNonAppVisibleWindow; - } } diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java index a407021c7594..a4d338c06708 100644 --- a/services/core/java/com/android/server/wm/RecentsAnimationController.java +++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java @@ -553,10 +553,6 @@ public class RecentsAnimationController implements DeathRecipient { mPendingStart = false; - // Perform layout if it was scheduled before to make sure that we get correct content - // insets for the target app window after a rotation - mDisplayContent.performLayout(false /* initial */, false /* updateInputWindows */); - final Rect contentInsets; final WindowState targetAppMainWindow = getTargetAppMainWindow(); if (targetAppMainWindow != null) { diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 7f3244796334..21ca4bb6038b 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -216,6 +216,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe } Task getTransientLaunchRestoreTarget(@NonNull WindowContainer container) { + if (mTransientLaunches == null) return null; for (int i = 0; i < mTransientLaunches.size(); ++i) { if (mTransientLaunches.keyAt(i).isDescendantOf(container)) { return mTransientLaunches.valueAt(i); diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java index 8223b8c86c5b..6f503c7dd941 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java @@ -116,7 +116,7 @@ public final class BackgroundDexOptServiceUnitTest { when(mInjector.getDataDirStorageLowBytes()).thenReturn(STORAGE_LOW_BYTES); when(mInjector.getDexOptThermalCutoff()).thenReturn(PowerManager.THERMAL_STATUS_CRITICAL); when(mInjector.getCurrentThermalStatus()).thenReturn(PowerManager.THERMAL_STATUS_NONE); - when(mDexOptHelper.getOptimizablePackages()).thenReturn(DEFAULT_PACKAGE_LIST); + when(mDexOptHelper.getOptimizablePackages(any())).thenReturn(DEFAULT_PACKAGE_LIST); when(mDexOptHelper.performDexOptWithStatus(any())).thenReturn( PackageDexOptimizer.DEX_OPT_PERFORMED); @@ -158,7 +158,7 @@ public final class BackgroundDexOptServiceUnitTest { @Test public void testNoExecutionForNoOptimizablePackages() { initUntilBootCompleted(); - when(mDexOptHelper.getOptimizablePackages()).thenReturn(EMPTY_PACKAGE_LIST); + when(mDexOptHelper.getOptimizablePackages(any())).thenReturn(EMPTY_PACKAGE_LIST); assertThat(mService.onStartJob(mJobServiceForPostBoot, mJobParametersForPostBoot)).isFalse(); diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/OWNERS b/services/tests/mockingservicestests/src/com/android/server/pm/OWNERS index 46b797b83f1d..5181af14ff65 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/OWNERS +++ b/services/tests/mockingservicestests/src/com/android/server/pm/OWNERS @@ -1,3 +1,4 @@ include /services/core/java/com/android/server/pm/OWNERS +per-file BackgroundDexOptServiceUnitTest.java = file:/services/core/java/com/android/server/pm/dex/OWNERS per-file StagingManagerTest.java = dariofreni@google.com, ioffe@google.com, olilan@google.com diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt b/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt index 13199032a223..537a0280e24b 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt @@ -157,7 +157,7 @@ class PackageManagerServiceHibernationTests { rule.system().validateFinalState() whenever(appHibernationManager.isHibernatingGlobally(TEST_PACKAGE_2_NAME)).thenReturn(true) - val optimizablePkgs = DexOptHelper(pm).optimizablePackages + val optimizablePkgs = DexOptHelper(pm).getOptimizablePackages(pm.snapshotComputer()) assertTrue(optimizablePkgs.contains(TEST_PACKAGE_NAME)) assertFalse(optimizablePkgs.contains(TEST_PACKAGE_2_NAME)) diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt index b063d22de2bb..97b52a98b266 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt @@ -24,7 +24,6 @@ import android.os.Build import android.os.storage.StorageManager import android.util.ArrayMap import android.util.PackageUtils -import com.android.internal.util.FunctionalUtils import com.android.server.SystemConfig.SharedLibraryEntry import com.android.server.compat.PlatformCompat import com.android.server.extendedtestutils.wheneverStatic @@ -35,7 +34,6 @@ import com.android.server.pm.parsing.pkg.ParsedPackage import com.android.server.testutils.any import com.android.server.testutils.eq import com.android.server.testutils.mock -import com.android.server.testutils.mockThrowOnUnmocked import com.android.server.testutils.nullable import com.android.server.testutils.spy import com.android.server.testutils.whenever @@ -59,6 +57,7 @@ import kotlin.test.assertFailsWith import kotlin.test.assertFalse import kotlin.test.assertTrue +@Ignore("b/216603387") @RunWith(JUnit4::class) class SharedLibrariesImplTest { @@ -85,6 +84,7 @@ class SharedLibrariesImplTest { private lateinit var mSharedLibrariesImpl: SharedLibrariesImpl private lateinit var mPms: PackageManagerService private lateinit var mSettings: Settings + private lateinit var mComputer: Computer @Mock private lateinit var mDeletePackageHelper: DeletePackageHelper @@ -114,22 +114,16 @@ class SharedLibrariesImplTest { mSharedLibrariesImpl.setDeletePackageHelper(mDeletePackageHelper) addExistingSharedLibraries() + mComputer = mock { + whenever(sharedLibraries) { mSharedLibrariesImpl.sharedLibraries } + whenever(resolveInternalPackageName(anyString(), anyLong())) { arguments[0] } + } + whenever(mSettings.getPackageLPr(any())) { mExistingSettings[arguments[0]] } whenever(mRule.mocks().injector.getSystemService(StorageManager::class.java)) .thenReturn(mStorageManager) whenever(mStorageManager.findPathForUuid(nullable())).thenReturn(mFile) - doAnswer { it.arguments[0] }.`when`(mPms).resolveInternalPackageName(any(), any()) - doAnswer { - mockThrowOnUnmocked<Computer> { - whenever(sharedLibraries) { mSharedLibrariesImpl.sharedLibraries } - whenever(resolveInternalPackageName(anyString(), anyLong())) { - mPms.resolveInternalPackageName(getArgument(0), getArgument(1)) - } - whenever(getPackageStateInternal(anyString())) { - mPms.getPackageStateInternal(getArgument(0)) - } - } - }.`when`(mPms).snapshotComputer() + doAnswer { mComputer }.`when`(mPms).snapshotComputer() whenever(mDeletePackageHelper.deletePackageX(any(), any(), any(), any(), any())) .thenReturn(PackageManager.DELETE_SUCCEEDED) whenever(mRule.mocks().injector.compatibility).thenReturn(mPlatformCompat) @@ -189,7 +183,8 @@ class SharedLibrariesImplTest { @Test fun removeSharedLibrary() { - doAnswer { mutableListOf(VersionedPackage(CONSUMER_PACKAGE_NAME, 1L)) }.`when`(mPms) + doAnswer { mutableListOf(VersionedPackage(CONSUMER_PACKAGE_NAME, 1L)) } + .`when`(mComputer) .getPackagesUsingSharedLibrary(any(), any(), any(), any()) val staticInfo = mSharedLibrariesImpl .getSharedLibraryInfo(STATIC_LIB_NAME, STATIC_LIB_VERSION)!! @@ -253,7 +248,6 @@ class SharedLibrariesImplTest { assertThat(testPackageSetting.usesLibraryFiles).contains(builtinLibPath(BUILTIN_LIB_NAME)) } - @Ignore("b/216603387") @Test fun updateSharedLibraries_withStaticLibPackage() { val testPackageSetting = mExistingSettings[STATIC_LIB_PACKAGE_NAME]!! @@ -266,7 +260,6 @@ class SharedLibrariesImplTest { assertThat(testPackageSetting.usesLibraryFiles).contains(apkPath(DYNAMIC_LIB_PACKAGE_NAME)) } - @Ignore("b/216603387") @Test fun updateSharedLibraries_withConsumerPackage() { val testPackageSetting = mExistingSettings[CONSUMER_PACKAGE_NAME]!! @@ -280,7 +273,6 @@ class SharedLibrariesImplTest { assertThat(testPackageSetting.usesLibraryFiles).contains(apkPath(STATIC_LIB_PACKAGE_NAME)) } - @Ignore("b/216603387") @Test fun updateAllSharedLibraries() { mExistingSettings.forEach { diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt index 5230ea7304c8..4818573e9ae5 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt @@ -104,9 +104,9 @@ class SuspendPackageHelperTest { pms, rule.mocks().injector, broadcastHelper, protectedPackages) defaultAppProvider = rule.mocks().defaultAppProvider testHandler = rule.mocks().handler - packageSetting1 = pms.getPackageStateInternal(TEST_PACKAGE_1)!! - packageSetting2 = pms.getPackageStateInternal(TEST_PACKAGE_2)!! - ownerSetting = pms.getPackageStateInternal(DEVICE_OWNER_PACKAGE)!! + packageSetting1 = pms.snapshotComputer().getPackageStateInternal(TEST_PACKAGE_1)!! + packageSetting2 = pms.snapshotComputer().getPackageStateInternal(TEST_PACKAGE_2)!! + ownerSetting = pms.snapshotComputer().getPackageStateInternal(DEVICE_OWNER_PACKAGE)!! deviceOwnerUid = UserHandle.getUid(TEST_USER_ID, ownerSetting.appId) packagesToSuspend = arrayOf(TEST_PACKAGE_1, TEST_PACKAGE_2) uidsToSuspend = intArrayOf(packageSetting1.appId, packageSetting2.appId) @@ -270,7 +270,7 @@ class SuspendPackageHelperTest { testHandler.flush() assertThat(failedNames).isEmpty() - val result = suspendPackageHelper.getSuspendedPackageAppExtras( + val result = suspendPackageHelper.getSuspendedPackageAppExtras(pms.snapshotComputer(), TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)!! assertThat(result.getString(TEST_PACKAGE_1)).isEqualTo(TEST_PACKAGE_1) @@ -286,13 +286,13 @@ class SuspendPackageHelperTest { null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid) testHandler.flush() assertThat(failedNames).isEmpty() - assertThat(suspendPackageHelper.getSuspendingPackage( + assertThat(suspendPackageHelper.getSuspendingPackage(pms.snapshotComputer(), TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isEqualTo(DEVICE_OWNER_PACKAGE) - assertThat(suspendPackageHelper.getSuspendingPackage( + assertThat(suspendPackageHelper.getSuspendingPackage(pms.snapshotComputer(), TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isEqualTo(DEVICE_OWNER_PACKAGE) - assertThat(suspendPackageHelper.getSuspendedPackageAppExtras( + assertThat(suspendPackageHelper.getSuspendedPackageAppExtras(pms.snapshotComputer(), TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isNotNull() - assertThat(suspendPackageHelper.getSuspendedPackageAppExtras( + assertThat(suspendPackageHelper.getSuspendedPackageAppExtras(pms.snapshotComputer(), TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isNotNull() suspendPackageHelper.removeSuspensionsBySuspendingPackage(pms.snapshotComputer(), @@ -311,13 +311,13 @@ class SuspendPackageHelperTest { nullable(), nullable(), any(), eq(TEST_PACKAGE_2), nullable(), any(), any(), nullable(), nullable()) - assertThat(suspendPackageHelper.getSuspendingPackage( + assertThat(suspendPackageHelper.getSuspendingPackage(pms.snapshotComputer(), TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isNull() - assertThat(suspendPackageHelper.getSuspendingPackage( + assertThat(suspendPackageHelper.getSuspendingPackage(pms.snapshotComputer(), TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isNull() - assertThat(suspendPackageHelper.getSuspendedPackageAppExtras( + assertThat(suspendPackageHelper.getSuspendedPackageAppExtras(pms.snapshotComputer(), TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isNull() - assertThat(suspendPackageHelper.getSuspendedPackageAppExtras( + assertThat(suspendPackageHelper.getSuspendedPackageAppExtras(pms.snapshotComputer(), TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isNull() } @@ -331,7 +331,7 @@ class SuspendPackageHelperTest { testHandler.flush() assertThat(failedNames).isEmpty() - val result = suspendPackageHelper.getSuspendedPackageLauncherExtras( + val result = suspendPackageHelper.getSuspendedPackageLauncherExtras(pms.snapshotComputer(), TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)!! assertThat(result.getString(TEST_PACKAGE_2)).isEqualTo(TEST_PACKAGE_2) @@ -346,7 +346,7 @@ class SuspendPackageHelperTest { testHandler.flush() assertThat(failedNames).isEmpty() - assertThat(suspendPackageHelper.isPackageSuspended( + assertThat(suspendPackageHelper.isPackageSuspended(pms.snapshotComputer(), TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isTrue() } @@ -360,7 +360,7 @@ class SuspendPackageHelperTest { testHandler.flush() assertThat(failedNames).isEmpty() - assertThat(suspendPackageHelper.getSuspendingPackage( + assertThat(suspendPackageHelper.getSuspendingPackage(pms.snapshotComputer(), TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isEqualTo(DEVICE_OWNER_PACKAGE) } @@ -375,7 +375,7 @@ class SuspendPackageHelperTest { testHandler.flush() assertThat(failedNames).isEmpty() - val result = suspendPackageHelper.getSuspendedDialogInfo( + val result = suspendPackageHelper.getSuspendedDialogInfo(pms.snapshotComputer(), TEST_PACKAGE_1, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)!! assertThat(result.title).isEqualTo(TEST_PACKAGE_1) @@ -387,8 +387,8 @@ class SuspendPackageHelperTest { mockAllowList(packageSetting1, allowList(10001, 10002, 10003)) mockAllowList(packageSetting2, allowList(10001, 10002, 10003)) - suspendPackageHelper.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENDED, - packagesToSuspend, uidsToSuspend, TEST_USER_ID) + suspendPackageHelper.sendPackagesSuspendedForUser(pms.snapshotComputer(), + Intent.ACTION_PACKAGES_SUSPENDED, packagesToSuspend, uidsToSuspend, TEST_USER_ID) testHandler.flush() verify(broadcastHelper).sendPackageBroadcast(any(), nullable(), bundleCaptor.capture(), anyInt(), nullable(), nullable(), any(), nullable(), any(), nullable()) @@ -406,8 +406,8 @@ class SuspendPackageHelperTest { mockAllowList(packageSetting1, allowList(10001, 10002, 10003)) mockAllowList(packageSetting2, allowList(10001, 10002, 10007)) - suspendPackageHelper.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENDED, - packagesToSuspend, uidsToSuspend, TEST_USER_ID) + suspendPackageHelper.sendPackagesSuspendedForUser(pms.snapshotComputer(), + Intent.ACTION_PACKAGES_SUSPENDED, packagesToSuspend, uidsToSuspend, TEST_USER_ID) testHandler.flush() verify(broadcastHelper, times(2)).sendPackageBroadcast( any(), nullable(), bundleCaptor.capture(), anyInt(), nullable(), nullable(), any(), @@ -429,8 +429,8 @@ class SuspendPackageHelperTest { mockAllowList(packageSetting1, allowList(10001, 10002, 10003)) mockAllowList(packageSetting2, null) - suspendPackageHelper.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENDED, - packagesToSuspend, uidsToSuspend, TEST_USER_ID) + suspendPackageHelper.sendPackagesSuspendedForUser(pms.snapshotComputer(), + Intent.ACTION_PACKAGES_SUSPENDED, packagesToSuspend, uidsToSuspend, TEST_USER_ID) testHandler.flush() verify(broadcastHelper, times(2)).sendPackageBroadcast( any(), nullable(), bundleCaptor.capture(), anyInt(), nullable(), nullable(), any(), @@ -449,8 +449,9 @@ class SuspendPackageHelperTest { @Test @Throws(Exception::class) fun sendPackagesSuspendModifiedForUser() { - suspendPackageHelper.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENSION_CHANGED, - packagesToSuspend, uidsToSuspend, TEST_USER_ID) + suspendPackageHelper.sendPackagesSuspendedForUser(pms.snapshotComputer(), + Intent.ACTION_PACKAGES_SUSPENSION_CHANGED, packagesToSuspend, uidsToSuspend, + TEST_USER_ID) testHandler.flush() verify(broadcastHelper).sendPackageBroadcast( eq(Intent.ACTION_PACKAGES_SUSPENSION_CHANGED), nullable(), bundleCaptor.capture(), @@ -483,13 +484,13 @@ class SuspendPackageHelperTest { Mockito.doReturn(DIALER_PACKAGE).`when`(defaultAppProvider) .getDefaultDialer(eq(TEST_USER_ID)) Mockito.doReturn(arrayOf(INSTALLER_PACKAGE)).`when`(pms).getKnownPackageNamesInternal( - eq(PackageManagerInternal.PACKAGE_INSTALLER), eq(TEST_USER_ID)) + any(), eq(PackageManagerInternal.PACKAGE_INSTALLER), eq(TEST_USER_ID)) Mockito.doReturn(arrayOf(UNINSTALLER_PACKAGE)).`when`(pms).getKnownPackageNamesInternal( - eq(PackageManagerInternal.PACKAGE_UNINSTALLER), eq(TEST_USER_ID)) + any(), eq(PackageManagerInternal.PACKAGE_UNINSTALLER), eq(TEST_USER_ID)) Mockito.doReturn(arrayOf(VERIFIER_PACKAGE)).`when`(pms).getKnownPackageNamesInternal( - eq(PackageManagerInternal.PACKAGE_VERIFIER), eq(TEST_USER_ID)) + any(), eq(PackageManagerInternal.PACKAGE_VERIFIER), eq(TEST_USER_ID)) Mockito.doReturn(arrayOf(PERMISSION_CONTROLLER_PACKAGE)).`when`(pms) - .getKnownPackageNamesInternal( + .getKnownPackageNamesInternal(any(), eq(PackageManagerInternal.PACKAGE_PERMISSION_CONTROLLER), eq(TEST_USER_ID)) } diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/dex/DexManagerTests.java b/services/tests/mockingservicestests/src/com/android/server/pm/dex/DexManagerTests.java index 8abe46fab1d6..9d269719db64 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/dex/DexManagerTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/dex/DexManagerTests.java @@ -159,8 +159,8 @@ public class DexManagerTests { .when(mockContext) .getSystemService(PowerManager.class); - mDexManager = new DexManager(mockContext, mPM, /*PackageDexOptimizer*/ null, - mInstaller, mInstallLock); + mDexManager = new DexManager(mockContext, /*PackageDexOptimizer*/ null, + mInstaller, mInstallLock, mPM); // Foo and Bar are available to user0. // Only Bar is available to user1; diff --git a/services/tests/mockingservicestests/src/com/android/server/tare/ScribeTest.java b/services/tests/mockingservicestests/src/com/android/server/tare/ScribeTest.java index ab29e5903f02..c2cf2ff439ca 100644 --- a/services/tests/mockingservicestests/src/com/android/server/tare/ScribeTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/tare/ScribeTest.java @@ -109,6 +109,7 @@ public class ScribeTest { long lastReclamationTime = System.currentTimeMillis(); long remainingConsumableNarcs = 2000L; long consumptionLimit = 500_000L; + when(mIrs.getConsumptionLimitLocked()).thenReturn(consumptionLimit); Ledger ledger = mScribeUnderTest.getLedgerLocked(TEST_USER_ID, TEST_PACKAGE); ledger.recordTransaction(new Ledger.Transaction(0, 1000L, 1, null, 2000, 0)); @@ -119,8 +120,13 @@ public class ScribeTest { mScribeUnderTest.setConsumptionLimitLocked(consumptionLimit); mScribeUnderTest.adjustRemainingConsumableNarcsLocked( remainingConsumableNarcs - consumptionLimit); - mScribeUnderTest.writeImmediatelyForTesting(); + assertEquals(lastReclamationTime, mScribeUnderTest.getLastReclamationTimeLocked()); + assertEquals(remainingConsumableNarcs, + mScribeUnderTest.getRemainingConsumableNarcsLocked()); + assertEquals(consumptionLimit, mScribeUnderTest.getSatiatedConsumptionLimitLocked()); + + mScribeUnderTest.writeImmediatelyForTesting(); mScribeUnderTest.loadFromDiskLocked(); assertEquals(lastReclamationTime, mScribeUnderTest.getLastReclamationTimeLocked()); diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java index 050b224bf7f7..946108d607db 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java @@ -23,11 +23,10 @@ import static com.google.common.truth.Truth.assertWithMessage; import static org.junit.Assert.fail; import static java.lang.reflect.Modifier.isFinal; -import static java.lang.reflect.Modifier.isPrivate; -import static java.lang.reflect.Modifier.isProtected; import static java.lang.reflect.Modifier.isPublic; import static java.lang.reflect.Modifier.isStatic; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.AppGlobals; import android.content.IIntentReceiver; @@ -63,7 +62,6 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.regex.Pattern; @@ -101,7 +99,7 @@ public class PackageManagerServiceTest { @Nullable Bundle bOptions) { } - public void sendPackageAddedForNewUsers(String packageName, + public void sendPackageAddedForNewUsers(@NonNull Computer snapshot, String packageName, boolean sendBootComplete, boolean includeStopped, int appId, int[] userIds, int[] instantUserIds, int dataLoaderType) { } @@ -456,147 +454,6 @@ public class PackageManagerServiceTest { return null; } - // Return the boolean locked value. A null return means the annotation was not - // found. This method will fail if the annotation is found but is not one of the - // known constants. - private Boolean getOverride(Method m) { - final String name = "Computer." + displayName(m); - final Computer.LiveImplementation annotation = - m.getAnnotation(Computer.LiveImplementation.class); - if (annotation == null) { - return null; - } - final int override = annotation.override(); - if (override == Computer.LiveImplementation.MANDATORY) { - return true; - } else if (override == Computer.LiveImplementation.NOT_ALLOWED) { - return false; - } else { - flag(name, "invalid Live value: " + override); - return null; - } - } - - @Test - public void testComputerStructure() { - // Verify that Copmuter methods are properly annotated and that ComputerLocked is - // properly populated per annotations. - // Call PackageManagerService.validateComputer(); - Class base = Computer.class; - - HashMap<Method, Boolean> methodType = new HashMap<>(); - - // Verify that all Computer methods are annotated and that the annotation - // parameter locked() is valid. - for (Method m : base.getDeclaredMethods()) { - final String name = "Computer." + displayName(m); - Boolean override = getOverride(m); - if (override == null) { - flag(name, "missing required Live annotation"); - } - methodType.put(m, override); - } - - Class coreClass = ComputerEngine.class; - final Method[] coreMethods = coreClass.getDeclaredMethods(); - - // Examine every method in the core. If it inherits from a base method it must be - // "public final" if the base is NOT_ALLOWED or "public" if the base is MANDATORY. - // If the core method does not inherit from the base then it must be either - // private or protected. - for (Method m : base.getDeclaredMethods()) { - String name = "Computer." + displayName(m); - final boolean locked = methodType.get(m); - final Method core = matchMethod(m, coreMethods); - if (core == null) { - flag(name, "not overridden in ComputerEngine"); - continue; - } - name = "ComputerEngine." + displayName(m); - final int modifiers = core.getModifiers(); - if (!locked) { - if (!isPublic(modifiers)) { - flag(name, "is not public"); - } - if (!isFinal(modifiers)) { - flag(name, "is not final"); - } - } - } - // Any methods left in the coreMethods array must be private or protected. - // Protected methods must be overridden (and final) in the live list. - Method[] coreHelpers = new Method[coreMethods.length]; - int coreIndex = 0; - for (Method m : coreMethods) { - if (m != null) { - final String name = "ComputerEngine." + displayName(m); - if (name.contains(".lambda$static")) { - // skip static lambda function - continue; - } - - final int modifiers = m.getModifiers(); - if (isPrivate(modifiers)) { - // Okay - } else if (isProtected(modifiers)) { - coreHelpers[coreIndex++] = m; - } else { - flag(name, "is neither private nor protected"); - } - } - } - - Class liveClass = ComputerLocked.class; - final Method[] liveMethods = liveClass.getDeclaredMethods(); - - // Examine every method in the live list. Every method must be final and must - // inherit either from base or core. If the method inherits from a base method - // then the base must be MANDATORY. - for (Method m : base.getDeclaredMethods()) { - String name = "Computer." + displayName(m); - final boolean locked = methodType.get(m); - final Method live = matchMethod(m, liveMethods); - if (live == null) { - if (locked) { - flag(name, "not overridden in ComputerLocked"); - } - continue; - } - if (!locked) { - flag(name, "improperly overridden in ComputerLocked"); - continue; - } - - name = "ComputerLocked." + displayName(m); - final int modifiers = live.getModifiers(); - if (!locked) { - if (!isPublic(modifiers)) { - flag(name, "is not public"); - } - if (!isFinal(modifiers)) { - flag(name, "is not final"); - } - } - } - for (Method m : coreHelpers) { - if (m == null) { - continue; - } - String name = "ComputerLocked." + displayName(m); - final Method live = matchMethod(m, liveMethods); - if (live == null) { - flag(name, "is not overridden in ComputerLocked"); - continue; - } - } - for (Method m : liveMethods) { - if (m != null) { - String name = "ComputerLocked." + displayName(m); - flag(name, "illegal local method"); - } - } - } - private static PerPackageReadTimeouts[] getPerPackageReadTimeouts(String knownDigestersList) { final String defaultTimeouts = "3600000001:3600000002:3600000003"; List<PerPackageReadTimeouts> result = PerPackageReadTimeouts.parseDigestersList( diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java index 40ab8eb70c04..f8e15041f8f4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -2184,11 +2184,17 @@ public class ActivityRecordTests extends WindowTestsBase { @Test public void testSupportsPictureInPicture() { + final Task task = new TaskBuilder(mSupervisor) + .setDisplay(mDisplayContent).build(); final ActivityRecord activity = new ActivityBuilder(mAtm) - .setCreateTask(true) + .setTask(task) .setResizeMode(ActivityInfo.RESIZE_MODE_UNRESIZEABLE) .setActivityFlags(FLAG_SUPPORTS_PICTURE_IN_PICTURE) .build(); + spyOn(mDisplayContent); + spyOn(mDisplayContent.mDwpcHelper); + doReturn(true).when(mDisplayContent.mDwpcHelper).isWindowingModeSupported( + WINDOWING_MODE_PINNED); // Device not supports PIP mAtm.mSupportsPictureInPicture = false; @@ -2201,6 +2207,15 @@ public class ActivityRecordTests extends WindowTestsBase { // Activity not supports PIP activity.info.flags &= ~FLAG_SUPPORTS_PICTURE_IN_PICTURE; assertFalse(activity.supportsPictureInPicture()); + + // Activity supports PIP + activity.info.flags |= FLAG_SUPPORTS_PICTURE_IN_PICTURE; + assertTrue(activity.supportsPictureInPicture()); + + // Display not supports PIP + doReturn(false).when(mDisplayContent.mDwpcHelper).isWindowingModeSupported( + WINDOWING_MODE_PINNED); + assertFalse(activity.supportsPictureInPicture()); } @Test @@ -3086,11 +3101,11 @@ public class ActivityRecordTests extends WindowTestsBase { // Simulate app re-start input or turning screen off/on then unlocked by un-secure // keyguard to back to the app, expect IME insets is not frozen + mDisplayContent.updateImeInputAndControlTarget(app); + assertFalse(app.mActivityRecord.mImeInsetsFrozenUntilStartInput); imeSource.setFrame(new Rect(100, 400, 500, 500)); app.getInsetsState().addSource(imeSource); app.getInsetsState().setSourceVisible(ITYPE_IME, true); - mDisplayContent.updateImeInputAndControlTarget(app); - assertFalse(app.mActivityRecord.mImeInsetsFrozenUntilStartInput); // Verify when IME is visible and the app can receive the right IME insets from policy. makeWindowVisibleAndDrawn(app, mImeWindow); diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index 8e990f7763c4..40b460157bc2 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -1102,6 +1102,21 @@ public class DisplayContentTests extends WindowTestsBase { assertEquals(dc.getImeContainer().getParentSurfaceControl(), dc.computeImeParent()); } + @UseTestDisplay(addWindows = W_ACTIVITY) + @Test + public void testComputeImeParent_inputTargetNotUpdate() throws Exception { + WindowState app1 = createWindow(null, TYPE_BASE_APPLICATION, "app1"); + WindowState app2 = createWindow(null, TYPE_BASE_APPLICATION, "app2"); + doReturn(true).when(mDisplayContent).shouldImeAttachedToApp(); + mDisplayContent.setImeLayeringTarget(app1); + mDisplayContent.setImeInputTarget(app1); + assertEquals(app1.mActivityRecord.getSurfaceControl(), mDisplayContent.computeImeParent()); + mDisplayContent.setImeLayeringTarget(app2); + // Expect null means no change IME parent when the IME layering target not yet + // request IME to be the input target. + assertNull(mDisplayContent.computeImeParent()); + } + @Test public void testInputMethodInputTarget_isClearedWhenWindowStateIsRemoved() throws Exception { final DisplayContent dc = createNewDisplay(); diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowPolicyControllerHelperTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowPolicyControllerHelperTests.java index 6e11d8cf23e1..f9689990c5e8 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowPolicyControllerHelperTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowPolicyControllerHelperTests.java @@ -16,13 +16,18 @@ package com.android.server.wm; +import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; + import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; +import android.app.WindowConfiguration; import android.content.ComponentName; import android.content.pm.ActivityInfo; import android.os.UserHandle; @@ -37,6 +42,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.util.List; +import java.util.Set; /** * Tests for the {@link DisplayWindowPolicyControllerHelper} class. @@ -113,6 +119,39 @@ public class DisplayWindowPolicyControllerHelperTests extends WindowTestsBase { return activity; } + @Test + public void testIsWindowingModeSupported_noController_returnTrueForAnyWindowingMode() { + doReturn(null).when(mWm.mDisplayManagerInternal) + .getDisplayWindowPolicyController(anyInt()); + mSecondaryDisplay = createNewDisplay(); + assertFalse(mSecondaryDisplay.mDwpcHelper.hasController()); + + assertTrue(mSecondaryDisplay.mDwpcHelper.isWindowingModeSupported(WINDOWING_MODE_PINNED)); + assertTrue( + mSecondaryDisplay.mDwpcHelper.isWindowingModeSupported(WINDOWING_MODE_FULLSCREEN)); + } + + @Test + public void testIsWindowingModeSupported_withoutSettingSupportedMode_returnFalse() { + assertFalse(mSecondaryDisplay.mDwpcHelper.isWindowingModeSupported(WINDOWING_MODE_PINNED)); + } + + @Test + public void testIsWindowingModeSupported_withoutSupportedMode_defaultSupportFullScreen() { + assertTrue( + mSecondaryDisplay.mDwpcHelper.isWindowingModeSupported(WINDOWING_MODE_FULLSCREEN)); + } + + @Test + public void testIsWindowingModeSupported_setPinnedMode_returnTrue() { + Set<Integer> supportedWindowingMode = new ArraySet<>(); + supportedWindowingMode.add(WINDOWING_MODE_PINNED); + + mDwpc.setSupportedWindowingModes(supportedWindowingMode); + + assertTrue(mSecondaryDisplay.mDwpcHelper.isWindowingModeSupported(WINDOWING_MODE_PINNED)); + } + private class TestDisplayWindowPolicyController extends DisplayWindowPolicyController { ComponentName mTopActivity = null; @@ -120,7 +159,8 @@ public class DisplayWindowPolicyControllerHelperTests extends WindowTestsBase { ArraySet<Integer> mRunningUids = new ArraySet<>(); @Override - public boolean canContainActivities(@NonNull List<ActivityInfo> activities) { + public boolean canContainActivities(@NonNull List<ActivityInfo> activities, + @WindowConfiguration.WindowingMode int windowingMode) { return false; } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java index e4f691b338e1..6d7895fe5e97 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java @@ -820,7 +820,6 @@ public class WindowStateTests extends WindowTestsBase { @Test public void testHasActiveVisibleWindow() { final int uid = ActivityBuilder.DEFAULT_FAKE_UID; - mAtm.mActiveUids.onUidActive(uid, 0 /* any proc state */); final WindowState app = createWindow(null, TYPE_APPLICATION, "app", uid); app.mActivityRecord.setVisible(false); @@ -848,6 +847,11 @@ public class WindowStateTests extends WindowTestsBase { // Make the application overlay window visible. It should be a valid active visible window. overlay.onSurfaceShownChanged(true); assertTrue(mAtm.hasActiveVisibleWindow(uid)); + + // The number of windows should be independent of the existence of uid state. + mAtm.mActiveUids.onUidInactive(uid); + mAtm.mActiveUids.onUidActive(uid, 0 /* any proc state */); + assertTrue(mAtm.mActiveUids.hasNonAppVisibleWindow(uid)); } @UseTestDisplay(addWindows = W_ACTIVITY) @@ -945,6 +949,46 @@ public class WindowStateTests extends WindowTestsBase { assertFalse(app2.getInsetsState().getSource(ITYPE_IME).isVisible()); } + @Test + public void testAdjustImeInsetsVisibilityWhenSwitchingApps_toAppInMultiWindowMode() { + final WindowState app = createWindow(null, TYPE_APPLICATION, "app"); + final WindowState app2 = createWindow(null, WINDOWING_MODE_MULTI_WINDOW, + ACTIVITY_TYPE_STANDARD, TYPE_APPLICATION, mDisplayContent, "app2"); + final WindowState imeWindow = createWindow(null, TYPE_APPLICATION, "imeWindow"); + spyOn(imeWindow); + doReturn(true).when(imeWindow).isVisible(); + mDisplayContent.mInputMethodWindow = imeWindow; + + final InsetsStateController controller = mDisplayContent.getInsetsStateController(); + controller.getImeSourceProvider().setWindowContainer(imeWindow, null, null); + + // Simulate app2 in multi-window mode is going to background to switch to the fullscreen + // app which requests IME with updating all windows Insets State when IME is above app. + app2.mActivityRecord.mImeInsetsFrozenUntilStartInput = true; + mDisplayContent.setImeLayeringTarget(app); + mDisplayContent.setImeInputTarget(app); + assertTrue(mDisplayContent.shouldImeAttachedToApp()); + controller.getImeSourceProvider().scheduleShowImePostLayout(app); + controller.getImeSourceProvider().getSource().setVisible(true); + controller.updateAboveInsetsState(false); + + // Expect app windows behind IME can receive IME insets visible, + // but not for app2 in background. + assertTrue(app.getInsetsState().getSource(ITYPE_IME).isVisible()); + assertFalse(app2.getInsetsState().getSource(ITYPE_IME).isVisible()); + + // Simulate app plays closing transition to app2. + // And app2 is now IME layering target but not yet to be the IME input target. + mDisplayContent.setImeLayeringTarget(app2); + app.mActivityRecord.commitVisibility(false, false); + assertTrue(app.mActivityRecord.mLastImeShown); + assertTrue(app.mActivityRecord.mImeInsetsFrozenUntilStartInput); + + // Verify the IME insets is still visible on app, but not for app2 during task switching. + assertTrue(app.getInsetsState().getSource(ITYPE_IME).isVisible()); + assertFalse(app2.getInsetsState().getSource(ITYPE_IME).isVisible()); + } + @UseTestDisplay(addWindows = {W_ACTIVITY}) @Test public void testUpdateImeControlTargetWhenLeavingMultiWindow() { diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 1eb391d60e4d..5ef22de1dab3 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -16790,7 +16790,10 @@ public class TelephonyManager { * Callback to listen for when the set of packages with carrier privileges for a SIM changes. * * @hide + * @deprecated Use {@link CarrierPrivilegesCallback} instead. This API will be removed soon + * prior to API finalization. */ + @Deprecated @SystemApi public interface CarrierPrivilegesListener { /** @@ -16810,6 +16813,54 @@ public class TelephonyManager { } /** + * Callbacks to listen for when the set of packages with carrier privileges for a SIM changes. + * + * <p>Of note, when multiple callbacks are registered, they may be triggered one after another. + * The ordering of them is not guaranteed and thus should not be depend on. + * + * @hide + */ + @SystemApi + public interface CarrierPrivilegesCallback { + /** + * Called when the set of packages with carrier privileges has changed. + * + * <p>Of note, this callback will <b>not</b> be fired if a carrier triggers a SIM profile + * switch and the same set of packages remains privileged after the switch. + * + * <p>At registration, the callback will receive the current set of privileged packages. + * + * @param privilegedPackageNames The updated set of package names that have carrier + * privileges + * @param privilegedUids The updated set of UIDs that have carrier privileges + */ + void onCarrierPrivilegesChanged( + @NonNull Set<String> privilegedPackageNames, @NonNull Set<Integer> privilegedUids); + + /** + * Called when the {@link CarrierService} for the current user profile has changed. + * + * <p>This method does nothing by default. Clients that are interested in the carrier + * service change should override this method to get package name and UID info. + * + * <p>At registration, the callback will receive the current carrier service info. + * + * <p>Of note, this callback will <b>not</b> be fired if a carrier triggers a SIM profile + * switch and the same carrier service remains after switch. + * + * @param carrierServicePackageName package name of the {@link CarrierService}. May be + * {@code null} when no carrier service is detected. + * @param carrierServiceUid UID of the {@link CarrierService}. May be + * {@link android.os.Process#INVALID_UID} if no carrier + * service is detected. + */ + default void onCarrierServiceChanged( + @Nullable String carrierServicePackageName, int carrierServiceUid) { + // do nothing by default + } + } + + /** * Registers a {@link CarrierPrivilegesListener} on the given {@code logicalSlotIndex} to * receive callbacks when the set of packages with carrier privileges changes. The callback will * immediately be called with the latest state. @@ -16818,7 +16869,10 @@ public class TelephonyManager { * @param executor The executor where {@code listener} will be invoked * @param listener The callback to register * @hide + * @deprecated Use {@link #unregisterCarrierPrivilegesCallback} instead. This API will be + * removed prior to API finalization. */ + @Deprecated @SystemApi @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void addCarrierPrivilegesListener( @@ -16842,7 +16896,10 @@ public class TelephonyManager { * Unregisters an existing {@link CarrierPrivilegesListener}. * * @hide + * @deprecated Use {@link #unregisterCarrierPrivilegesCallback} instead. This API will be + * removed prior to API finalization. */ + @Deprecated @SystemApi @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void removeCarrierPrivilegesListener(@NonNull CarrierPrivilegesListener listener) { @@ -16890,4 +16947,53 @@ public class TelephonyManager { ex.rethrowAsRuntimeException(); } } + + /** + * Registers a {@link CarrierPrivilegesCallback} on the given {@code logicalSlotIndex} to + * receive callbacks when the set of packages with carrier privileges changes. The callback will + * immediately be called with the latest state. + * + * @param logicalSlotIndex The SIM slot to listen on + * @param executor The executor where {@code callback} will be invoked + * @param callback The callback to register + * @hide + */ + @SystemApi + @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) + public void registerCarrierPrivilegesCallback( + int logicalSlotIndex, + @NonNull @CallbackExecutor Executor executor, + @NonNull CarrierPrivilegesCallback callback) { + if (mContext == null) { + throw new IllegalStateException("Telephony service is null"); + } else if (executor == null || callback == null) { + throw new IllegalArgumentException( + "CarrierPrivilegesCallback and executor must be non-null"); + } + mTelephonyRegistryMgr = mContext.getSystemService(TelephonyRegistryManager.class); + if (mTelephonyRegistryMgr == null) { + throw new IllegalStateException("Telephony registry service is null"); + } + mTelephonyRegistryMgr.addCarrierPrivilegesCallback(logicalSlotIndex, executor, callback); + } + + /** + * Unregisters an existing {@link CarrierPrivilegesCallback}. + * + * @hide + */ + @SystemApi + @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) + public void unregisterCarrierPrivilegesCallback(@NonNull CarrierPrivilegesCallback callback) { + if (mContext == null) { + throw new IllegalStateException("Telephony service is null"); + } else if (callback == null) { + throw new IllegalArgumentException("CarrierPrivilegesCallback must be non-null"); + } + mTelephonyRegistryMgr = mContext.getSystemService(TelephonyRegistryManager.class); + if (mTelephonyRegistryMgr == null) { + throw new IllegalStateException("Telephony registry service is null"); + } + mTelephonyRegistryMgr.removeCarrierPrivilegesCallback(callback); + } } diff --git a/tests/componentalias/src/android/content/componentalias/tests/BaseComponentAliasTest.java b/tests/componentalias/src/android/content/componentalias/tests/BaseComponentAliasTest.java index 9658d6f6a698..164f61c4c630 100644 --- a/tests/componentalias/src/android/content/componentalias/tests/BaseComponentAliasTest.java +++ b/tests/componentalias/src/android/content/componentalias/tests/BaseComponentAliasTest.java @@ -37,7 +37,7 @@ public class BaseComponentAliasTest { protected static final Context sContext = InstrumentationRegistry.getTargetContext(); protected static final DeviceConfigStateHelper sDeviceConfig = new DeviceConfigStateHelper( - DeviceConfig.NAMESPACE_ACTIVITY_MANAGER); + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS); @Before public void enableComponentAliasWithCompatFlag() throws Exception { Assume.assumeTrue(Build.isDebuggable()); diff --git a/tests/componentalias/src/android/content/componentalias/tests/ComponentAliasEnableWithDeviceConfigTest.java b/tests/componentalias/src/android/content/componentalias/tests/ComponentAliasEnableWithDeviceConfigTest.java index 52c6d5b8ae12..ee20379d971a 100644 --- a/tests/componentalias/src/android/content/componentalias/tests/ComponentAliasEnableWithDeviceConfigTest.java +++ b/tests/componentalias/src/android/content/componentalias/tests/ComponentAliasEnableWithDeviceConfigTest.java @@ -28,7 +28,7 @@ import org.junit.Test; public class ComponentAliasEnableWithDeviceConfigTest { protected static final DeviceConfigStateHelper sDeviceConfig = new DeviceConfigStateHelper( - DeviceConfig.NAMESPACE_ACTIVITY_MANAGER); + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS); @AfterClass public static void restoreDeviceConfig() throws Exception { diff --git a/tests/componentalias/src/android/content/componentalias/tests/ComponentAliasNotSupportedOnUserBuildTest.java b/tests/componentalias/src/android/content/componentalias/tests/ComponentAliasNotSupportedOnUserBuildTest.java index 7935476d6156..0899886fe951 100644 --- a/tests/componentalias/src/android/content/componentalias/tests/ComponentAliasNotSupportedOnUserBuildTest.java +++ b/tests/componentalias/src/android/content/componentalias/tests/ComponentAliasNotSupportedOnUserBuildTest.java @@ -32,7 +32,7 @@ import org.junit.Test; */ public class ComponentAliasNotSupportedOnUserBuildTest { protected static final DeviceConfigStateHelper sDeviceConfig = new DeviceConfigStateHelper( - DeviceConfig.NAMESPACE_ACTIVITY_MANAGER); + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS); @AfterClass public static void restoreDeviceConfig() throws Exception { diff --git a/tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java b/tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java index 7b1f7a599519..b67395735426 100644 --- a/tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java +++ b/tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java @@ -60,7 +60,7 @@ import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener; import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; -import android.telephony.TelephonyManager.CarrierPrivilegesListener; +import android.telephony.TelephonyManager.CarrierPrivilegesCallback; import android.util.ArrayMap; import android.util.ArraySet; @@ -187,11 +187,11 @@ public class TelephonySubscriptionTrackerTest { return captor.getValue(); } - private List<CarrierPrivilegesListener> getCarrierPrivilegesListeners() { - final ArgumentCaptor<CarrierPrivilegesListener> captor = - ArgumentCaptor.forClass(CarrierPrivilegesListener.class); + private List<CarrierPrivilegesCallback> getCarrierPrivilegesCallbacks() { + final ArgumentCaptor<CarrierPrivilegesCallback> captor = + ArgumentCaptor.forClass(CarrierPrivilegesCallback.class); verify(mTelephonyManager, atLeastOnce()) - .addCarrierPrivilegesListener(anyInt(), any(), captor.capture()); + .registerCarrierPrivilegesCallback(anyInt(), any(), captor.capture()); return captor.getAllValues(); } @@ -270,12 +270,12 @@ public class TelephonySubscriptionTrackerTest { assertNotNull(getOnSubscriptionsChangedListener()); verify(mTelephonyManager, times(2)) - .addCarrierPrivilegesListener(anyInt(), any(HandlerExecutor.class), any()); + .registerCarrierPrivilegesCallback(anyInt(), any(HandlerExecutor.class), any()); verify(mTelephonyManager) - .addCarrierPrivilegesListener(eq(0), any(HandlerExecutor.class), any()); + .registerCarrierPrivilegesCallback(eq(0), any(HandlerExecutor.class), any()); verify(mTelephonyManager) - .addCarrierPrivilegesListener(eq(1), any(HandlerExecutor.class), any()); - assertEquals(2, getCarrierPrivilegesListeners().size()); + .registerCarrierPrivilegesCallback(eq(1), any(HandlerExecutor.class), any()); + assertEquals(2, getCarrierPrivilegesCallbacks().size()); } @Test @@ -287,10 +287,10 @@ public class TelephonySubscriptionTrackerTest { final OnSubscriptionsChangedListener listener = getOnSubscriptionsChangedListener(); verify(mSubscriptionManager).removeOnSubscriptionsChangedListener(eq(listener)); - for (CarrierPrivilegesListener carrierPrivilegesListener : - getCarrierPrivilegesListeners()) { + for (CarrierPrivilegesCallback carrierPrivilegesCallback : + getCarrierPrivilegesCallbacks()) { verify(mTelephonyManager) - .removeCarrierPrivilegesListener(eq(carrierPrivilegesListener)); + .unregisterCarrierPrivilegesCallback(eq(carrierPrivilegesCallback)); } } @@ -303,15 +303,15 @@ public class TelephonySubscriptionTrackerTest { mTelephonySubscriptionTracker.setReadySubIdsBySlotId(readySubIdsBySlotId); doReturn(1).when(mTelephonyManager).getActiveModemCount(); - List<CarrierPrivilegesListener> carrierPrivilegesListeners = - getCarrierPrivilegesListeners(); + List<CarrierPrivilegesCallback> carrierPrivilegesCallbacks = + getCarrierPrivilegesCallbacks(); mTelephonySubscriptionTracker.onReceive(mContext, buildTestMultiSimConfigBroadcastIntent()); mTestLooper.dispatchAll(); - for (CarrierPrivilegesListener carrierPrivilegesListener : carrierPrivilegesListeners) { + for (CarrierPrivilegesCallback carrierPrivilegesCallback : carrierPrivilegesCallbacks) { verify(mTelephonyManager) - .removeCarrierPrivilegesListener(eq(carrierPrivilegesListener)); + .unregisterCarrierPrivilegesCallback(eq(carrierPrivilegesCallback)); } // Expect cache cleared for inactive slots. @@ -323,9 +323,9 @@ public class TelephonySubscriptionTrackerTest { // Expect a new CarrierPrivilegesListener to have been registered for slot 0, and none other // (2 previously registered during startup, for slots 0 & 1) verify(mTelephonyManager, times(3)) - .addCarrierPrivilegesListener(anyInt(), any(HandlerExecutor.class), any()); + .registerCarrierPrivilegesCallback(anyInt(), any(HandlerExecutor.class), any()); verify(mTelephonyManager, times(2)) - .addCarrierPrivilegesListener(eq(0), any(HandlerExecutor.class), any()); + .registerCarrierPrivilegesCallback(eq(0), any(HandlerExecutor.class), any()); // Verify that this triggers a re-evaluation verify(mCallback).onNewSnapshot(eq(buildExpectedSnapshot(TEST_PRIVILEGED_PACKAGES))); @@ -391,8 +391,8 @@ public class TelephonySubscriptionTrackerTest { public void testOnCarrierPrivilegesChanged() throws Exception { setupReadySubIds(); - final CarrierPrivilegesListener listener = getCarrierPrivilegesListeners().get(0); - listener.onCarrierPrivilegesChanged(Collections.emptyList(), new int[] {}); + final CarrierPrivilegesCallback callback = getCarrierPrivilegesCallbacks().get(0); + callback.onCarrierPrivilegesChanged(Collections.emptySet(), Collections.emptySet()); mTestLooper.dispatchAll(); verify(mCallback).onNewSnapshot(eq(buildExpectedSnapshot(TEST_PRIVILEGED_PACKAGES))); |