commit 123422c99cf3d7968e7d1bc5277d3a5f567140a6
author Yanting Yang <yantingyang@google.com> Thu Apr 01 03:54:27 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 01 03:54:27 2021 +0000
tree f84f9e690d08d39e6fa1b1fd192e5b3a48955ac2
parent e9cfef7aceebe5b7cfe8396ec606dae43206f7b3
parent acbd60285f8a51eab4d3014cc26444559235059d

Merge "Add positive button into regulatory info dialog" into sc-dev

src/com/android/settings/RegulatoryInfoDisplayActivity.java

diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
index 20aafc2..8f65051 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -62,7 +62,8 @@
         super.onCreate(savedInstanceState);
         AlertDialog.Builder builder = new AlertDialog.Builder(this)
                 .setTitle(R.string.regulatory_labels)
-                .setOnDismissListener(this);
+                .setOnDismissListener(this)
+                .setPositiveButton(android.R.string.ok, null /* onClickListener */);
 
         boolean regulatoryInfoDrawableExists = false;