LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update design to fix non-protected broadcast from system issue" am: 548e90b6f7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2442762

Change-Id: Ia576b0e7f4ce753464c30e3172a5e8c56209affe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-02-20 06:46:10 +00:00
committed by Automerger Merge Worker
parent 1199d3da54 548e90b6f7
commit cf9468324d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Tethering/AndroidManifest.xml
View File

@@ -45,7 +45,6 @@
<!-- Sending non-protected broadcast from system uid is not allowed. --> <!-- Sending non-protected broadcast from system uid is not allowed. -->
<protected-broadcast android:name="com.android.server.connectivity.tethering.DISABLE_TETHERING" /> <protected-broadcast android:name="com.android.server.connectivity.tethering.DISABLE_TETHERING" />
<protected-broadcast android:name="com.android.server.connectivity.KeepaliveTracker.TCP_POLLING_ALARM" />
<application <application
android:process="com.android.networkstack.process" android:process="com.android.networkstack.process"

5
service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
View File

@@ -16,6 +16,8 @@
package com.android.server.connectivity; package com.android.server.connectivity;
import static android.Manifest.permission.NETWORK_STACK;
import static android.content.Context.RECEIVER_NOT_EXPORTED;
import static android.net.NetworkAgent.CMD_START_SOCKET_KEEPALIVE; import static android.net.NetworkAgent.CMD_START_SOCKET_KEEPALIVE;
import static android.net.SocketKeepalive.ERROR_INVALID_SOCKET; import static android.net.SocketKeepalive.ERROR_INVALID_SOCKET;
import static android.net.SocketKeepalive.SUCCESS_PAUSED; import static android.net.SocketKeepalive.SUCCESS_PAUSED;
@@ -246,6 +248,7 @@ public class AutomaticOnOffKeepaliveTracker {
private PendingIntent createTcpPollingAlarmIntent(@NonNull Context context, private PendingIntent createTcpPollingAlarmIntent(@NonNull Context context,
@NonNull IBinder token) { @NonNull IBinder token) {
final Intent intent = new Intent(ACTION_TCP_POLLING_ALARM); final Intent intent = new Intent(ACTION_TCP_POLLING_ALARM);
intent.setPackage(context.getPackageName());
// Intent doesn't expose methods to put extra Binders, but Bundle does. // Intent doesn't expose methods to put extra Binders, but Bundle does.
final Bundle b = new Bundle(); final Bundle b = new Bundle();
b.putBinder(EXTRA_BINDER_TOKEN, token); b.putBinder(EXTRA_BINDER_TOKEN, token);
@@ -305,7 +308,7 @@ public class AutomaticOnOffKeepaliveTracker {
if (SdkLevel.isAtLeastU()) { if (SdkLevel.isAtLeastU()) {
mContext.registerReceiver(mReceiver, new IntentFilter(ACTION_TCP_POLLING_ALARM), mContext.registerReceiver(mReceiver, new IntentFilter(ACTION_TCP_POLLING_ALARM),
null, handler); NETWORK_STACK, handler, RECEIVER_NOT_EXPORTED);
} }
mAlarmManager = mContext.getSystemService(AlarmManager.class); mAlarmManager = mContext.getSystemService(AlarmManager.class);
} }