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

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

Merge "fixup! Show event log when application data is deleted" into main am:... 

Merge "fixup! Show event log when application data is deleted" into main am: 253698da am: 388c86e9 am: 9aa05855

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817543



Change-Id: Idabce132989528eac8a677adc80b27f2f5b6de8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29e125bc 9aa05855

services/core/java/com/android/server/EventLogTags.logtags

+9 −8
Original line number Diff line number Diff line
@@ -180,14 +180,7 @@ option java_package com.android.server 
# Snapshot rebuild instance

3131 pm_snapshot_rebuild (build_time|1|3),(lifetime|1|3)

# Caller information to clear application data

1003160 pm_clear_app_data_caller (pid|1),(uid|1),(package|3)

# ---------------------------

# Installer.java

# ---------------------------

# Caller Information to clear application data

1003200 installer_clear_app_data_caller (pid|1),(uid|1),(package|3),(flags|1)

# Call stack to clear application data

1003201 installer_clear_app_data_call_stack (method|3),(class|3),(file|3),(line|1)

3132 pm_clear_app_data_caller (pid|1),(uid|1),(package|3)



# ---------------------------

# InputMethodManagerService.java
@@ -226,6 +219,14 @@ option java_package com.android.server 
# Auto-brightness adjustments by the user.

35000 auto_brightness_adj (old_lux|5),(old_brightness|5),(new_lux|5),(new_brightness|5)



# ---------------------------

# Installer.java

# ---------------------------

# Caller Information to clear application data

39000 installer_clear_app_data_caller (pid|1),(uid|1),(package|3),(flags|1)

# Call stack to clear application data

39001 installer_clear_app_data_call_stack (method|3),(class|3),(file|3),(line|1)



# ---------------------------

# ConnectivityService.java

# ---------------------------

services/core/java/com/android/server/am/EventLogTags.logtags

+1 −1
Original line number Diff line number Diff line
@@ -131,4 +131,4 @@ option java_package com.android.server.am 
30110 am_intent_sender_redirect_user (userId|1|5)



# Caller information to clear application data

1030002 am_clear_app_data_caller (pid|1),(uid|1),(package|3)
 
30120 am_clear_app_data_caller (pid|1),(uid|1),(package|3)