summaryrefslogtreecommitdiffstats
path: root/Settings
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2015-07-15 16:06:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-15 16:06:07 +0000
commit76fb1bbfb4c7fd0ba26a9eddd5a633a42c9d4bb8 (patch)
treee5cc78cc81bfdcd089d2118bf35201bd9fa50a43 /Settings
parent9e12b62fe2cb2ccc16d59896c25bad71f4875971 (diff)
parent3c82f36ad248bc5c9f79e94cef8f353a14636f3b (diff)
downloadandroid_packages_apps_TvSettings-76fb1bbfb4c7fd0ba26a9eddd5a633a42c9d4bb8.tar.gz
android_packages_apps_TvSettings-76fb1bbfb4c7fd0ba26a9eddd5a633a42c9d4bb8.tar.bz2
android_packages_apps_TvSettings-76fb1bbfb4c7fd0ba26a9eddd5a633a42c9d4bb8.zip
am 3c82f36a: am 7caeee24: Merge "Don\'t show storage pop-up if setup is not complete" into mnc-dev
* commit '3c82f36ad248bc5c9f79e94cef8f353a14636f3b': 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.java7
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)) {