Merge "Revert "Initial KeySet API.""

4 files changed, 5 insertions, 113 deletions

diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 4730559..2935b8e 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -33,7 +33,6 @@ import android.content.pm.IPackageManager;
 import android.content.pm.IPackageMoveObserver;
 import android.content.pm.IPackageStatsObserver;
 import android.content.pm.InstrumentationInfo;
-import android.content.pm.KeySet;
 import android.content.pm.ManifestDigest;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageInstaller;
@@ -53,7 +52,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.IBinder;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
@@ -61,7 +59,6 @@ import android.os.UserManager;
 import android.util.ArrayMap;
 import android.util.Log;
 import android.view.Display;
-import com.android.internal.util.Preconditions;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -1450,62 +1447,6 @@ final class ApplicationPackageManager extends PackageManager {
         return false;
     }
 
-    @Override
-    public KeySet getKeySetByAlias(String packageName, String alias) {
-        Preconditions.checkNotNull(packageName);
-        Preconditions.checkNotNull(alias);
-        IBinder keySetToken;
-        try {
-            keySetToken = mPM.getKeySetByAlias(packageName, alias);
-        } catch (RemoteException e) {
-            return null;
-        }
-        if (keySetToken == null) {
-            return null;
-        }
-        return new KeySet(keySetToken);
-    }
-
-    @Override
-    public KeySet getSigningKeySet(String packageName) {
-        Preconditions.checkNotNull(packageName);
-        IBinder keySetToken;
-        try {
-            keySetToken = mPM.getSigningKeySet(packageName);
-        } catch (RemoteException e) {
-            return null;
-        }
-        if (keySetToken == null) {
-            return null;
-        }
-        return new KeySet(keySetToken);
-    }
-
-
-    @Override
-    public boolean isSignedBy(String packageName, KeySet ks) {
-        Preconditions.checkNotNull(packageName);
-        Preconditions.checkNotNull(ks);
-        IBinder keySetToken = ks.getToken();
-        try {
-            return mPM.isPackageSignedByKeySet(packageName, keySetToken);
-        } catch (RemoteException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isSignedByExactly(String packageName, KeySet ks) {
-        Preconditions.checkNotNull(packageName);
-        Preconditions.checkNotNull(ks);
-        IBinder keySetToken = ks.getToken();
-        try {
-            return mPM.isPackageSignedByKeySetExactly(packageName, keySetToken);
-        } catch (RemoteException e) {
-            return false;
-        }
-    }
-
     /**
      * @hide
      */
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index 3a98f5d..58d3526 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -429,9 +429,4 @@ interface IPackageManager {
 
     boolean setBlockUninstallForUser(String packageName, boolean blockUninstall, int userId);
     boolean getBlockUninstallForUser(String packageName, int userId);
-
-    IBinder getKeySetByAlias(String packageName, String alias);
-    IBinder getSigningKeySet(String packageName);
-    boolean isPackageSignedByKeySet(String packageName, IBinder ks);
-    boolean isPackageSignedByKeySetExactly(String packageName, IBinder ks);
 }
diff --git a/core/java/android/content/pm/KeySet.java b/core/java/android/content/pm/KeySet.java
index fcdaa18..0ef09a4 100644
--- a/core/java/android/content/pm/KeySet.java
+++ b/core/java/android/content/pm/KeySet.java
@@ -16,36 +16,19 @@
 
 package android.content.pm;
 
-import android.os.IBinder;
+import android.os.Binder;
 
-/**
- * Represents a {@code KeySet} that has been declared in the AndroidManifest.xml
- * file for the application.  A {@code KeySet} can be used explicitly to
- * represent a trust relationship with other applications on the device.
- */
+/** @hide */
 public class KeySet {
 
-    private IBinder token;
+    private Binder token;
 
     /** @hide */
-    public KeySet(IBinder token) {
-        if (token == null) {
-            throw new NullPointerException("null value for KeySet IBinder token");
-        }
+    public KeySet(Binder token) {
         this.token = token;
     }
 
-    /** @hide */
-    public IBinder getToken() {
+    Binder getToken() {
         return token;
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o instanceof KeySet) {
-            KeySet ks = (KeySet) o;
-            return token == ks.token;
-        }
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index d90c047..03d4701 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -3602,33 +3602,6 @@ public abstract class PackageManager {
     public abstract boolean isSafeMode();
 
     /**
-     * Return the {@link KeySet} associated with the String alias for this
-     * application.
-     *
-     * @param Alias The alias for a given {@link KeySet} as defined in the
-     *        application's AndroidManifest.xml.
-     */
-    public abstract KeySet getKeySetByAlias(String packageName, String alias);
-
-    /** Return the signing {@link KeySet} for this application. */
-    public abstract KeySet getSigningKeySet(String packageName);
-
-    /**
-     * Return whether the package denoted by packageName has been signed by all
-     * of the keys specified by the {@link KeySet} ks.  This will return true if
-     * the package has been signed by additional keys (a superset) as well.
-     * Compare to {@link #isSignedByExactly(String packageName, KeySet ks)}.
-     */
-    public abstract boolean isSignedBy(String packageName, KeySet ks);
-
-    /**
-     * Return whether the package denoted by packageName has been signed by all
-     * of, and only, the keys specified by the {@link KeySet} ks. Compare to
-     * {@link #isSignedBy(String packageName, KeySet ks)}.
-     */
-    public abstract boolean isSignedByExactly(String packageName, KeySet ks);
-
-    /**
      * Attempts to move package resources from internal to external media or vice versa.
      * Since this may take a little while, the result will
      * be posted back to the given observer.   This call may fail if the calling context