diff options
| author | Ben Komalo <benkomalo@google.com> | 2011-08-16 17:48:42 -0700 |
|---|---|---|
| committer | Ben Komalo <benkomalo@google.com> | 2011-08-17 11:08:26 -0700 |
| commit | f0104df823a93ef4c3336118ddb02a0924e520da (patch) | |
| tree | 0d397fc4a5cb44e8ddcc1f24ac3468b18dd2dc58 /src/com/android/settings/CryptKeeper.java | |
| parent | 25bad16da6e6b361752464cb7fae3911d5d3cefc (diff) | |
| download | packages_apps_Settings-f0104df823a93ef4c3336118ddb02a0924e520da.tar.gz packages_apps_Settings-f0104df823a93ef4c3336118ddb02a0924e520da.tar.bz2 packages_apps_Settings-f0104df823a93ef4c3336118ddb02a0924e520da.zip | |
Fixes to CryptKeeper layout for phones
- prevents crash when trying to show error state
- makes progress screen not look horribly broken
Bug: 5174783
Bug: 4671153
Change-Id: Ia72830e2fdb72f174b3ed01b6fc14be7152d1932
Diffstat (limited to 'src/com/android/settings/CryptKeeper.java')
| -rw-r--r-- | src/com/android/settings/CryptKeeper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 2dd4a7105..297288b96 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -327,7 +327,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList tv.setText(R.string.crypt_keeper_failed_summary); View view = findViewById(R.id.bottom_divider); - view.setVisibility(View.VISIBLE); + if (view != null) { + view.setVisibility(View.VISIBLE); + } } private void updateProgress() { |