Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Throw at getPackageSizeInfoAsUser() callers.""

Browse Source
This commit is contained in:
Jeff Sharkey
2017-03-08 21:19:37 +00:00
committed by Android (Google) Code Review
parent 0fd8e4af27 dd3adc3398
commit 4f459b85d4
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/ApplicationPackageManager.java
View File

@@ -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) {
}
try {
mPM.getPackageSizeInfo(packageName, userHandle, observer);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}

7
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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) {