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

Remove config_show_regulatory_info tests

Browse Source 
Runtime Resource Overlays (RROs) can no longer change the value of
resources in manifest when read during PackagerParser.

Remove usage of config_show_regulatory_info and rely on OEMs
configuring the component using <component-override>.

Bug: 135048762
Test: adb shell pm resolve-activity
com.android.settings/com.android.settings.RegulatoryInfoDisplayActivity
Change-Id: If48f40eb261a9c90e183d4ef9bcafb0fbda38f22
This commit is contained in:
Ryan Mitchell
2019-10-08 15:58:22 -07:00
parent 527a43530e
commit 4de772fddb
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);