summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-08-15 22:04:40 -0700
committerXin Li <delphij@google.com>2022-08-15 22:04:40 -0700
commit1dafd8df5097aa5b0c05824e0dedba7770a67c89 (patch)
treecd7833b6acd075301682fa32fbc4d3645d918cde
parent34e790458e9d17234a5011e4687468ae3600f4c0 (diff)
parentafb4df855add190061cd5428647587ccbb41f28c (diff)
downloadStk-1dafd8df5097aa5b0c05824e0dedba7770a67c89.tar.gz
DO NOT MERGE - Merge Android 13
Bug: 242648940 Merged-In: I1012148cebf8fe5034bb0283c39853e6322233b1 Change-Id: Iae3bc40378d641f2b2e0494716c2f71bf345f18b
-rw-r--r--AndroidManifest.xml1
-rw-r--r--src/com/android/stk/StkAppService.java2
-rw-r--r--src/com/android/stk/ToneDialog.java2
3 files changed, 3 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 81ba3d8..6b841ce 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,6 +31,7 @@
<uses-permission android:name="android.permission.USER_ACTIVITY" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<application android:icon="@drawable/ic_launcher_sim_toolkit"
android:label="@string/app_name"
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index ffc9d57..2e26a8e 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -833,7 +833,7 @@ public class StkAppService extends Service implements Runnable {
};
CatLog.d(LOG_TAG, "Started to observe home key event");
registerReceiver(mHomeKeyEventReceiver,
- new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+ new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), Context.RECEIVER_EXPORTED);
}
private synchronized void unregisterHomeKeyEventReceiver() {
diff --git a/src/com/android/stk/ToneDialog.java b/src/com/android/stk/ToneDialog.java
index 7617fd8..47cd61e 100644
--- a/src/com/android/stk/ToneDialog.java
+++ b/src/com/android/stk/ToneDialog.java
@@ -54,7 +54,7 @@ public class ToneDialog extends Activity {
// Register receiver
IntentFilter filter = new IntentFilter();
filter.addAction(StkAppService.FINISH_TONE_ACTIVITY_ACTION);
- registerReceiver(mFinishActivityReceiver, filter);
+ registerReceiver(mFinishActivityReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
LayoutInflater inflater = this.getLayoutInflater();