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

Commit 7f42fd84 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "CellularDataService: mCallbackMap is not thread safe" am: 88d585be am: 62b60cf7 

Change-Id: Id55fdd803d2cfc10f15b11d9367d911b27457114
parents dc726b4e 62b60cf7

telephony/java/android/telephony/NetworkService.java

+3 −0
Original line number Diff line number Diff line
@@ -234,6 +234,9 @@ public abstract class NetworkService extends Service { 
     * this method to facilitate the creation of {@link NetworkServiceProvider} instances. The system

     * will call this method after binding the network service for each active SIM slot id.

     *

     * This methead is guaranteed to be invoked in {@link NetworkService}'s internal handler thread

     * whose looper can be retrieved with {@link Looper.myLooper()} when override this method.

     *

     * @param slotIndex SIM slot id the network service associated with.

     * @return Network service object. Null if failed to create the provider (e.g. invalid slot

     * index)

telephony/java/android/telephony/data/DataService.java

+3 −0
Original line number Diff line number Diff line
@@ -458,6 +458,9 @@ public abstract class DataService extends Service { 
     * this method to facilitate the creation of {@link DataServiceProvider} instances. The system

     * will call this method after binding the data service for each active SIM slot id.

     *

     * This methead is guaranteed to be invoked in {@link DataService}'s internal handler thread

     * whose looper can be retrieved with {@link Looper.myLooper()} when override this method.

     *

     * @param slotIndex SIM slot id the data service associated with.

     * @return Data service object. Null if failed to create the provider (e.g. invalid slot index)

     */