Merge "Revert "Throw at getPackageSizeInfoAsUser() callers."" (4f459b85) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+4 −10

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.graphics.drawable.LayerDrawable;
		import android.net.Uri;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Looper;
		@@ -2130,15 +2129,10 @@ public class ApplicationPackageManager extends PackageManager {
		@Override
		public void getPackageSizeInfoAsUser(String packageName, int userHandle,
		IPackageStatsObserver observer) {
		if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O) {
		throw new UnsupportedOperationException(
		"Shame on you for calling a hidden API. Shame!");
		} else if (observer != null) {
		Log.d(TAG, "Shame on you for calling a hidden API. Shame!");
		try {
		observer.onGetStatsCompleted(null, false);
		} catch (RemoteException ignored) {
		}
		mPM.getPackageSizeInfo(packageName, userHandle, observer);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -18625,8 +18625,11 @@ public class PackageManagerService extends IPackageManager.Stub {
		@Override
		public void getPackageSizeInfo(final String packageName, int userHandle,
		final IPackageStatsObserver observer) {
		throw new UnsupportedOperationException(
		"Shame on you for calling a hidden API. Shame!");
		Slog.w(TAG, "Shame on you for calling a hidden API. Shame!");
		try {
		observer.onGetStatsCompleted(null, false);
		} catch (Throwable ignored) {
		}
		}

		private boolean getPackageSizeInfoLI(String packageName, int userId, PackageStats stats) {