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

Commit 50ffef05 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-2a27099d5aa84659aefddb4f70771add" into tm-mainline-prod 

* changes:
  [automerge] Notify connectivity service when admin UID changes 2p: 55f4eff7
  Notify connectivity service when admin UID changes
parents 7c9d674f 96ada146

src/java/com/android/internal/telephony/data/DataNetwork.java

+2 −2
Original line number Diff line number Diff line
@@ -620,8 +620,7 @@ public class DataNetwork extends StateMachine { 
    private final @NonNull List<QosBearerSession> mQosBearerSessions = new ArrayList<>();



    /**

     * The UIDs of packages that have carrier privilege. These UIDs will not change through the

     * life cycle of data network.

     * The UIDs of packages that have carrier privilege.

     */

    private @NonNull int[] mAdministratorUids = new int[0];
@@ -1013,6 +1012,7 @@ public class DataNetwork extends StateMachine { 
                    AsyncResult asyncResult = (AsyncResult) msg.obj;

                    int[] administratorUids = (int[]) asyncResult.result;

                    mAdministratorUids = Arrays.copyOf(administratorUids, administratorUids.length);

                    updateNetworkCapabilities();

                    break;

                }

                case EVENT_BANDWIDTH_ESTIMATE_FROM_MODEM_CHANGED: