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

am 396d9440: Merge "Remove initiator name param." into mnc-dev

Browse Source 
* commit '396d944001f0b897b1689baa0bd7d3e04046b3ca':
  Remove initiator name param.
This commit is contained in:
Julia Reynolds
2015-05-13 20:17:48 +00:00
committed by Android Git Automerger
parent ca549d9c2f 396d944001
commit f7056dbd30
6 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -5749,7 +5749,7 @@ package android.app.admin {
method public void setCameraDisabled(android.content.ComponentName, boolean);
method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;
method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);
method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);
method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);

2
api/system-current.txt
View File

@@ -5855,7 +5855,7 @@ package android.app.admin {
method public void setCameraDisabled(android.content.ComponentName, boolean);
method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;
method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);
method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);
method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);

7
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -2793,17 +2793,16 @@ public class DevicePolicyManager {
* @param who Which {@link DeviceAdminReceiver} this request is associated with, or null if not
* called by the device owner.
* @param initializer Which {@link DeviceAdminReceiver} to make device initializer.
* @param initializerName The user-visible name of the device initializer.
* @return whether the component was successfully registered as the device initializer.
* @throws IllegalArgumentException if the componentname is null or invalid
* @throws IllegalStateException if the caller is not device owner or the device has
* already been provisioned or a device initializer already exists.
*/
public boolean setDeviceInitializer(ComponentName who, ComponentName initializer,
String initializerName) throws IllegalArgumentException, IllegalStateException {
public boolean setDeviceInitializer(ComponentName who, ComponentName initializer)
throws IllegalArgumentException, IllegalStateException {
if (mService != null) {
try {
return mService.setDeviceInitializer(who, initializer, initializerName);
return mService.setDeviceInitializer(who, initializer);
} catch (RemoteException re) {
Log.w(TAG, "Failed to set device initializer");
}

2
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

@@ -213,7 +213,7 @@ interface IDevicePolicyManager {
boolean setUserEnabled(in ComponentName who);
boolean isDeviceInitializer(String packageName);
void clearDeviceInitializer(in ComponentName who);
boolean setDeviceInitializer(in ComponentName who, in ComponentName initializer, String initializerName);
boolean setDeviceInitializer(in ComponentName who, in ComponentName initializer);
String getDeviceInitializer();
ComponentName getDeviceInitializerComponent();

20
services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java
View File

@@ -116,9 +116,9 @@ class DeviceOwner {
/**
* Creates an instance of the device owner object with the device initializer set.
*/
static DeviceOwner createWithDeviceInitializer(ComponentName admin, String ownerName) {
static DeviceOwner createWithDeviceInitializer(ComponentName admin) {
DeviceOwner owner = new DeviceOwner();
owner.mDeviceInitializer = new OwnerInfo(ownerName, admin);
owner.mDeviceInitializer = new OwnerInfo(null, admin);
return owner;
}
@@ -155,12 +155,8 @@ class DeviceOwner {
return mDeviceInitializer != null ? mDeviceInitializer.packageName : null;
}
String getDeviceInitializerName() {
return mDeviceInitializer != null ? mDeviceInitializer.name : null;
}
void setDeviceInitializer(ComponentName admin, String ownerName) {
mDeviceInitializer = new OwnerInfo(ownerName, admin);
void setDeviceInitializer(ComponentName admin) {
mDeviceInitializer = new OwnerInfo(null, admin);
}
void clearDeviceInitializer() {
@@ -255,16 +251,15 @@ class DeviceOwner {
String packageName = parser.getAttributeValue(null, ATTR_PACKAGE);
mDeviceOwner = new OwnerInfo(name, packageName);
} else if (tag.equals(TAG_DEVICE_INITIALIZER)) {
String name = parser.getAttributeValue(null, ATTR_NAME);
String packageName = parser.getAttributeValue(null, ATTR_PACKAGE);
String initializerComponentStr =
parser.getAttributeValue(null, ATTR_COMPONENT_NAME);
ComponentName admin =
ComponentName.unflattenFromString(initializerComponentStr);
if (admin != null) {
mDeviceInitializer = new OwnerInfo(name, admin);
mDeviceInitializer = new OwnerInfo(null, admin);
} else {
mDeviceInitializer = new OwnerInfo(name, packageName);
mDeviceInitializer = new OwnerInfo(null, packageName);
Slog.e(TAG, "Error parsing device-owner file. Bad component name " +
initializerComponentStr);
}
@@ -334,9 +329,6 @@ class DeviceOwner {
if (mDeviceInitializer != null) {
out.startTag(null, TAG_DEVICE_INITIALIZER);
out.attribute(null, ATTR_PACKAGE, mDeviceInitializer.packageName);
if (mDeviceInitializer.name != null) {
out.attribute(null, ATTR_NAME, mDeviceInitializer.name);
}
if (mDeviceInitializer.admin != null) {
out.attribute(
null, ATTR_COMPONENT_NAME, mDeviceInitializer.admin.flattenToString());

7
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -4122,8 +4122,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
}
@Override
public boolean setDeviceInitializer(ComponentName who, ComponentName initializer,
String ownerName) {
public boolean setDeviceInitializer(ComponentName who, ComponentName initializer) {
if (!mHasFeature) {
return false;
}
@@ -4142,10 +4141,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
if (mDeviceOwner == null) {
// Device owner state does not exist, create it.
mDeviceOwner = DeviceOwner.createWithDeviceInitializer(initializer, ownerName);
mDeviceOwner = DeviceOwner.createWithDeviceInitializer(initializer);
} else {
// Device owner already exists, update it.
mDeviceOwner.setDeviceInitializer(initializer, ownerName);
mDeviceOwner.setDeviceInitializer(initializer);
}
addDeviceInitializerToLockTaskPackagesLocked(UserHandle.USER_OWNER);