OSDN Git Service
Bill Yi [Wed, 1 Jun 2016 13:23:22 +0000 (06:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19e1428a2e4ec2971c4aa611345a3372cc7ef4e3
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 31 May 2016 16:22:39 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Roozbeh Pournader [Tue, 31 May 2016 01:02:41 +0000 (01:02 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
Bill Yi [Mon, 30 May 2016 19:06:25 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: If3ccb0d85f8c6ab4d8c4968445989fd0083fcbe9
Auto-generated-cl: translation import
Jason Monk [Fri, 27 May 2016 17:07:23 +0000 (17:07 +0000)]
Merge "Fix pref availability for search" into nyc-dev
Jason Monk [Fri, 27 May 2016 16:58:53 +0000 (12:58 -0400)]
Fix pref availability for search
Change-Id: Ic080e131c6c751456b22d370aade77748d912b6b
Fixes:
28987828
Jason Monk [Fri, 27 May 2016 16:51:59 +0000 (16:51 +0000)]
Merge "Don't allow restricted data usage of system" into nyc-dev
Jason Monk [Fri, 27 May 2016 14:57:10 +0000 (10:57 -0400)]
Don't allow restricted data usage of system
Cause it will just crash
Change-Id: I4ee43633eb3fa488816b1d2767073cbe404c2c33
Fixes:
28979013
Roozbeh Pournader [Fri, 27 May 2016 02:01:06 +0000 (19:01 -0700)]
Show only up to two locales in Settings
The list could otherwise grow very long, spamming the screen.
Bug:
28872122
Change-Id: I8c4dbe659e1c088eba8b5ba1b2905b5eb8bc0229
Roozbeh Pournader [Fri, 27 May 2016 00:11:47 +0000 (00:11 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
Roozbeh Pournader [Wed, 25 May 2016 21:33:20 +0000 (14:33 -0700)]
Force dashboard summary to single-line and ellipsize it
Previously, the summary could become multiline. In rare combinations
of text and screen width, to indicate to the user that the text is
cut, we now ellipsize it too. Finally, since the ellipsis can get
too close to the end of the line, we add a padding equal to the left
margin of the icon.
Bug:
28872122
Change-Id: I27226e5de7781cf096508ddbef4f9095961ce028
Maurice Lam [Thu, 26 May 2016 23:46:06 +0000 (23:46 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 17:07:20 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev
Jason Monk [Thu, 26 May 2016 16:46:51 +0000 (16:46 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 15:08:16 +0000 (11:08 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
Jason Monk [Thu, 26 May 2016 15:07:53 +0000 (11:07 -0400)]
Fix crash from battery saver switch
Turns out most things expect the conditions to be loaded immediately
so if the dashboard hasn't been hit, they crash. Instead load
immediately for everything but the dashboard.
Change-Id: Iaa1114c88b3766e2ac513acb417ef2a55a0f4e7f
Fixes:
28952354
Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
Victor Chang [Thu, 26 May 2016 10:55:26 +0000 (10:55 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev
Derek Tan [Wed, 25 May 2016 23:41:19 +0000 (23:41 +0000)]
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
Bill Yi [Wed, 25 May 2016 23:07:25 +0000 (16:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I62ad1f9b258253eda03814f9a7bd93986c85f902
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 25 May 2016 23:07:00 +0000 (23:07 +0000)]
Merge "Guard against IllegalArgumentException" into nyc-dev
Derek Tan [Wed, 25 May 2016 22:00:27 +0000 (15:00 -0700)]
Use getConfigForSubId instead of getConfig(int).
Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/
1075011). This CL changes all
callers to use getConfigForSubId(int).
Bug:
28295813
Change-Id: I0e44a5e758aed34ce26740632270700bde66cff6
Robin Lee [Wed, 25 May 2016 21:05:53 +0000 (21:05 +0000)]
Merge "Don't crash trying to disable lockdown VPN" into nyc-dev
Sudheer Shanka [Wed, 25 May 2016 20:17:12 +0000 (13:17 -0700)]
Guard against IllegalArgumentException
Bug:
28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170
TreeHugger Robot [Wed, 25 May 2016 18:27:29 +0000 (18:27 +0000)]
Merge "Skip indexing content while user is locked." into nyc-dev
Jason Monk [Wed, 25 May 2016 16:53:34 +0000 (12:53 -0400)]
Don't update conditions on background threads
Instead build a list and set it on the main thread to avoid
concurrent modification crashes.
Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes:
28794277
Jeff Sharkey [Wed, 25 May 2016 16:52:33 +0000 (10:52 -0600)]
Skip indexing content while user is locked.
Otherwise we try touching printing services which throw.
Bug:
28912897
Change-Id: I25638794b35fd383fbe67604ac921d16743628ad
Ricky Wai [Tue, 24 May 2016 18:28:53 +0000 (19:28 +0100)]
Hide work profile key in user credentials screen
Bug:
28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef
Maurice Lam [Wed, 25 May 2016 03:03:08 +0000 (20:03 -0700)]
Add activity label to encryption interstitial
So that TalkBack refers to the screen by this more specific name.
Bug:
28868846
Change-Id: I93139959dcdbd156d57f01699283e01b178305b8
TreeHugger Robot [Wed, 25 May 2016 00:17:20 +0000 (00:17 +0000)]
Merge "Remove option to configure emergency app" into nyc-dev
Victor Chang [Tue, 24 May 2016 14:46:55 +0000 (15:46 +0100)]
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation
ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED has been abused.
We should not set onfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED
for work challenge and most other cases.
It's temp fix for the rotation bug. Because it's inconsistent the activity is shown
on top of keyguard with/without rotation (or any config change). In long term,
SHOW_WHEN_LOCKED should be set only if it's truly on purpose, and remove
isKeyguardLocked checking.
Bug:
28878075
Change-Id: I19db913f5bcaf2644c8c46c25e9584103d7fee8a
Victor Chang [Tue, 24 May 2016 14:03:28 +0000 (14:03 +0000)]
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
Ricky Wai [Tue, 24 May 2016 10:13:56 +0000 (11:13 +0100)]
Use LockPatternUtils.resetKeyStore() to clear keystore
Bug:
28878708
Change-Id: I6730b6947ea917772809bb045470bdf5e95d86ba
Victor Chang [Mon, 23 May 2016 18:47:38 +0000 (19:47 +0100)]
Trust the certificate after unlocking screenlock
When trust button is clicked, if ConfirmCredential (CC) is shown,
and user successfully unlock CC, trust the cert immediately
Bug:
28752364
Change-Id: Ied4aeda59a668a9dd2bf079a385b1fecd8eabb9e
TreeHugger Robot [Mon, 23 May 2016 15:35:34 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 13:45:55 +0000 (13:45 +0000)]
Merge "Fixed whitelist stats so it's only logged on add." into nyc-dev
Bill Yi [Mon, 23 May 2016 13:35:00 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I18ff7e3d70d30e76e01214b31c1df2065209f30f
Auto-generated-cl: translation import
Victor Chang [Mon, 23 May 2016 11:51:54 +0000 (11:51 +0000)]
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
Baligh Uddin [Sat, 21 May 2016 20:10:17 +0000 (13:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
Adrian Roos [Fri, 20 May 2016 21:36:22 +0000 (14:36 -0700)]
Remove option to configure emergency app
Bug:
28873644
Change-Id: Iddf4e781af8cb3ca3b62d1141c58402933bd8ec8
Felipe Leme [Fri, 20 May 2016 21:27:57 +0000 (21:27 +0000)]
Merge "Defined help page for Data Saver." into nyc-dev
Felipe Leme [Fri, 20 May 2016 21:13:22 +0000 (14:13 -0700)]
Fixed whitelist stats so it's only logged on add.
BUG:
28166693
Change-Id: If1f91167c21054e78a966670c20c174c3f73d2a5
Jason Monk [Fri, 20 May 2016 18:21:08 +0000 (18:21 +0000)]
Merge "Protect against monkey crash" into nyc-dev
Jason Monk [Fri, 20 May 2016 18:15:10 +0000 (14:15 -0400)]
Protect against monkey crash
When rebuild comes in after context is no longer valid
Change-Id: Ib64e93372bff4c6b0e1232ac257f3df0e9d0be0a
Fixes:
28875397
Victor Chang [Fri, 13 May 2016 16:06:59 +0000 (17:06 +0100)]
Fix Continous loop in unifed screenlock when trying to Trust a CA cert
Cause: with unified screenlock, ConfirmDeviceCredentialActivity didn't
forward result with FLAG_ACTIVITY_FORWARD_RESULT
Also, fixed that ConfirmDeviceCredentialActivity didn't allow fingerprint
authenication in unified screenlock after keystore unlocked.
In ChooseLockSettingsHelper, add one new util function to allow
extra option to set returnCredentials to false while external to true.
Set StrongAuth to "not required" when it has been successfully unlocked.
Test:
1. PO Unified Screenlock/Work Challenge x fingerprint -> ok to trust cert
(Also, no credential is returned in intent)
2. WorkMode off -> Reboot -> turn on Work mode
-> no fingerprint option, PIN unlock successful to turn work mode on
Bug:
28752364
Change-Id: I6dc8865e8f005545f8577d7731afb4495647062b
Victor Chang [Fri, 20 May 2016 17:19:42 +0000 (17:19 +0000)]
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
Victor Chang [Tue, 17 May 2016 15:50:08 +0000 (16:50 +0100)]
Temp fix for NPE when race condition happens in TrustedCredentialsSettings
Bug:
28762124
Change-Id: I21e46c2008e106db1c43573171e0d852cbe0a68a
Felipe Leme [Fri, 20 May 2016 00:07:01 +0000 (17:07 -0700)]
Defined help page for Data Saver.
BUG:
28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
Jason Monk [Thu, 19 May 2016 19:36:55 +0000 (15:36 -0400)]
Don't use ApplicationsState for summaries
Since it grabs a lock that can be slow on the main thread, don't use
ApplicationsState in any of the summaries, instead load the information
directly from the PM.
Change-Id: Ibefe867810d2a9926177a8de4e23a7faea4b1c3b
Fixes:
28435146
Sanket Agarwal [Wed, 27 Apr 2016 20:22:44 +0000 (13:22 -0700)]
Handle return value when Bluetooth is enabled
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.
Bug: b/
28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
Kenny Guy [Thu, 19 May 2016 11:01:37 +0000 (11:01 +0000)]
Merge "Update work challenge background image." into nyc-dev
Baligh Uddin [Wed, 18 May 2016 19:06:52 +0000 (19:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Kenny Guy [Wed, 18 May 2016 15:14:19 +0000 (16:14 +0100)]
Update work challenge background image.
Updated so the orange briefcase in the image
isn't central so avoiding clashing with text.
Bug:
28557192
Change-Id: Ic8e4ea71f47449e81619b28b979f59c3d9aaf6a0
Julia Reynolds [Wed, 18 May 2016 14:02:05 +0000 (14:02 +0000)]
Merge "Null check." into nyc-dev
Yohei Yukawa [Tue, 17 May 2016 22:49:04 +0000 (15:49 -0700)]
Follow class package change: LocaleList
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1]. This CL follows up that
package change.
No behavior change is intended.
[1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
Bug:
28819696
Change-Id: Ibd7934b30062046830d63f33d1c6febef32da976
Pankaj Kanwar [Tue, 17 May 2016 22:16:48 +0000 (22:16 +0000)]
Merge "Choose Bluetooth Device window cant't fill screen" into nyc-dev
Julia Reynolds [Tue, 17 May 2016 20:14:10 +0000 (16:14 -0400)]
Null check.
Change-Id: I16dfe2cf265b4254aa69bc6165a8f72fc3954d7a
Fixes:
28531037
pkanwar [Tue, 17 May 2016 19:03:42 +0000 (12:03 -0700)]
Choose Bluetooth Device window cant't fill screen
b/
28684861: fixed the layout file to ensure that the separators cover
the entire screen.
Change-Id: I4471a1da901c9a4c0830ff0dfc943cd087ee1702
TreeHugger Robot [Tue, 17 May 2016 18:28:20 +0000 (18:28 +0000)]
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev
Shweta Chahar [Tue, 17 May 2016 14:27:09 +0000 (14:27 +0000)]
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
Robin Lee [Tue, 17 May 2016 13:47:22 +0000 (14:47 +0100)]
Don't crash trying to disable lockdown VPN
Bug:
28624328
Change-Id: I2b726453da43feaf5f46d45679a702a52e6f4df0
shwetachahar [Fri, 29 Apr 2016 16:14:03 +0000 (17:14 +0100)]
Modify the TTS engine preference UI so that the radio button and the TTS
engine name are a single focusable element.
Bug:
27136946
Change-Id: I502634e0942b9fe30e290ce9de6ba293f33bf863
Baligh Uddin [Tue, 17 May 2016 06:39:18 +0000 (23:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f10df22a0d22c5408d2c1cc83441e19ffa28405
Auto-generated-cl: translation import
Felipe Leme [Mon, 16 May 2016 18:36:27 +0000 (11:36 -0700)]
Implemented onRestrictBackgroundBlacklistChanged().
BUG:
28743623
Change-Id: I2d8620360858660fed0e745b16dc61ce262b90b9
TreeHugger Robot [Mon, 16 May 2016 20:19:06 +0000 (20:19 +0000)]
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
Julia Reynolds [Mon, 16 May 2016 20:12:06 +0000 (20:12 +0000)]
Merge "Fix crash on rotation." into nyc-dev
Julia Reynolds [Mon, 16 May 2016 19:56:15 +0000 (15:56 -0400)]
Fix crash on rotation.
Change-Id: Ife0a040bfc1a6ecc579d544f78cc45e37f5bca3c
Fixes:
28767083
Sudheer Shanka [Mon, 16 May 2016 18:46:34 +0000 (11:46 -0700)]
Fix crash in SetupRedactionInterstitial.
Change-Id: Ia662cd60e4c9eeaccd0eb168431e755c2c79b676
Fixes:
28785168
Julia Reynolds [Mon, 16 May 2016 18:22:15 +0000 (18:22 +0000)]
Merge "Catch rule creation exceptions." into nyc-dev
Julia Reynolds [Mon, 16 May 2016 13:53:23 +0000 (09:53 -0400)]
Catch rule creation exceptions.
Bug:
28775583
Change-Id: I54c4af0352c88b27717660741709ec54e4749656
Clara Bayarri [Mon, 16 May 2016 13:16:46 +0000 (14:16 +0100)]
Rename requestKeyboardShortcutsHelper
Per API Council feedback
Bug:
28775576
Change-Id: Ia19668dceb7da2222e9716fcb1caff8d0ee86c41
TreeHugger Robot [Fri, 13 May 2016 21:18:06 +0000 (21:18 +0000)]
Merge "Guard against exception when getting package installer info." into nyc-dev
Sudheer Shanka [Fri, 13 May 2016 19:56:34 +0000 (12:56 -0700)]
Guard against exception when getting package installer info.
Bug:
28742227
Change-Id: I8742c882ae6b18cb8f51a9da04170358a20a7d48
Makoto Onuki [Fri, 13 May 2016 18:51:40 +0000 (18:51 +0000)]
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
Julia Reynolds [Fri, 13 May 2016 18:14:58 +0000 (18:14 +0000)]
Merge "Don't crash on invalid numbers." into nyc-dev
Julia Reynolds [Fri, 13 May 2016 18:01:40 +0000 (14:01 -0400)]
Don't crash on invalid numbers.
Change-Id: I5c1bff5733c5db5f411c2827177b0c1efa1e120e
Fixes:
28756890
TreeHugger Robot [Fri, 13 May 2016 17:35:20 +0000 (17:35 +0000)]
Merge "Fixed calls to update() when configuration changed." into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 17:14:11 +0000 (17:14 +0000)]
Merge "Removed onRestrictPowerChanged()." into nyc-dev
Makoto Onuki [Fri, 13 May 2016 16:40:26 +0000 (09:40 -0700)]
ShortcutManager: Remove developer option from NYC
Bug
28704708
Change-Id: Ib2301ea556104e9ffd6a18885e228717843d6acb
Victor Chang [Fri, 13 May 2016 15:08:17 +0000 (15:08 +0000)]
Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev
Victor Chang [Fri, 13 May 2016 13:42:17 +0000 (14:42 +0100)]
Fix NULL instead of DPC name is displayed in Certificate warning
Bug:
28752118
Change-Id: I5a6e17efd92aaea5188d83f2ccb7e7b8d1f1dc1b
Maurice Lam [Fri, 13 May 2016 00:51:09 +0000 (00:51 +0000)]
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
Maurice Lam [Thu, 12 May 2016 23:24:41 +0000 (16:24 -0700)]
[ScreenLock] Use requested quality for encryption popup
Use the requested password quality instead of the currently-in-use
password quality because encryption interstitial is shown before
the lock type is updated.
Bug:
28326234
Change-Id: I9ae950bab48f62033c59b582218c8a586f5b71ba
Felipe Leme [Thu, 12 May 2016 21:37:11 +0000 (14:37 -0700)]
Fixed calls to update() when configuration changed.
update() is an expensive operation and should only be called
once under normal circumstances (it still needs to be called due to external changes). In particular, it should not be called again on orientation changes.
The first approach to solve the orientation change caused the volume title to not be shown when the screen changed on multi window environments; the fix for title issue caused the update to be called again on configuration changes.
This change properly fixes both issues by removing the onAttach() / onDetach() methods and using a clearer variable (mNeedsUpdate) to avoid future regressions.
BUG:
24508289
BUG:
27989238
Change-Id: I140f5a541cda293f1c476d3b80a5bc8918e18b08
Adrian Roos [Thu, 12 May 2016 20:52:24 +0000 (20:52 +0000)]
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
Adrian Roos [Wed, 11 May 2016 19:49:20 +0000 (15:49 -0400)]
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I84b90b4047129794f1397351f9c8624f0048ad41
Fixes:
26981262
Julia Reynolds [Thu, 12 May 2016 17:53:26 +0000 (17:53 +0000)]
Merge "Update lock timeout value after pref change." into nyc-dev
Julia Reynolds [Thu, 12 May 2016 17:48:34 +0000 (13:48 -0400)]
Update lock timeout value after pref change.
Change-Id: I0d16256cb61e2db481d99349cd49c17e51de7c87
Fixes:
28734916
Maurice Lam [Thu, 12 May 2016 17:42:19 +0000 (17:42 +0000)]
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
Gustav Sennton [Thu, 12 May 2016 13:23:55 +0000 (13:23 +0000)]
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
Gustav Sennton [Wed, 11 May 2016 11:31:40 +0000 (12:31 +0100)]
Disable WebViewSetting for non-admin users.
For an app to be able to know whether the WebViewSetting is enabled for
a user we disable the setting at boot for non-admin users. In this way
an app can call intent.resolveActivity[Info] for the WebViewSetting
intent to check whether the WebViewSetting is enabled before linking to
it.
Bug:
28034166
Change-Id: I33b3fa10a38f2a2600cddd0891ef746126abdd61
Jim Miller [Thu, 12 May 2016 01:52:34 +0000 (01:52 +0000)]
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
Dianne Hackborn [Thu, 12 May 2016 00:40:16 +0000 (00:40 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev
Maurice Lam [Tue, 10 May 2016 19:45:53 +0000 (12:45 -0700)]
Set Wi-Fi dialog spinners to 48dps tall
Set the minimum height to align with the accessibility guidelines
and to disable ripple projection.
Also adds scroll indicators to the scroll view.
Bug:
28683023
Change-Id: I24c58c0d6e8ef4b9efc8b3f877bcd659f42b6c6d
Dianne Hackborn [Wed, 11 May 2016 21:22:05 +0000 (14:22 -0700)]
Fix issue #
28400000: Settings memory UI still showing z-ram...
...but probably shouldn't.
Change-Id: I3becb68a9989d915d11439b7beec1fe262261f78
Sudheer Shanka [Wed, 11 May 2016 19:04:19 +0000 (19:04 +0000)]
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
Jason Monk [Wed, 11 May 2016 18:04:57 +0000 (18:04 +0000)]
Merge "Fix unmount up button" into nyc-dev
Maurice Lam [Wed, 11 May 2016 18:04:26 +0000 (18:04 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-dev
Jason Monk [Wed, 11 May 2016 17:53:13 +0000 (13:53 -0400)]
Fix unmount up button
Change-Id: I24b388079c438075e3a8652822e7a2fb84fec608
Fixes:
28704198