summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-07-23 21:46:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-23 21:46:53 +0000
commit607bc34f93a8c074d1982861273d210291eae34d (patch)
tree12bc371443508f6a75f0bac363c381f281a6633b /core
parent258e630a6bc876c57ac97c6da3e5414d0e7eb036 (diff)
parent9c8b8ab941e3ca7bdf2cccad6836760d7723518e (diff)
downloadframeworks_base-607bc34f93a8c074d1982861273d210291eae34d.zip
frameworks_base-607bc34f93a8c074d1982861273d210291eae34d.tar.gz
frameworks_base-607bc34f93a8c074d1982861273d210291eae34d.tar.bz2
Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/pm/IPackageManager.aidl2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index ceb610a..bc24d67 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -253,7 +253,7 @@ interface IPackageManager {
List<PackageInfo> getPreferredPackages(int flags);
- void resetPreferredActivities(int userId);
+ void resetApplicationPreferences(int userId);
ResolveInfo getLastChosenActivity(in Intent intent,
String resolvedType, int flags);