diff options
| author | Tony Mantler <nicoya@google.com> | 2015-07-14 20:07:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 20:07:41 +0000 |
| commit | 6b7690cc812b83b3b98a68a807fc818b1e0bf341 (patch) | |
| tree | def364ec70a8c550083877ddf89f43cb3127a435 /Settings | |
| parent | a7f9217c6e8a344333f268c6902e1797db145ac5 (diff) | |
| parent | 698056b7f1244688b2fea8b9435b40619fcea239 (diff) | |
| download | android_packages_apps_TvSettings-6b7690cc812b83b3b98a68a807fc818b1e0bf341.tar.gz android_packages_apps_TvSettings-6b7690cc812b83b3b98a68a807fc818b1e0bf341.tar.bz2 android_packages_apps_TvSettings-6b7690cc812b83b3b98a68a807fc818b1e0bf341.zip | |
am 698056b7: Don\'t show storage notification across users
* commit '698056b7f1244688b2fea8b9435b40619fcea239':
Don't show storage notification across users
Diffstat (limited to 'Settings')
| -rw-r--r-- | Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java | 14 |
1 files changed, 14 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 b077c326..e5b17834 100644 --- a/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java +++ b/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java @@ -18,10 +18,14 @@ package com.android.tv.settings.device.storage; import android.annotation.Nullable; import android.app.Activity; +import android.app.ActivityManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.pm.UserInfo; import android.os.Bundle; +import android.os.UserHandle; +import android.os.UserManager; import android.os.storage.DiskInfo; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; @@ -250,6 +254,16 @@ public class NewStorageActivity extends Activity { private StorageManager mStorageManager; @Override public void onReceive(Context context, Intent intent) { + final UserManager userManager = + (UserManager) context.getSystemService(Context.USER_SERVICE); + final UserInfo userInfo = userManager.getUserInfo(UserHandle.myUserId()); + + if (userInfo.isRestricted() || + ActivityManager.getCurrentUser() != UserHandle.myUserId()) { + Log.d(TAG, "Ignoring storage notification: wrong user"); + return; + } + mStorageManager = context.getSystemService(StorageManager.class); if (TextUtils.equals(intent.getAction(), VolumeInfo.ACTION_VOLUME_STATE_CHANGED)) { |