diff options
| author | Xin Li <delphij@google.com> | 2022-08-16 19:08:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-08-16 19:08:16 +0000 |
| commit | 5c966761efef11d868da36976d576d97af0b72c0 (patch) | |
| tree | cd7833b6acd075301682fa32fbc4d3645d918cde | |
| parent | 34e790458e9d17234a5011e4687468ae3600f4c0 (diff) | |
| parent | 1dafd8df5097aa5b0c05824e0dedba7770a67c89 (diff) | |
| download | Stk-5c966761efef11d868da36976d576d97af0b72c0.tar.gz | |
Merge "DO NOT MERGE - Merge Android 13"
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/stk/StkAppService.java | 2 | ||||
| -rw-r--r-- | src/com/android/stk/ToneDialog.java | 2 |
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(); |