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

Commit 2ddaf273 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fixed the incorrect permission for data/network service binding" am:... 

Merge "Fixed the incorrect permission for data/network service binding" am: db53d9ee am: 99057034
am: 4d8e8c6d

Change-Id: I78f73e0d8d80b764ede18dbc2dfed2bc5fea485b
parents 0386c7c7 4d8e8c6d

tests/telephonytests/src/com/android/internal/telephony/CellularNetworkServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class CellularNetworkServiceTest extends TelephonyTest { 
        mCellularNetworkService = new CellularNetworkService();

        ServiceInfo serviceInfo =  new ServiceInfo();

        serviceInfo.packageName = "com.android.phone";

        serviceInfo.permission = "android.permission.BIND_NETWORK_SERVICE";

        serviceInfo.permission = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";

        IntentFilter filter = new IntentFilter();

        mContextFixture.addService(

                NetworkService.NETWORK_SERVICE_INTERFACE,

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        mCellularNetworkService = new CellularNetworkService();

        ServiceInfo serviceInfo =  new ServiceInfo();

        serviceInfo.packageName = "com.android.phone";

        serviceInfo.permission = "android.permission.BIND_NETWORK_SERVICE";

        serviceInfo.permission = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";

        IntentFilter filter = new IntentFilter();

        mContextFixture.addService(

                NetworkService.NETWORK_SERVICE_INTERFACE,

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class DataConnectionTest extends TelephonyTest { 
        CellularDataService cellularDataService = new CellularDataService();

        ServiceInfo serviceInfo = new ServiceInfo();

        serviceInfo.packageName = "com.android.phone";

        serviceInfo.permission = "android.permission.BIND_DATA_SERVICE";

        serviceInfo.permission = "android.permission.BIND_TELEPHONY_DATA_SERVICE";

        IntentFilter filter = new IntentFilter();

        mContextFixture.addService(

                DataService.DATA_SERVICE_INTERFACE,

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public class DcTrackerTest extends TelephonyTest { 
        CellularDataService cellularDataService = new CellularDataService();

        ServiceInfo serviceInfo = new ServiceInfo();

        serviceInfo.packageName = "com.android.phone";

        serviceInfo.permission = "android.permission.BIND_DATA_SERVICE";

        serviceInfo.permission = "android.permission.BIND_TELEPHONY_DATA_SERVICE";

        IntentFilter filter = new IntentFilter();

        mContextFixture.addService(

                DataService.DATA_SERVICE_INTERFACE,