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

Commit 1b08fe42 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I3c88dfff,I4c8a575b,Iecc9c8ce,I6303d49d am: 48d69928 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2097459



Change-Id: If94c961b2ce8567f8599b4de13d8a9fc85e5fea1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac6f0204 48d69928

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class DataStallRecoveryManager extends Handler { 


    /**

     * Add the RECOVERY_ACTION_REREGISTER to align the RecoveryActions between

     * DataStallRecoveryManager and Westworld. In Android T, This action will not process because

     * DataStallRecoveryManager and atoms.proto. In Android T, This action will not process because

     * the boolean array for skip recovery action is default true in carrier config setting.

     *

     * @deprecated Do not use.