diff options
Diffstat (limited to 'core/java/android')
5 files changed, 3 insertions, 116 deletions
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index bc5b32c69b59..6a20c9349e1d 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -37,7 +37,6 @@ import android.content.pm.IntentFilterVerificationInfo; import android.content.pm.InstrumentationInfo; import android.content.pm.KeySet; import android.content.pm.PackageInfo; -import android.content.pm.PackageCleanItem; import android.content.pm.ParceledListSlice; import android.content.pm.ProviderInfo; import android.content.pm.PermissionGroupInfo; @@ -553,8 +552,6 @@ interface IPackageManager { */ void reconcileSecondaryDexFiles(String packageName); - PackageCleanItem nextPackageToClean(in PackageCleanItem lastPackage); - int getMoveStatus(int moveId); void registerMoveCallback(in IPackageMoveObserver callback); diff --git a/core/java/android/content/pm/PackageCleanItem.aidl b/core/java/android/content/pm/PackageCleanItem.aidl deleted file mode 100644 index 9bb203eed691..000000000000 --- a/core/java/android/content/pm/PackageCleanItem.aidl +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2012, 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 android.content.pm; - -parcelable PackageCleanItem; diff --git a/core/java/android/content/pm/PackageCleanItem.java b/core/java/android/content/pm/PackageCleanItem.java deleted file mode 100644 index e1656d6f192d..000000000000 --- a/core/java/android/content/pm/PackageCleanItem.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2012 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 android.content.pm; - -import android.os.Parcel; -import android.os.Parcelable; - -/** @hide */ -public class PackageCleanItem implements Parcelable { - public final int userId; - public final String packageName; - public final boolean andCode; - - public PackageCleanItem(int userId, String packageName, boolean andCode) { - this.userId = userId; - this.packageName = packageName; - this.andCode = andCode; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - try { - if (obj != null) { - PackageCleanItem other = (PackageCleanItem)obj; - return userId == other.userId && packageName.equals(other.packageName) - && andCode == other.andCode; - } - } catch (ClassCastException e) { - } - return false; - } - - @Override - public int hashCode() { - int result = 17; - result = 31 * result + userId; - result = 31 * result + packageName.hashCode(); - result = 31 * result + (andCode ? 1 : 0); - return result; - } - - public int describeContents() { - return 0; - } - - public void writeToParcel(Parcel dest, int parcelableFlags) { - dest.writeInt(userId); - dest.writeString(packageName); - dest.writeInt(andCode ? 1 : 0); - } - - public static final Parcelable.Creator<PackageCleanItem> CREATOR - = new Parcelable.Creator<PackageCleanItem>() { - public PackageCleanItem createFromParcel(Parcel source) { - return new PackageCleanItem(source); - } - - public PackageCleanItem[] newArray(int size) { - return new PackageCleanItem[size]; - } - }; - - private PackageCleanItem(Parcel source) { - userId = source.readInt(); - packageName = source.readString(); - andCode = source.readInt() != 0; - } -} diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 4f39ec01a11c..ac2f1ce7a1f5 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2678,13 +2678,6 @@ public abstract class PackageManager { "android.software.device_id_attestation"; /** - * Action to external storage service to clean out removed apps. - * @hide - */ - public static final String ACTION_CLEAN_EXTERNAL_STORAGE - = "android.content.pm.CLEAN_EXTERNAL_STORAGE"; - - /** * Extra field name for the URI to a verification file. Passed to a package * verifier. * diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index e69acaed1ffe..9724e8f96c0a 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -40,6 +40,7 @@ import android.os.Binder; import android.os.Environment; import android.os.FileUtils; import android.os.Handler; +import android.os.IInstalld; import android.os.IVold; import android.os.IVoldTaskListener; import android.os.Looper; @@ -215,11 +216,10 @@ public class StorageManager { /** {@hide} */ public static final int DEBUG_VIRTUAL_DISK = 1 << 5; - // NOTE: keep in sync with installd /** {@hide} */ - public static final int FLAG_STORAGE_DE = 1 << 0; + public static final int FLAG_STORAGE_DE = IInstalld.FLAG_STORAGE_DE; /** {@hide} */ - public static final int FLAG_STORAGE_CE = 1 << 1; + public static final int FLAG_STORAGE_CE = IInstalld.FLAG_STORAGE_CE; /** {@hide} */ public static final int FLAG_FOR_WRITE = 1 << 8; |