Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db1a1524 authored by Greg Kaiser's avatar Greg Kaiser Committed by Android (Google) Code Review
Browse files

Merge changes I2f7b198f,I229b39ce,Iaf8e2c07 

* changes:
  Revert "[incremental/pm] LauncherApps APIs for loading state and progress"
  Revert "[pm/incremental/api] exposing package state names and reasons"
  Revert "Fix LauncherAppsService queryIntentLauncherActivities"
parents 2ef3f142 69475be8

api/current.txt

+0 −11
Original line number Original line Diff line number Diff line
@@ -10668,15 +10668,12 @@ package android.content { 
    field public static final String ACTION_PACKAGE_CHANGED = "android.intent.action.PACKAGE_CHANGED";

    field public static final String ACTION_PACKAGE_CHANGED = "android.intent.action.PACKAGE_CHANGED";

    field public static final String ACTION_PACKAGE_DATA_CLEARED = "android.intent.action.PACKAGE_DATA_CLEARED";

    field public static final String ACTION_PACKAGE_DATA_CLEARED = "android.intent.action.PACKAGE_DATA_CLEARED";

    field public static final String ACTION_PACKAGE_FIRST_LAUNCH = "android.intent.action.PACKAGE_FIRST_LAUNCH";

    field public static final String ACTION_PACKAGE_FIRST_LAUNCH = "android.intent.action.PACKAGE_FIRST_LAUNCH";

    field public static final String ACTION_PACKAGE_FULLY_LOADED = "android.intent.action.PACKAGE_FULLY_LOADED";

    field public static final String ACTION_PACKAGE_FULLY_REMOVED = "android.intent.action.PACKAGE_FULLY_REMOVED";

    field public static final String ACTION_PACKAGE_FULLY_REMOVED = "android.intent.action.PACKAGE_FULLY_REMOVED";

    field @Deprecated public static final String ACTION_PACKAGE_INSTALL = "android.intent.action.PACKAGE_INSTALL";

    field @Deprecated public static final String ACTION_PACKAGE_INSTALL = "android.intent.action.PACKAGE_INSTALL";

    field public static final String ACTION_PACKAGE_NEEDS_VERIFICATION = "android.intent.action.PACKAGE_NEEDS_VERIFICATION";

    field public static final String ACTION_PACKAGE_NEEDS_VERIFICATION = "android.intent.action.PACKAGE_NEEDS_VERIFICATION";

    field public static final String ACTION_PACKAGE_REMOVED = "android.intent.action.PACKAGE_REMOVED";

    field public static final String ACTION_PACKAGE_REMOVED = "android.intent.action.PACKAGE_REMOVED";

    field public static final String ACTION_PACKAGE_REPLACED = "android.intent.action.PACKAGE_REPLACED";

    field public static final String ACTION_PACKAGE_REPLACED = "android.intent.action.PACKAGE_REPLACED";

    field public static final String ACTION_PACKAGE_RESTARTED = "android.intent.action.PACKAGE_RESTARTED";

    field public static final String ACTION_PACKAGE_RESTARTED = "android.intent.action.PACKAGE_RESTARTED";

    field public static final String ACTION_PACKAGE_STARTABLE = "android.intent.action.PACKAGE_STARTABLE";

    field public static final String ACTION_PACKAGE_UNSTARTABLE = "android.intent.action.PACKAGE_UNSTARTABLE";

    field public static final String ACTION_PACKAGE_VERIFIED = "android.intent.action.PACKAGE_VERIFIED";

    field public static final String ACTION_PACKAGE_VERIFIED = "android.intent.action.PACKAGE_VERIFIED";

    field public static final String ACTION_PASTE = "android.intent.action.PASTE";

    field public static final String ACTION_PASTE = "android.intent.action.PASTE";

    field public static final String ACTION_PICK = "android.intent.action.PICK";

    field public static final String ACTION_PICK = "android.intent.action.PICK";
@@ -10841,7 +10838,6 @@ package android.content { 
    field public static final String EXTRA_TIMEZONE = "time-zone";

    field public static final String EXTRA_TIMEZONE = "time-zone";

    field public static final String EXTRA_TITLE = "android.intent.extra.TITLE";

    field public static final String EXTRA_TITLE = "android.intent.extra.TITLE";

    field public static final String EXTRA_UID = "android.intent.extra.UID";

    field public static final String EXTRA_UID = "android.intent.extra.UID";

    field public static final String EXTRA_UNSTARTABLE_REASON = "android.intent.extra.UNSTARTABLE_REASON";

    field public static final String EXTRA_USER = "android.intent.extra.USER";

    field public static final String EXTRA_USER = "android.intent.extra.USER";

    field public static final int FILL_IN_ACTION = 1; // 0x1

    field public static final int FILL_IN_ACTION = 1; // 0x1

    field public static final int FILL_IN_CATEGORIES = 4; // 0x4

    field public static final int FILL_IN_CATEGORIES = 4; // 0x4
@@ -11715,10 +11711,7 @@ package android.content.pm { 
    method public android.graphics.drawable.Drawable getIcon(int);

    method public android.graphics.drawable.Drawable getIcon(int);

    method public CharSequence getLabel();

    method public CharSequence getLabel();

    method public String getName();

    method public String getName();

    method public float getProgress();

    method public android.os.UserHandle getUser();

    method public android.os.UserHandle getUser();

    method public boolean isLoading();

    method public boolean isStartable();

  }

  }

















  public class LauncherApps {







  public class LauncherApps {










@@ -11758,7 +11751,6 @@ package android.content.pm {









    ctor public LauncherApps.Callback();







    ctor public LauncherApps.Callback();











    method public abstract void onPackageAdded(String, android.os.UserHandle);







    method public abstract void onPackageAdded(String, android.os.UserHandle);











    method public abstract void onPackageChanged(String, android.os.UserHandle);







    method public abstract void onPackageChanged(String, android.os.UserHandle);











    method public void onPackageProgressChanged(@NonNull String, @NonNull android.os.UserHandle, float);














    method public abstract void onPackageRemoved(String, android.os.UserHandle);







    method public abstract void onPackageRemoved(String, android.os.UserHandle);











    method public abstract void onPackagesAvailable(String[], android.os.UserHandle, boolean);







    method public abstract void onPackagesAvailable(String[], android.os.UserHandle, boolean);











    method public void onPackagesSuspended(String[], android.os.UserHandle);







    method public void onPackagesSuspended(String[], android.os.UserHandle);










@@ -12305,9 +12297,6 @@ package android.content.pm {









    field public static final int SYNCHRONOUS = 2; // 0x2







    field public static final int SYNCHRONOUS = 2; // 0x2











    field @Nullable public static final java.util.List<java.security.cert.Certificate> TRUST_ALL;







    field @Nullable public static final java.util.List<java.security.cert.Certificate> TRUST_ALL;











    field @NonNull public static final java.util.List<java.security.cert.Certificate> TRUST_NONE;







    field @NonNull public static final java.util.List<java.security.cert.Certificate> TRUST_NONE;











    field public static final int UNSTARTABLE_REASON_CONNECTION_ERROR = 1; // 0x1














    field public static final int UNSTARTABLE_REASON_INSUFFICIENT_STORAGE = 2; // 0x2














    field public static final int UNSTARTABLE_REASON_UNKNOWN = 0; // 0x0














    field public static final int VERIFICATION_ALLOW = 1; // 0x1







    field public static final int VERIFICATION_ALLOW = 1; // 0x1











    field public static final int VERIFICATION_REJECT = -1; // 0xffffffff







    field public static final int VERIFICATION_REJECT = -1; // 0xffffffff











    field public static final int VERSION_CODE_HIGHEST = -1; // 0xffffffff







    field public static final int VERSION_CODE_HIGHEST = -1; // 0xffffffff

























core/java/android/content/Intent.java



+4
−9




























Original line number
Original line
Diff line number
Diff line








@@ -2744,6 +2744,7 @@ public class Intent implements Parcelable, Cloneable {









     * </ul>







     * </ul>











     *







     *











     * <p class="note">This is a protected intent that can only be sent by the system.







     * <p class="note">This is a protected intent that can only be sent by the system.














     * @hide











     */







     */











    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)







    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)











    public static final String ACTION_PACKAGE_STARTABLE = "android.intent.action.PACKAGE_STARTABLE";







    public static final String ACTION_PACKAGE_STARTABLE = "android.intent.action.PACKAGE_STARTABLE";









@@ -2754,13 +2755,13 @@ public class Intent implements Parcelable, Cloneable {









     * <ul>







     * <ul>











     * <li> {@link #EXTRA_UID} containing the integer uid assigned to the package. </li>







     * <li> {@link #EXTRA_UID} containing the integer uid assigned to the package. </li>











     * <li> {@link #EXTRA_PACKAGE_NAME} containing the package name. </li>







     * <li> {@link #EXTRA_PACKAGE_NAME} containing the package name. </li>











     * <li> {@link #EXTRA_UNSTARTABLE_REASON} containing the integer indicating the reason for







     * <li> {@link #EXTRA_REASON} containing the integer indicating the reason for the state change,











     * the state change,














     * @see PackageManager.UnstartableReason







     * @see PackageManager.UnstartableReason











     * </li>







     * </li>











     * </ul>







     * </ul>











     *







     *











     * <p class="note">This is a protected intent that can only be sent by the system.







     * <p class="note">This is a protected intent that can only be sent by the system.














     * @hide











     */







     */











    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)







    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)











    public static final String ACTION_PACKAGE_UNSTARTABLE =







    public static final String ACTION_PACKAGE_UNSTARTABLE =









@@ -2775,6 +2776,7 @@ public class Intent implements Parcelable, Cloneable {









     * </ul>







     * </ul>











     *







     *











     * <p class="note">This is a protected intent that can only be sent by the system.







     * <p class="note">This is a protected intent that can only be sent by the system.














     * @hide











     */







     */











    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)







    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)











    public static final String ACTION_PACKAGE_FULLY_LOADED =







    public static final String ACTION_PACKAGE_FULLY_LOADED =










@@ -6013,13 +6015,6 @@ public class Intent implements Parcelable, Cloneable {









     */







     */











    public static final String EXTRA_LOCUS_ID = "android.intent.extra.LOCUS_ID";







    public static final String EXTRA_LOCUS_ID = "android.intent.extra.LOCUS_ID";































    /**














     * Intent extra: the reason that the package associated with this intent has become unstartable.














     *














     * <p>Type: String














     */














    public static final String EXTRA_UNSTARTABLE_REASON = "android.intent.extra.UNSTARTABLE_REASON";





























    // ---------------------------------------------------------------------







    // ---------------------------------------------------------------------











    // ---------------------------------------------------------------------







    // ---------------------------------------------------------------------











    // Intent flags (see mFlags variable).







    // Intent flags (see mFlags variable).

































core/java/android/content/pm/ILauncherApps.aidl



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -21,9 +21,9 @@ import android.content.ComponentName;









import android.content.Intent;







import android.content.Intent;











import android.content.IntentSender;







import android.content.IntentSender;











import android.content.LocusId;







import android.content.LocusId;














import android.content.pm.ActivityInfo;











import android.content.pm.ApplicationInfo;







import android.content.pm.ApplicationInfo;











import android.content.pm.IOnAppsChangedListener;







import android.content.pm.IOnAppsChangedListener;











import android.content.pm.LauncherActivityInfoInternal;














import android.content.pm.LauncherApps;







import android.content.pm.LauncherApps;











import android.content.pm.ShortcutQueryWrapper;







import android.content.pm.ShortcutQueryWrapper;











import android.content.pm.IPackageInstallerCallback;







import android.content.pm.IPackageInstallerCallback;









@@ -47,7 +47,7 @@ interface ILauncherApps {









    void removeOnAppsChangedListener(in IOnAppsChangedListener listener);







    void removeOnAppsChangedListener(in IOnAppsChangedListener listener);











    ParceledListSlice getLauncherActivities(







    ParceledListSlice getLauncherActivities(











            String callingPackage, String packageName, in UserHandle user);







            String callingPackage, String packageName, in UserHandle user);











    LauncherActivityInfoInternal resolveLauncherActivityInternal(







    ActivityInfo resolveActivity(











            String callingPackage, in ComponentName component, in UserHandle user);







            String callingPackage, in ComponentName component, in UserHandle user);











    void startSessionDetailsActivityAsUser(in IApplicationThread caller, String callingPackage,







    void startSessionDetailsActivityAsUser(in IApplicationThread caller, String callingPackage,











                String callingFeatureId, in PackageInstaller.SessionInfo sessionInfo,







                String callingFeatureId, in PackageInstaller.SessionInfo sessionInfo,

































core/java/android/content/pm/IOnAppsChangedListener.aidl



+0
−1




























Original line number
Original line
Diff line number
Diff line








@@ -33,5 +33,4 @@ oneway interface IOnAppsChangedListener {









            in Bundle launcherExtras);







            in Bundle launcherExtras);











    void onPackagesUnsuspended(in UserHandle user, in String[] packageNames);







    void onPackagesUnsuspended(in UserHandle user, in String[] packageNames);











    void onShortcutChanged(in UserHandle user, String packageName, in ParceledListSlice shortcuts);







    void onShortcutChanged(in UserHandle user, String packageName, in ParceledListSlice shortcuts);











    void onPackageProgressChanged(in UserHandle user, String packageName, float progress);














}






}
























core/java/android/content/pm/IPackageManager.aidl



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -31,6 +31,7 @@ import android.content.pm.IPackageInstaller;









import android.content.pm.IPackageDeleteObserver;







import android.content.pm.IPackageDeleteObserver;











import android.content.pm.IPackageDeleteObserver2;







import android.content.pm.IPackageDeleteObserver2;











import android.content.pm.IPackageDataObserver;







import android.content.pm.IPackageDataObserver;














import android.content.pm.IPackageLoadingProgressCallback;











import android.content.pm.IPackageMoveObserver;







import android.content.pm.IPackageMoveObserver;











import android.content.pm.IPackageStatsObserver;







import android.content.pm.IPackageStatsObserver;











import android.content.pm.IntentFilterVerificationInfo;







import android.content.pm.IntentFilterVerificationInfo;