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

Unverified Commit d2fe8a22 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eJ7LAJ9jcP3xwjZRr6Imef4PBJDXHnMp6gCfRH5UvD330bOZfXqi+DvE5eeEDTE=
# =8ZCt
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2469 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (38) and others
# Via Automerger Merge Worker (51) and others
* tag 'android-15.0.0_r6': (53 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Fix for kernal panic caused by large number of threads.
  Hide button to turn on paused profile.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Make java_sdk_library dependencies explicit
  Import translations. DO NOT MERGE ANYWHERE
  Remove the Photopicker entrypoints from DocumentsUI
  Revert "Remove the Photopicker entrypoints from DocumentsUI"
  Remove the Photopicker entrypoints from DocumentsUI
  Prevent clickjacking attack in DocsUi.
  fix  DocumentsUI crash
  Make java_sdk_library dependencies explicit
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  ...

Change-Id: Ib0c7711c7c6ef40f7a7ad2c6ff3e92458fd095fb
parents bd011efd f5903c06
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@
    <uses-permission android:name="android.permission.MODIFY_QUIET_MODE" />
    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS"/>

    <!-- Permissions required for reading and logging compat changes -->
    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>
+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ android_test {
    ],

    libs: [
        "android.test.base",
        "android.test.runner",
        "android.test.base.stubs.system",
        "android.test.runner.stubs.system",
    ],

    static_libs: [
+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ android_test {
    ],

    libs: [
        "android.test.base",
        "android.test.mock",
        "android.test.runner",
        "android.test.base.stubs.system",
        "android.test.mock.stubs.system",
        "android.test.runner.stubs.system",
    ],

    static_libs: [
+172 −4
Original line number Diff line number Diff line
@@ -25,9 +25,177 @@
# To prevent class not found exception in org.brotli.dec.Dictionary
-keep final class org.brotli.dec.DictionaryData

# To prevent resource fields not found exception on running DocumentsUIGoogleTests module
-keepclassmembers class com.android.documentsui.R$* {
    public static <fields>;
# keep rule generated after running trace references on the test app against DocumentsUIGoogle.jar
# TODO(b/339312616): Remove after a more permanent fix is available
# On modifying or adding new test run the following command to generate new keep rules and replace
# the once listed below with the newly generated keep rules:
# java -cp prebuilts/r8/r8.jar com.android.tools.r8.tracereferences.TraceReferences \
# --lib out/soong/.intermediates/frameworks/base/framework/android_common/<some_hash>/combined/framework.jar \
# --source out/target/product/panther/testcases/DocumentsUIGoogleTests/arm64/DocumentsUIGoogleTests.apk \
# --target  out/soong/.intermediates/vendor/unbundled_google/packages/DocumentsUIGoogle/DocumentsUIGoogle/android_common/<some_hash>/javac/DocumentsUIGoogle.jar \
# --keep-rules \
# --output /tmp/keep.txt

-keep class androidx.appcompat.R$id {
  int search_src_text;
}
-keep class com.android.documentsui.R$bool {
  int feature_notification_channel;
  int full_bar_search_view;
  int is_launcher_enabled;
  int show_search_bar;
}
-keep class com.android.documentsui.R$color {
  int app_background_color;
  int primary;
}
-keep class com.android.documentsui.R$dimen {
  int grid_item_radius;
}
-keep class com.android.documentsui.R$drawable {
  int ic_briefcase;
  int ic_cab_cancel;
  int ic_eject;
  int ic_menu_copy;
  int ic_root_download;
  int ic_sd_storage;
  int root_list_selector;
  int work_off;
}
-keep class com.android.documentsui.R$id {
  int action_menu_compress;
  int action_menu_copy_to;
  int action_menu_delete;
  int action_menu_deselect_all;
  int action_menu_extract_to;
  int action_menu_inspect;
  int action_menu_move_to;
  int action_menu_open_with;
  int action_menu_rename;
  int action_menu_select;
  int action_menu_select_all;
  int action_menu_share;
  int action_menu_sort;
  int action_menu_view_in_owner;
  int apps_group;
  int apps_row;
  int button;
  int content;
  int cross_profile;
  int cross_profile_content;
  int cross_profile_progress;
  int dir_menu_copy_to_clipboard;
  int dir_menu_create_dir;
  int dir_menu_cut_to_clipboard;
  int dir_menu_delete;
  int dir_menu_deselect_all;
  int dir_menu_inspect;
  int dir_menu_open;
  int dir_menu_open_in_new_window;
  int dir_menu_open_with;
  int dir_menu_paste_from_clipboard;
  int dir_menu_paste_into_folder;
  int dir_menu_rename;
  int dir_menu_select_all;
  int dir_menu_share;
  int dir_menu_view_in_owner;
  int drawer_layout;
  int inspector_details_view;
  int option_menu_create_dir;
  int option_menu_debug;
  int option_menu_inspect;
  int option_menu_launcher;
  int option_menu_new_window;
  int option_menu_search;
  int option_menu_select_all;
  int option_menu_settings;
  int option_menu_show_hidden_files;
  int option_menu_sort;
  int root_menu_eject_root;
  int root_menu_open_in_new_window;
  int root_menu_paste_into_folder;
  int root_menu_settings;
  int sub_menu_grid;
  int sub_menu_list;
  int table_header;
  int tabs;
  int tabs_container;
  int toolbar;
}
-keep class com.android.documentsui.R$layout {
  int apps_row;
  int directory_header;
  int files_activity;
  int fixed_layout;
  int item_doc_list;
}
-keep class com.android.documentsui.R$menu {
  int dir_context_menu;
  int file_context_menu;
  int mixed_context_menu;
}
-keep class com.android.documentsui.R$plurals {
  int copy_error_notification_title;
  int elements_dragged;
}
-keep class com.android.documentsui.R$string {
  int cant_select_work_files_error_message;
  int cant_select_work_files_error_title;
  int copy_notification_title;
  int copy_preparing;
  int copy_remaining;
  int debug_content_uri;
  int default_root_uri;
  int directory_items;
  int empty;
  int menu_copy;
  int menu_move;
  int menu_rename;
  int menu_select;
  int menu_select_all;
  int menu_sort;
  int menu_view_in_owner;
  int metadata_address;
  int metadata_album;
  int metadata_altitude;
  int metadata_aperture;
  int metadata_aperture_format;
  int metadata_artist;
  int metadata_camera;
  int metadata_camera_format;
  int metadata_composer;
  int metadata_coordinates;
  int metadata_coordinates_format;
  int metadata_date_time;
  int metadata_dimensions;
  int metadata_dimensions_format;
  int metadata_duration;
  int metadata_focal_format;
  int metadata_focal_length;
  int metadata_iso_format;
  int metadata_iso_speed_ratings;
  int metadata_shutter_speed;
  int name_conflict;
  int no_results;
  int personal_tab;
  int preferred_root_package;
  int quiet_mode_button;
  int quiet_mode_error_title;
  int rename_error;
  int search_bar_hint;
  int share_via;
  int sort_dimension_date;
  int sort_dimension_file_type;
  int sort_dimension_name;
  int sort_dimension_size;
  int sort_direction_ascending;
  int sort_direction_descending;
  int trusted_quick_viewer_package;
  int work_tab;
}
-keep class com.android.documentsui.R$style {
  int DocumentsDefaultTheme;
  int DocumentsTheme;
}

# Keep Apache Commons Compress classes
+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@
    <string name="cant_select_cross_profile_files_error_title" msgid="17010948874969413">"يتعذّر اختيار ملفات <xliff:g id="PROFILE">%1$s</xliff:g>."</string>
    <string name="cant_select_cross_profile_files_error_message" msgid="3815829574883844944">"لا يسمح لك مشرف تكنولوجيا المعلومات في مؤسستك بالوصول إلى ملفات <xliff:g id="PROFILE_0">%1$s</xliff:g> من خلال تطبيق <xliff:g id="PROFILE_1">%2$s</xliff:g>."</string>
    <string name="cant_save_to_work_error_title" msgid="1351323070040641358">"لا يمكن حفظ الملفات في ملف العمل"</string>
    <string name="cant_save_to_work_error_message" msgid="4975583233814059890">"لا يسمح لك مشرف تكنولوجيا المعلومات بحفظ الملفات الشخصية في ملفك الشخصي للعمل."</string>
    <string name="cant_save_to_work_error_message" msgid="4975583233814059890">"لا يسمح لك مشرف تكنولوجيا المعلومات بحفظ الملفات الشخصية في ملف العمل الخاص بك."</string>
    <string name="cant_save_to_personal_error_title" msgid="858327493694069780">"لا يمكن حفظ الملفات في الملف الشخصي"</string>
    <string name="cant_save_to_personal_error_message" msgid="6991758723736381751">"لا يسمح لك مشرف تكنولوجيا المعلومات بحفظ ملفات العمل في ملفك الشخصي."</string>
    <string name="cant_save_to_cross_profile_error_title" msgid="5158984057654779022">"يتعذّر الحفظ في ملف <xliff:g id="PROFILE">%1$s</xliff:g>."</string>
Loading