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

am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev

Browse Source 
* commit '72dcb47d945a5a9e35059c01cd8a1593e6740a42':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.
This commit is contained in:
Dave Langemak
2015-07-31 03:10:40 +00:00
committed by Android Git Automerger
parent 4581ca5308 72dcb47d94
commit 2e802cac1d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/DateTimeView.java
View File

@@ -16,6 +16,7 @@
package android.widget;
import android.app.ActivityThread;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -259,7 +260,7 @@ public class DateTimeView extends TextView {
static final Context getApplicationContextIfAvailable(Context context) {
final Context ac = context.getApplicationContext();
return ac != null ? ac : context;
return ac != null ? ac : ActivityThread.currentApplication().getApplicationContext();
}
void register(Context context) {

4
core/java/android/widget/RemoteViews.java
View File

@@ -2746,6 +2746,10 @@ public class RemoteViews implements Parcelable, Filter {
public Resources.Theme getTheme() {
return contextForResources.getTheme();
}
@Override
public String getPackageName() {
return contextForResources.getPackageName();
}
};
LayoutInflater inflater = (LayoutInflater)