Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev

am: af6236d06f

* commit 'af6236d06f1be85bc52e04e9cad8478035a677ab':
  Don't link to MobileNetworkSettings unless admin user

Change-Id: I1f2f8772015145bf418472f6389ea2d8f8533601
This commit is contained in:
Jason Monk
2016-04-22 16:08:52 +00:00
committed by android-build-merger

View File

@@ -25,6 +25,7 @@ import android.net.TrafficStats;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -116,7 +117,9 @@ public class DataUsageSummary extends DataUsageBase implements Indexable {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.data_usage, menu);
if (UserManager.get(getContext()).isAdminUser()) {
inflater.inflate(R.menu.data_usage, menu);
}
super.onCreateOptionsMenu(menu, inflater);
}