diff options
| author | Tony Mantler <nicoya@google.com> | 2015-07-15 16:20:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 16:20:34 +0000 |
| commit | 64f77e7eda5fabede248d767de912bb9679800b0 (patch) | |
| tree | afa2eb38c6f7f1650823aeefe03939f60f6ed867 /Settings | |
| parent | 5c4c9a5bc90fea830b2b437cc064efcc409d1395 (diff) | |
| parent | 76fb1bbfb4c7fd0ba26a9eddd5a633a42c9d4bb8 (diff) | |
| download | android_packages_apps_TvSettings-64f77e7eda5fabede248d767de912bb9679800b0.tar.gz android_packages_apps_TvSettings-64f77e7eda5fabede248d767de912bb9679800b0.tar.bz2 android_packages_apps_TvSettings-64f77e7eda5fabede248d767de912bb9679800b0.zip | |
am 76fb1bbf: am 3c82f36a: am 7caeee24: Merge "Don\'t show storage pop-up if setup is not complete" into mnc-dev
* commit '76fb1bbfb4c7fd0ba26a9eddd5a633a42c9d4bb8':
Don't show storage pop-up if setup is not complete
Diffstat (limited to 'Settings')
| -rw-r--r-- | Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java b/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java index e5b17834..9a313daa 100644 --- a/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java +++ b/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java @@ -30,6 +30,7 @@ import android.os.storage.DiskInfo; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; +import android.provider.Settings; import android.support.annotation.NonNull; import android.support.v17.leanback.widget.GuidanceStylist; import android.support.v17.leanback.widget.GuidedAction; @@ -264,6 +265,12 @@ public class NewStorageActivity extends Activity { return; } + if (Settings.Secure.getInt(context.getContentResolver(), + Settings.Secure.USER_SETUP_COMPLETE, 0) == 0) { + Log.d(TAG, "Ignoring storage notification: setup not complete"); + return; + } + mStorageManager = context.getSystemService(StorageManager.class); if (TextUtils.equals(intent.getAction(), VolumeInfo.ACTION_VOLUME_STATE_CHANGED)) { |