diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-03-09 00:09:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-09 00:10:03 +0000 |
| commit | 35fe82fd542bd030dfdacae848acbcaa6c781a0b (patch) | |
| tree | dbe983247ba3f089ce6f263f35308c76cdc520ea | |
| parent | 61c9bf957bf7f73ebb11332cea0a83e4adaed60a (diff) | |
| parent | e6306c485f0d43ce094a708c76bb9f5ea9703fd3 (diff) | |
Merge "Throw at getPackageSizeInfoAsUser() callers."
| -rw-r--r-- | core/java/android/app/ApplicationPackageManager.java | 14 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 7 |
2 files changed, 12 insertions, 9 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 64e2d49d274b..97992cafee0e 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -65,6 +65,7 @@ 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; @@ -2129,10 +2130,15 @@ public class ApplicationPackageManager extends PackageManager { @Override public void getPackageSizeInfoAsUser(String packageName, int userHandle, IPackageStatsObserver observer) { - try { - mPM.getPackageSizeInfo(packageName, userHandle, observer); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + 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) { + } } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index aff28320014e..e2358c2d4eee 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18625,11 +18625,8 @@ public class PackageManagerService extends IPackageManager.Stub { @Override public void getPackageSizeInfo(final String packageName, int userHandle, final IPackageStatsObserver observer) { - Slog.w(TAG, "Shame on you for calling a hidden API. Shame!"); - try { - observer.onGetStatsCompleted(null, false); - } catch (Throwable ignored) { - } + throw new UnsupportedOperationException( + "Shame on you for calling a hidden API. Shame!"); } private boolean getPackageSizeInfoLI(String packageName, int userId, PackageStats stats) { |