Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb32ad87 authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

Merge "Send the tethering entitlement broadcast to manifest receivers"

parents 182e6ce2 9ea3dcb9

src/com/android/settings/TetherService.java

+2 −1
Original line number Diff line number Diff line
@@ -252,7 +252,8 @@ public class TetherService extends Service { 
        Intent intent = new Intent(provisionAction);

        int type = mCurrentTethers.get(index);

        intent.putExtra(TETHER_CHOICE, type);

        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);



        return intent;

    }

tests/unit/src/com/android/settings/TetherServiceTest.java

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ public class TetherServiceTest extends ServiceTestCase<TetherService> { 


        private void sendResponse(int response, Context context) {

            Intent responseIntent = new Intent(TEST_RESPONSE_ACTION);

            responseIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

            responseIntent.putExtra(TetherService.EXTRA_RESULT, response);

            context.sendBroadcast(

                    responseIntent, android.Manifest.permission.CONNECTIVITY_INTERNAL);