PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 5cc3730815

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

Change-Id: I2d12c89026409cf060bbdc644d3d4fe0be47902c
This commit is contained in:
Jason Monk
2016-04-22 16:13:41 +00:00
committed by android-build-merger
parent eb824e930f 5cc3730815
commit e779adf005
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -25,6 +25,7 @@ import android.net.TrafficStats;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserManager;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
@@ -116,7 +117,9 @@ public class DataUsageSummary extends DataUsageBase implements Indexable {
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { 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); super.onCreateOptionsMenu(menu, inflater);
} }