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

Merge "Remove config_show_regulatory_info tests"

Browse Source
This commit is contained in:
Ryan Mitchell
2019-10-14 16:14:30 +00:00
committed by Android (Google) Code Review
parent 7a3ebe7c61 4de772fddb
commit dc67778100
2 changed files with 2 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/RegulatoryInfoDisplayActivity.java
View File

@@ -60,12 +60,6 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Resources resources = getResources();
if (!resources.getBoolean(R.bool.config_show_regulatory_info)) {
finish(); // no regulatory info to display for this device
}
AlertDialog.Builder builder = new AlertDialog.Builder(this)
.setTitle(R.string.regulatory_labels)
.setOnDismissListener(this);
@@ -95,7 +89,8 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
}
}
CharSequence regulatoryText = resources.getText(R.string.regulatory_info_text);
CharSequence regulatoryText = getResources()
.getText(R.string.regulatory_info_text);
if (regulatoryInfoDrawableExists) {
View view = getLayoutInflater().inflate(R.layout.regulatory_info, null);