Merge Android 24Q1 Release (ab/11220357)

Bug: 319669529
Merged-In: I73656ada39193116dfaeeb7e65a1c49b0bd0feb5
Change-Id: Ieb1c5f2569147e1bfc5080e9a8bbf845a467a4e6

7 files changed, 9 insertions, 23 deletions

diff --git a/jni/ipphelper/ippstatus_monitor.c b/jni/ipphelper/ippstatus_monitor.c
index 2a19976..81d41f2 100644
--- a/jni/ipphelper/ippstatus_monitor.c
+++ b/jni/ipphelper/ippstatus_monitor.c
@@ -189,6 +189,7 @@ static void _get_status(const ifc_status_monitor_t *this_p,
     } while (0);
 }
 
+// TODO (b/312004304): job_state_cb code removed due to crash.
 static void _start(const ifc_status_monitor_t *this_p,
         void (*status_cb)(const printer_state_dyn_t *new_status,
                 const printer_state_dyn_t *old_status, void *status_param),
@@ -270,23 +271,7 @@ static void _start(const ifc_status_monitor_t *this_p,
                     (*status_cb)(&curr_status, &last_status, param);
                     memcpy(&last_status, &curr_status, sizeof(printer_state_dyn_t));
                 }
-
-                // Do not call for job state if thread has been stopped
-                if (job_state_cb != NULL && !monitor->stop_monitor) {
-                    pthread_mutex_lock(&monitor->mutex);
-                    if (job_id == -1) {
-                        job_id = getJobId(monitor->http, monitor->http_resource,
-                                          monitor->printer_uri, &new_state,
-                                          monitor->requesting_user);
-                    }
-                    _get_job_state(this_p, &new_state, job_id);
-                    pthread_mutex_unlock(&monitor->mutex);
-
-                    if (memcmp(&new_state, &old_state, sizeof(job_state_dyn_t)) != 0) {
-                        (*job_state_cb)(&new_state, param);
-                        memcpy(&old_state, &new_state, sizeof(job_state_dyn_t));
-                    }
-                }
+                // TODO (b/312004304): Code removed due to crash. Will add it back with proper mitigation.
                 sleep(1);
             }
         }
