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

am: 7014023f5d

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

Change-Id: I874d3910be0b1c808ab63f6fa9e9dda1a0731a47

src/com/android/settings/datausage/DataUsageSummary.java

@@ -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) {
+        if (UserManager.get(getContext()).isAdminUser()) {
             inflater.inflate(R.menu.data_usage, menu);
+        }
         super.onCreateOptionsMenu(menu, inflater);
     }