summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-04-30 05:09:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-30 05:09:02 +0000
commit21df222fa8f3fdeb38dc7d59b6bcba15971d340b (patch)
tree7e65871eaf429805ab981311bd17c22db2cd2ccf /core
parentc3563bf7e07ba7f307d681aefacf2850f9e6d557 (diff)
parente31b820dad4c5f2b19ee10479a675a139ad3c61e (diff)
downloadframeworks_base-21df222fa8f3fdeb38dc7d59b6bcba15971d340b.zip
frameworks_base-21df222fa8f3fdeb38dc7d59b6bcba15971d340b.tar.gz
frameworks_base-21df222fa8f3fdeb38dc7d59b6bcba15971d340b.tar.bz2
Merge "New "frozen" state during app move/upgrade." into mnc-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/pm/IPackageManager.aidl1
-rw-r--r--core/java/android/content/pm/PackageParser.java3
2 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index ae59bfc..0b24594 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -58,6 +58,7 @@ import android.content.IntentSender;
* {@hide}
*/
interface IPackageManager {
+ boolean isPackageFrozen(String packageName);
boolean isPackageAvailable(String packageName, int userId);
PackageInfo getPackageInfo(String packageName, int flags, int userId);
int getPackageUid(String packageName, int userId);
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index fed9261..9596c42 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -4315,9 +4315,6 @@ public class PackageParser {
// Additional data supplied by callers.
public Object mExtras;
- // Whether an operation is currently pending on this package
- public boolean mOperationPending;
-
// Applications hardware preferences
public ArrayList<ConfigurationInfo> configPreferences = null;