diff --git a/jni/lib/lib_wprint.c b/jni/lib/lib_wprint.c
index fc3cfb5..f2f7d2e 100755
--- a/jni/lib/lib_wprint.c
+++ b/jni/lib/lib_wprint.c
@@ -597,6 +597,7 @@ static void _job_status_callback(const printer_state_dyn_t *new_status,
 
 /*
  * Callback after getting the print job state
+ * TODO (b/312004304): _print_job_state_callback code call removed due to crash.
  */
 static void _print_job_state_callback(const job_state_dyn_t *new_state, void *param) {
     wprint_job_callback_params_t cb_param = {};
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 7f55668..40453ee 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -57,7 +57,7 @@
     <string name="failed_printer_connection" msgid="4196305972749960362">"Não foi possível se conectar à impressora"</string>
     <string name="failed_connection" msgid="8068661997318286575">"Não foi possível se conectar à impressora <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
     <string name="saved_printers" msgid="4567534965213125526">"Impressoras salvas"</string>
-    <string name="forget" msgid="892068061425802502">"Ignorar"</string>
+    <string name="forget" msgid="892068061425802502">"Esquecer"</string>
     <string name="connects_via_wifi_direct" msgid="652300632780158437">"Conecta via Wi-Fi Direct"</string>
     <string name="connects_via_network" msgid="5990041581556733898">"Conecta via rede atual em <xliff:g id="IP_ADDRESS">%1$s</xliff:g>"</string>
     <string name="recommendation_summary" msgid="2979700524954307566">"O serviço de impressão padrão oferece opções básicas. É possível que existam outras opções disponíveis para essa impressora em outro serviço de impressão."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 096bfc6..b8503d8 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -66,8 +66,8 @@
     <string name="recommendation_enable_summary" msgid="3500907868251326224">"Selecione para ativar."</string>
     <string name="recommendation_manage" msgid="4683640588502866284">"Gerir serviços"</string>
     <string name="security" msgid="2279008326210305401">"Segurança"</string>
-    <string name="certificate_update_request" msgid="1314796413107139475">"Esta impressora forneceu um novo certificado de segurança ou outro dispositivo está a roubar a respetiva identidade. Pretende aceitar o novo certificado?"</string>
-    <string name="not_encrypted_request" msgid="4871472176807381642">"Esta impressora já não aceita tarefas encriptadas. Pretende continuar com a impressão?"</string>
+    <string name="certificate_update_request" msgid="1314796413107139475">"Esta impressora forneceu um novo certificado de segurança ou outro dispositivo está a roubar a respetiva identidade. Quer aceitar o novo certificado?"</string>
+    <string name="not_encrypted_request" msgid="4871472176807381642">"Esta impressora já não aceita tarefas encriptadas. Quer continuar com a impressão?"</string>
     <string name="accept" msgid="4426153292469698134">"Aceitar"</string>
     <string name="reject" msgid="24751635160440693">"Rejeitar"</string>
     <string name="connections" msgid="8895413761760117180">"Ligações"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7f55668..40453ee 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -57,7 +57,7 @@
     <string name="failed_printer_connection" msgid="4196305972749960362">"Não foi possível se conectar à impressora"</string>
     <string name="failed_connection" msgid="8068661997318286575">"Não foi possível se conectar à impressora <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
     <string name="saved_printers" msgid="4567534965213125526">"Impressoras salvas"</string>
-    <string name="forget" msgid="892068061425802502">"Ignorar"</string>
+    <string name="forget" msgid="892068061425802502">"Esquecer"</string>
     <string name="connects_via_wifi_direct" msgid="652300632780158437">"Conecta via Wi-Fi Direct"</string>
     <string name="connects_via_network" msgid="5990041581556733898">"Conecta via rede atual em <xliff:g id="IP_ADDRESS">%1$s</xliff:g>"</string>
     <string name="recommendation_summary" msgid="2979700524954307566">"O serviço de impressão padrão oferece opções básicas. É possível que existam outras opções disponíveis para essa impressora em outro serviço de impressão."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 5b00220..e674d15 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -26,7 +26,7 @@
     <string name="printer_low_on_toner" msgid="8807858294038587130">"Niveli i tonerit i ulët"</string>
     <string name="printer_door_open" msgid="2446302931916940874">"Dera e hapur"</string>
     <string name="printer_jammed" msgid="5104099859384749499">"I bllokuar"</string>
-    <string name="printer_offline" msgid="9196864753298645066">"Jashtë linje"</string>
+    <string name="printer_offline" msgid="9196864753298645066">"Offline"</string>
     <string name="printer_bad_certificate" msgid="1366180387095466268">"Certifikatë me probleme"</string>
     <string name="printer_not_encrypted" msgid="1913051469275483673">"Nuk është enkriptuar"</string>
     <string name="printer_check" msgid="6428369671197132828">"Kontrollo printerin"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 377ed88..fc19c26 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -52,7 +52,7 @@
     <string name="wifi_direct_printing" msgid="8423811041563144048">"Wi-Fi Direct 列印"</string>
     <string name="wifi_direct_printers" msgid="541168032444693191">"Wi-Fi Direct 打印機"</string>
     <string name="searching" msgid="2114018057619514587">"正在搜尋…"</string>
-    <string name="connect_hint_text" msgid="587112503851044234">"您可能需要在打印機的前置面板上核准此連線"</string>
+    <string name="connect_hint_text" msgid="587112503851044234">"你可能需要在打印機的前置面板上核准此連線"</string>
     <string name="connecting_to" msgid="2665161014972086194">"正在連接 <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
     <string name="failed_printer_connection" msgid="4196305972749960362">"無法連接打印機"</string>
     <string name="failed_connection" msgid="8068661997318286575">"無法連接 <xliff:g id="PRINTER">%1$s</xliff:g>"</string>