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

Merge "Revert "Add per-user versions of set{Component,Application}EnabledSetting.""

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-02 23:56:54 +00:00
committed by Android (Google) Code Review
parent aa9b4a364b 38c67d3c0f
commit 391dfcfa68
5 changed files with 15 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2080,14 +2080,8 @@ public class ApplicationPackageManager extends PackageManager {
@Override
public void setComponentEnabledSetting(ComponentName componentName,
int newState, int flags) {
setComponentEnabledSettingAsUser(componentName, newState, flags, mContext.getUserId());
}
@Override
public void setComponentEnabledSettingAsUser(ComponentName componentName,
int newState, int flags, int userId) {
try {
mPM.setComponentEnabledSetting(componentName, newState, flags, userId);
mPM.setComponentEnabledSetting(componentName, newState, flags, mContext.getUserId());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -2105,16 +2099,9 @@ public class ApplicationPackageManager extends PackageManager {
@Override
public void setApplicationEnabledSetting(String packageName,
int newState, int flags) {
setApplicationEnabledSettingAsUser(packageName, newState, flags,
mContext.getUserId());
}
@Override
public void setApplicationEnabledSettingAsUser(String packageName,
int newState, int flags, int userId) {
try {
mPM.setApplicationEnabledSetting(packageName, newState, flags,
userId, mContext.getOpPackageName());
mContext.getUserId(), mContext.getOpPackageName());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}

16
core/java/android/content/pm/PackageManager.java
View File

@@ -5378,14 +5378,6 @@ public abstract class PackageManager {
public abstract void setComponentEnabledSetting(ComponentName componentName,
int newState, int flags);
/**
* Per-user version of {@link #setComponentEnabledSetting(ComponentName, int, int)}
*
* @hide
*/
public abstract void setComponentEnabledSettingAsUser(ComponentName componentName,
int newState, int flags, int userId);
/**
* Return the enabled setting for a package component (activity,
* receiver, service, provider). This returns the last value set by
@@ -5424,14 +5416,6 @@ public abstract class PackageManager {
public abstract void setApplicationEnabledSetting(String packageName,
int newState, int flags);
/**
* Per-user version of {@link #setApplicationEnabledSetting(String, int, int)}
*
* @hide
*/
public abstract void setApplicationEnabledSettingAsUser(String packageName,
int newState, int flags, int userId);
/**
* Return the enabled setting for an application. This returns
* the last value set by