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

am d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev

Browse Source 
* commit 'd38d3574d0b1905d41891c2d7f89892ab13803ae':
  Always force constructors accessible during inflation
This commit is contained in:
Alan Viverette
2015-05-05 00:56:57 +00:00
committed by Android Git Automerger
parent e2b3b1b141 d38d3574d0
commit d0dfb23714
5 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/app/Notification.java
View File

@@ -2095,6 +2095,7 @@ public class Notification implements Parcelable
try { try {
Constructor<? extends Style> constructor = styleClass.getConstructor(); Constructor<? extends Style> constructor = styleClass.getConstructor();
constructor.setAccessible(true);
style = constructor.newInstance(); style = constructor.newInstance();
style.restoreFromExtras(extras); style.restoreFromExtras(extras);
} catch (Throwable t) { } catch (Throwable t) {

1
core/java/android/preference/GenericInflater.java
View File

@@ -376,6 +376,7 @@ abstract class GenericInflater<T, P extends GenericInflater.Parent> {
Class clazz = mContext.getClassLoader().loadClass( Class clazz = mContext.getClassLoader().loadClass(
prefix != null ? (prefix + name) : name); prefix != null ? (prefix + name) : name);
constructor = clazz.getConstructor(mConstructorSignature); constructor = clazz.getConstructor(mConstructorSignature);
constructor.setAccessible(true);
sConstructorMap.put(name, constructor); sConstructorMap.put(name, constructor);
} }

2
core/java/android/transition/TransitionInflater.java
View File

@@ -211,10 +211,10 @@ public class TransitionInflater {
.asSubclass(expectedType); .asSubclass(expectedType);
if (c != null) { if (c != null) {
constructor = c.getConstructor(sConstructorSignature); constructor = c.getConstructor(sConstructorSignature);
constructor.setAccessible(true);
sConstructors.put(className, constructor); sConstructors.put(className, constructor);
} }
} }
constructor.setAccessible(true);
return constructor.newInstance(mContext, attrs); return constructor.newInstance(mContext, attrs);
} }
} catch (InstantiationException e) { } catch (InstantiationException e) {

2
core/java/android/view/LayoutInflater.java
View File

@@ -590,6 +590,7 @@ public abstract class LayoutInflater {
} }
} }
constructor = clazz.getConstructor(mConstructorSignature); constructor = clazz.getConstructor(mConstructorSignature);
constructor.setAccessible(true);
sConstructorMap.put(name, constructor); sConstructorMap.put(name, constructor);
} else { } else {
// If we have a filter, apply it to cached constructor // If we have a filter, apply it to cached constructor
@@ -615,7 +616,6 @@ public abstract class LayoutInflater {
Object[] args = mConstructorArgs; Object[] args = mConstructorArgs;
args[1] = attrs; args[1] = attrs;
constructor.setAccessible(true);
final View view = constructor.newInstance(args); final View view = constructor.newInstance(args);
if (view instanceof ViewStub) { if (view instanceof ViewStub) {
// Use the same context when inflating ViewStub later. // Use the same context when inflating ViewStub later.

1
core/java/android/view/MenuInflater.java
View File

@@ -544,6 +544,7 @@ public class MenuInflater {
try { try {
Class<?> clazz = mContext.getClassLoader().loadClass(className); Class<?> clazz = mContext.getClassLoader().loadClass(className);
Constructor<?> constructor = clazz.getConstructor(constructorSignature); Constructor<?> constructor = clazz.getConstructor(constructorSignature);
constructor.setAccessible(true);
return (T) constructor.newInstance(arguments); return (T) constructor.newInstance(arguments);
} catch (Exception e) { } catch (Exception e) {
Log.w(LOG_TAG, "Cannot instantiate class: " + className, e); Log.w(LOG_TAG, "Cannot instantiate class: " + className, e);