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

Merge "Respect style when source is also set" into tm-dev

Browse Source
This commit is contained in:
Kholoud Mohamed
2022-04-13 16:06:46 +00:00
committed by Android (Google) Code Review
parent 107ce2cd75 06a85bdb26
commit a9448a6772
2 changed files with 97 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/admin/DevicePolicyResourcesManager.java
View File

@@ -70,6 +70,7 @@ public class DevicePolicyResourcesManager {
* *
* <p>Important notes to consider when using this API: * <p>Important notes to consider when using this API:
* <ul> * <ul>
* <li> Updated resources are persisted over reboots.
* <li>{@link #getDrawable} references the resource * <li>{@link #getDrawable} references the resource
* {@link DevicePolicyDrawableResource#getResourceIdInCallingPackage()} in the * {@link DevicePolicyDrawableResource#getResourceIdInCallingPackage()} in the
* calling package each time it gets called. You have to ensure that the resource is always * calling package each time it gets called. You have to ensure that the resource is always
@@ -381,7 +382,9 @@ public class DevicePolicyResourcesManager {
* *
* <p>Important notes to consider when using this API: * <p>Important notes to consider when using this API:
* <ul> * <ul>
* <li> {@link #getString} references the resource {@code callingPackageResourceId} in the * <li> Updated resources are persisted over reboots.
* <li> {@link #getString} references the resource
* {@link DevicePolicyStringResource#getResourceIdInCallingPackage()} in the
* calling package each time it gets called. You have to ensure that the resource is always * calling package each time it gets called. You have to ensure that the resource is always
* available in the calling package as long as it is used as an updated resource. * available in the calling package as long as it is used as an updated resource.
* <li> You still have to re-call {@code setStrings} even if you only make changes to the * <li> You still have to re-call {@code setStrings} even if you only make changes to the

179
services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java
View File

@@ -55,8 +55,6 @@ class DeviceManagementResourcesProvider {
private static final String TAG_ROOT = "root"; private static final String TAG_ROOT = "root";
private static final String TAG_DRAWABLE_STYLE_ENTRY = "drawable-style-entry"; private static final String TAG_DRAWABLE_STYLE_ENTRY = "drawable-style-entry";
private static final String TAG_DRAWABLE_SOURCE_ENTRY = "drawable-source-entry"; private static final String TAG_DRAWABLE_SOURCE_ENTRY = "drawable-source-entry";
private static final String ATTR_DRAWABLE_STYLE_SIZE = "drawable-style-size";
private static final String ATTR_DRAWABLE_SOURCE_SIZE = "drawable-source-size";
private static final String ATTR_DRAWABLE_STYLE = "drawable-style"; private static final String ATTR_DRAWABLE_STYLE = "drawable-style";
private static final String ATTR_DRAWABLE_SOURCE = "drawable-source"; private static final String ATTR_DRAWABLE_SOURCE = "drawable-source";
private static final String ATTR_DRAWABLE_ID = "drawable-id"; private static final String ATTR_DRAWABLE_ID = "drawable-id";
@@ -70,9 +68,9 @@ class DeviceManagementResourcesProvider {
mUpdatedDrawablesForStyle = new HashMap<>(); mUpdatedDrawablesForStyle = new HashMap<>();
/** /**
* Map of <drawable_id, <source_id, resource_value>> * Map of <drawable_id, <source_id, <style_id, resource_value>>>
*/ */
private final Map<String, Map<String, ParcelableResource>> private final Map<String, Map<String, Map<String, ParcelableResource>>>
mUpdatedDrawablesForSource = new HashMap<>(); mUpdatedDrawablesForSource = new HashMap<>();
/** /**
@@ -110,7 +108,8 @@ class DeviceManagementResourcesProvider {
if (DevicePolicyResources.UNDEFINED.equals(drawableSource)) { if (DevicePolicyResources.UNDEFINED.equals(drawableSource)) {
updated |= updateDrawable(drawableId, drawableStyle, resource); updated |= updateDrawable(drawableId, drawableStyle, resource);
} else { } else {
updated |= updateDrawableForSource(drawableId, drawableSource, resource); updated |= updateDrawableForSource(
drawableId, drawableSource, drawableStyle, resource);
} }
} }
if (!updated) { if (!updated) {
@@ -138,19 +137,23 @@ class DeviceManagementResourcesProvider {
} }
} }
// TODO(b/214576716): change this to respect style
private boolean updateDrawableForSource( private boolean updateDrawableForSource(
String drawableId, String drawableSource, ParcelableResource updatableResource) { String drawableId, String drawableSource, String drawableStyle,
ParcelableResource updatableResource) {
synchronized (mLock) { synchronized (mLock) {
Map<String, Map<String, ParcelableResource>> drawablesForId =
mUpdatedDrawablesForSource.get(drawableId);
if (!mUpdatedDrawablesForSource.containsKey(drawableId)) { if (!mUpdatedDrawablesForSource.containsKey(drawableId)) {
mUpdatedDrawablesForSource.put(drawableId, new HashMap<>()); mUpdatedDrawablesForSource.put(drawableId, new HashMap<>());
} }
ParcelableResource current = mUpdatedDrawablesForSource.get(drawableId).get( if (!drawablesForId.containsKey(drawableSource)) {
drawableSource); mUpdatedDrawablesForSource.get(drawableId).put(drawableSource, new HashMap<>());
}
ParcelableResource current = drawablesForId.get(drawableSource).get(drawableStyle);
if (updatableResource.equals(current)) { if (updatableResource.equals(current)) {
return false; return false;
} }
mUpdatedDrawablesForSource.get(drawableId).put(drawableSource, updatableResource); drawablesForId.get(drawableSource).put(drawableStyle, updatableResource);
return true; return true;
} }
} }
@@ -175,23 +178,30 @@ class DeviceManagementResourcesProvider {
} }
@Nullable @Nullable
ParcelableResource getDrawable( ParcelableResource getDrawable(String drawableId, String drawableStyle, String drawableSource) {
String drawableId, String drawableStyle, String drawableSource) {
synchronized (mLock) { synchronized (mLock) {
if (mUpdatedDrawablesForSource.containsKey(drawableId) ParcelableResource resource = getDrawableForSourceLocked(
&& mUpdatedDrawablesForSource.get(drawableId).containsKey(drawableSource)) { drawableId, drawableStyle, drawableSource);
return mUpdatedDrawablesForSource.get(drawableId).get(drawableSource); if (resource != null) {
return resource;
} }
if (!mUpdatedDrawablesForStyle.containsKey(drawableId)) { if (!mUpdatedDrawablesForStyle.containsKey(drawableId)) {
Log.d(TAG, "No updated drawable found for drawable id " + drawableId);
return null; return null;
} }
if (mUpdatedDrawablesForStyle.get(drawableId).containsKey(drawableStyle)) { return mUpdatedDrawablesForStyle.get(drawableId).get(drawableStyle);
return mUpdatedDrawablesForStyle.get(drawableId).get(drawableStyle);
}
} }
Log.d(TAG, "No updated drawable found for drawable id " + drawableId); }
return null;
@Nullable
ParcelableResource getDrawableForSourceLocked(
String drawableId, String drawableStyle, String drawableSource) {
if (!mUpdatedDrawablesForSource.containsKey(drawableId)) {
return null;
}
if (!mUpdatedDrawablesForSource.get(drawableId).containsKey(drawableSource)) {
return null;
}
return mUpdatedDrawablesForSource.get(drawableId).get(drawableSource).get(drawableStyle);
} }
/** /**
@@ -249,12 +259,8 @@ class DeviceManagementResourcesProvider {
@Nullable @Nullable
ParcelableResource getString(String stringId) { ParcelableResource getString(String stringId) {
synchronized (mLock) { synchronized (mLock) {
if (mUpdatedStrings.containsKey(stringId)) { return mUpdatedStrings.get(stringId);
return mUpdatedStrings.get(stringId);
}
} }
Log.d(TAG, "No updated string found for string id " + stringId);
return null;
} }
private void write() { private void write() {
@@ -359,50 +365,55 @@ class DeviceManagementResourcesProvider {
} }
void writeInner(TypedXmlSerializer out) throws IOException { void writeInner(TypedXmlSerializer out) throws IOException {
writeDrawablesForStylesInner(out);
writeDrawablesForSourcesInner(out);
writeStringsInner(out);
}
private void writeDrawablesForStylesInner(TypedXmlSerializer out) throws IOException {
if (mUpdatedDrawablesForStyle != null && !mUpdatedDrawablesForStyle.isEmpty()) { if (mUpdatedDrawablesForStyle != null && !mUpdatedDrawablesForStyle.isEmpty()) {
for (Map.Entry<String, Map<String, ParcelableResource>> drawableEntry for (Map.Entry<String, Map<String, ParcelableResource>> drawableEntry
: mUpdatedDrawablesForStyle.entrySet()) { : mUpdatedDrawablesForStyle.entrySet()) {
out.startTag(/* namespace= */ null, TAG_DRAWABLE_STYLE_ENTRY);
out.attribute(
/* namespace= */ null, ATTR_DRAWABLE_ID, drawableEntry.getKey());
out.attributeInt(
/* namespace= */ null,
ATTR_DRAWABLE_STYLE_SIZE,
drawableEntry.getValue().size());
int counter = 0;
for (Map.Entry<String, ParcelableResource> styleEntry for (Map.Entry<String, ParcelableResource> styleEntry
: drawableEntry.getValue().entrySet()) { : drawableEntry.getValue().entrySet()) {
out.startTag(/* namespace= */ null, TAG_DRAWABLE_STYLE_ENTRY);
out.attribute(
/* namespace= */ null, ATTR_DRAWABLE_ID, drawableEntry.getKey());
out.attribute( out.attribute(
/* namespace= */ null, /* namespace= */ null,
ATTR_DRAWABLE_STYLE + (counter++), ATTR_DRAWABLE_STYLE,
styleEntry.getKey()); styleEntry.getKey());
styleEntry.getValue().writeToXmlFile(out); styleEntry.getValue().writeToXmlFile(out);
out.endTag(/* namespace= */ null, TAG_DRAWABLE_STYLE_ENTRY);
} }
out.endTag(/* namespace= */ null, TAG_DRAWABLE_STYLE_ENTRY);
} }
} }
}
private void writeDrawablesForSourcesInner(TypedXmlSerializer out) throws IOException {
if (mUpdatedDrawablesForSource != null && !mUpdatedDrawablesForSource.isEmpty()) { if (mUpdatedDrawablesForSource != null && !mUpdatedDrawablesForSource.isEmpty()) {
for (Map.Entry<String, Map<String, ParcelableResource>> drawableEntry for (Map.Entry<String, Map<String, Map<String, ParcelableResource>>> drawableEntry
: mUpdatedDrawablesForSource.entrySet()) { : mUpdatedDrawablesForSource.entrySet()) {
out.startTag(/* namespace= */ null, TAG_DRAWABLE_SOURCE_ENTRY); for (Map.Entry<String, Map<String, ParcelableResource>> sourceEntry
out.attribute(
/* namespace= */ null, ATTR_DRAWABLE_ID, drawableEntry.getKey());
out.attributeInt(
/* namespace= */ null,
ATTR_DRAWABLE_SOURCE_SIZE,
drawableEntry.getValue().size());
int counter = 0;
for (Map.Entry<String, ParcelableResource> sourceEntry
: drawableEntry.getValue().entrySet()) { : drawableEntry.getValue().entrySet()) {
out.attribute( for (Map.Entry<String, ParcelableResource> styleEntry
/* namespace= */ null, : sourceEntry.getValue().entrySet()) {
ATTR_DRAWABLE_SOURCE + (counter++), out.startTag(/* namespace= */ null, TAG_DRAWABLE_SOURCE_ENTRY);
sourceEntry.getKey()); out.attribute(/* namespace= */ null, ATTR_DRAWABLE_ID,
sourceEntry.getValue().writeToXmlFile(out); drawableEntry.getKey());
out.attribute(/* namespace= */ null, ATTR_DRAWABLE_SOURCE,
sourceEntry.getKey());
out.attribute(/* namespace= */ null, ATTR_DRAWABLE_STYLE,
styleEntry.getKey());
styleEntry.getValue().writeToXmlFile(out);
out.endTag(/* namespace= */ null, TAG_DRAWABLE_SOURCE_ENTRY);
}
} }
out.endTag(/* namespace= */ null, TAG_DRAWABLE_SOURCE_ENTRY);
} }
} }
}
private void writeStringsInner(TypedXmlSerializer out) throws IOException {
if (mUpdatedStrings != null && !mUpdatedStrings.isEmpty()) { if (mUpdatedStrings != null && !mUpdatedStrings.isEmpty()) {
for (Map.Entry<String, ParcelableResource> entry for (Map.Entry<String, ParcelableResource> entry
: mUpdatedStrings.entrySet()) { : mUpdatedStrings.entrySet()) {
@@ -417,52 +428,48 @@ class DeviceManagementResourcesProvider {
} }
} }
private boolean readInner( private boolean readInner(TypedXmlPullParser parser, int depth, String tag)
TypedXmlPullParser parser, int depth, String tag)
throws XmlPullParserException, IOException { throws XmlPullParserException, IOException {
if (depth > 2) { if (depth > 2) {
return true; // Ignore return true; // Ignore
} }
switch (tag) { switch (tag) {
case TAG_DRAWABLE_STYLE_ENTRY: case TAG_DRAWABLE_STYLE_ENTRY: {
String drawableId = parser.getAttributeValue( String id = parser.getAttributeValue(/* namespace= */ null, ATTR_DRAWABLE_ID);
/* namespace= */ null, ATTR_DRAWABLE_ID); String style = parser.getAttributeValue(
mUpdatedDrawablesForStyle.put( /* namespace= */ null, ATTR_DRAWABLE_STYLE);
drawableId, ParcelableResource resource = ParcelableResource.createFromXml(parser);
new HashMap<>()); if (!mUpdatedDrawablesForStyle.containsKey(id)) {
int size = parser.getAttributeInt( mUpdatedDrawablesForStyle.put(id, new HashMap<>());
/* namespace= */ null, ATTR_DRAWABLE_STYLE_SIZE);
for (int i = 0; i < size; i++) {
String style = parser.getAttributeValue(
/* namespace= */ null, ATTR_DRAWABLE_STYLE + i);
mUpdatedDrawablesForStyle.get(drawableId).put(
style,
ParcelableResource.createFromXml(parser));
} }
mUpdatedDrawablesForStyle.get(id).put(style, resource);
break; break;
case TAG_DRAWABLE_SOURCE_ENTRY: }
drawableId = parser.getAttributeValue( case TAG_DRAWABLE_SOURCE_ENTRY: {
/* namespace= */ null, ATTR_DRAWABLE_ID); String id = parser.getAttributeValue(/* namespace= */ null, ATTR_DRAWABLE_ID);
mUpdatedDrawablesForSource.put(drawableId, new HashMap<>()); String source = parser.getAttributeValue(
size = parser.getAttributeInt( /* namespace= */ null, ATTR_DRAWABLE_SOURCE);
/* namespace= */ null, ATTR_DRAWABLE_SOURCE_SIZE); String style = parser.getAttributeValue(
for (int i = 0; i < size; i++) { /* namespace= */ null, ATTR_DRAWABLE_STYLE);
String source = parser.getAttributeValue( ParcelableResource resource = ParcelableResource.createFromXml(parser);
/* namespace= */ null, ATTR_DRAWABLE_SOURCE + i); if (!mUpdatedDrawablesForSource.containsKey(id)) {
mUpdatedDrawablesForSource.get(drawableId).put( mUpdatedDrawablesForSource.put(id, new HashMap<>());
source,
ParcelableResource.createFromXml(parser));
} }
if (!mUpdatedDrawablesForSource.get(id).containsKey(source)) {
mUpdatedDrawablesForSource.get(id).put(source, new HashMap<>());
}
mUpdatedDrawablesForSource.get(id).get(source).put(style, resource);
break; break;
case TAG_STRING_ENTRY: }
String sourceId = parser.getAttributeValue( case TAG_STRING_ENTRY: {
/* namespace= */ null, ATTR_SOURCE_ID); String id = parser.getAttributeValue(/* namespace= */ null, ATTR_SOURCE_ID);
mUpdatedStrings.put( mUpdatedStrings.put(id, ParcelableResource.createFromXml(parser));
sourceId, ParcelableResource.createFromXml(parser));
break; break;
default: }
default: {
Log.e(TAG, "Unexpected tag: " + tag); Log.e(TAG, "Unexpected tag: " + tag);
return false; return false;
}
} }
return true; return true;
} }