diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java index 6561512..40d5437 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -281,7 +281,9 @@ public class ApplicationsState { return null; } } - entry = getEntryLocked(info); + if (info != null) { + entry = getEntryLocked(info); + } } if (DEBUG_LOCKING) Log.v(TAG, "...getEntry releasing lock"); return entry; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java index 915867b..6d2c8c0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java @@ -73,8 +73,8 @@ public class RotationLockTile extends QSTile<QSTile.BooleanState> { : mController.isRotationLocked(); final boolean userInitiated = arg != null ? ((UserBoolean) arg).userInitiated : false; state.visible = mController.isRotationLockAffordanceVisible(); - if (state.value == rotationLocked) { - // No change, no need to update all the values. + if (state.value == rotationLocked && state.contentDescription != null) { + // No change and initialized, no need to update all the values. return; } state.value = rotationLocked; |