diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 | ||||
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 5 | ||||
| -rw-r--r-- | core/java/android/widget/RemoteViews.java | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f482335..b94f0b9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3229,6 +3229,13 @@ public final class Settings { "lock_screen_appwidget_ids"; /** + * Id of the appwidget shown on the lock screen when appwidgets are disabled. + * @hide + */ + public static final String LOCK_SCREEN_FALLBACK_APPWIDGET_ID = + "lock_screen_fallback_appwidget_id"; + + /** * Index of the lockscreen appwidget to restore, -1 if none. * @hide */ diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 5f598b1..fdaf39e 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -254,4 +254,9 @@ interface IWindowManager * Gets the infos for all visible windows. */ void getVisibleWindowsForDisplay(int displayId, out List<WindowInfo> outInfos); + + /** + * Device is in safe mode. + */ + boolean isSafeModeEnabled(); } diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 8d83774..8d1be53 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -351,12 +351,12 @@ public class RemoteViews implements Parcelable, Filter { public void onClick(View v) { // Insure that this view is a child of an AdapterView View parent = (View) v.getParent(); - while (!(parent instanceof AdapterView<?>) + while (parent != null && !(parent instanceof AdapterView<?>) && !(parent instanceof AppWidgetHostView)) { parent = (View) parent.getParent(); } - if (parent instanceof AppWidgetHostView) { + if (parent instanceof AppWidgetHostView || parent == null) { // Somehow they've managed to get this far without having // and AdapterView as a parent. Log.e("RemoteViews", "Collection item doesn't have AdapterView parent"); |