7009 Commits

Author SHA1 Message Date
Pirama Arumuga Nainar
9f165ca3e1 Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" 2022-01-28 20:14:07 +00:00
Peter Collingbourne
4b799b3691 Merge "Disable pointer authentication in app processes." 2022-01-24 21:17:30 +00:00
Pirama Arumuga Nainar
bf3cc242fc Fix Wbitwise-instead-of-logical introduced by clang-r445002
Bug: http://b/215753485

frameworks/base/cmds/incidentd/src/WorkDirectory.cpp:283:38: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical]
            report->set_all_sections(report->all_sections() | args.all());
                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                            ||
frameworks/base/cmds/incidentd/src/WorkDirectory.cpp:283:38: note: cast
one or both operands to int to silence this warning

Test: Build with new clang
Change-Id: I8dc614e274c95f8941bf390cb68c60d0328bb31b
2022-01-21 14:16:03 -08:00
Peter Collingbourne
69538cf7f3 Disable pointer authentication in app processes.
Unfortunately we have discovered that some applications in the wild
are using PAC instructions incorrectly. To keep those applications
working on PAC enabled devices, disable PAC in application processes
for now.

Bug: 212660282
Change-Id: I3030c47be9d02a27505bd4775c1982a20755758c
2022-01-19 13:35:54 -08:00
Keith Mok
73357c61d0 Merge "Fix nanosleep in BootAnimation" am: 45e281ef2b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891586

Change-Id: I19f359a175aa9596f400481029c029c2dd908aa5
2021-11-19 22:54:54 +00:00
Keith Mok
0f2e66866c Fix nanosleep in BootAnimation
clock_nanosleep will return 0 or error no directly.

Bug: 207149564
Test: Build ok
Change-Id: I15866728719d0672a16b4a76a8fd3be4d53d420a
2021-11-19 20:38:22 +00:00
Xin Li
10d9972786 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I13199bc39e9445929195f3d15579cbffe94e92b0
Change-Id: I35fa3c6c2abf679c51033f1395a08d511ed8739f
2021-11-18 17:00:37 +00:00
Treehugger Robot
70d5485b28 Merge "Update the resources owner files" 2021-11-09 17:02:16 +00:00
Yurii Zubrytskyi
4c87aec35f Update the resources owner files
Bug: 205633893
Test: n/a

Change-Id: Ib9cf70c9acb200e8019a6522cb6a85f85b760651
2021-11-08 16:25:33 -08:00
Jing Ji
7e76d37fdb Merge "Explicitly exit from the am instrument after test completes" 2021-11-03 17:07:30 +00:00
Jing Ji
209ddf9871 Explicitly exit from the am instrument after test completes
To speed up the test. For a trivial am instrument run:

[Before]
0m01.53s real     0m00.16s user     0m00.16s system

[After]
0m00.72s real     0m00.21s user     0m00.11s system

Bug: 204195830
Test: am instrument -w
Change-Id: I66196d1db9169681dabb2e5dacdd18e6105ad75a
2021-11-01 17:35:37 -07:00
hongzhu wang
4201a5ddbc Fix: crash when running am.jar without parameters
Issure:
When no args to run am.jar,mAm is not initialized before use
process will crash in NRE

Solution:
Initialize mAm in constructor

Bug: 202471754
Test: manual
Running follow sh on the device displays help messages correctly

base=/system
export CLASSPATH=$base/framework/am.jar
exec app_process $base/bin com.android.commands.am.Am

Change-Id: I088f4f5b4072d350c217655a291658d0bfd506e9
2021-10-09 05:04:03 +00:00
Xin Li
c03b0fa033 Merge "Merge Android 12" 2021-10-07 23:50:15 +00:00
Treehugger Robot
c5f75d374d Merge "Allow readability-identifier-length warnings" am: 8cc0f40cf2 am: 75c39b2515 am: be3d5337e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1844656

Change-Id: I19d6cac46b0f46c791decfc1a981c8585ad8ac29
2021-10-07 17:50:29 +00:00
Treehugger Robot
75c39b2515 Merge "Allow readability-identifier-length warnings" am: 8cc0f40cf2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1844656

Change-Id: I947247fecc4195a37d708f74e7efe763d86ab77e
2021-10-07 17:38:54 +00:00
Chih-Hung Hsieh
715a6c427c Allow readability-identifier-length warnings
Many such warnings come from the next clang r437112.

Test: make with new clang r437112.
Change-Id: Ia43848b02ed00d50eb55a5152abcab8bd2178d9e
2021-10-04 16:01:56 -07:00
Colin Cross
8af0caf41d Fix idmap2 compiling against musl
Add missing includes that are not transitively provided when compiling
against musl.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: If8829cebb0c62b539d7a336b75cf106755588cdd
Merged-In: If8829cebb0c62b539d7a336b75cf106755588cdd
2021-09-16 19:25:28 +00:00
Colin Cross
4f4ef93a8e Merge "Fix idmap2 compiling against musl" into stage-aosp-master am: 5f9fe6e37c am: 866e277bc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15839888

Change-Id: I23fe2b8851404c74fbe140f226f668ee06c862ee
2021-09-16 16:54:07 +00:00
Colin Cross
9192abcf13 Fix idmap2 compiling against musl
Add missing includes that are not transitively provided when compiling
against musl.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: If8829cebb0c62b539d7a336b75cf106755588cdd
2021-09-15 15:08:20 -07:00
TreeHugger Robot
e130b51212 Merge "Fix AOSP boot animation black screen issue." into sc-qpr1-dev am: 6d673f1f9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15799420

Change-Id: I20e02831b45734709470a21c729eec401b8e6595
2021-09-10 19:32:18 +00:00
TreeHugger Robot
6d673f1f9a Merge "Fix AOSP boot animation black screen issue." into sc-qpr1-dev 2021-09-10 19:28:29 +00:00
Shan Huang
bfd2d3ce72 Fix AOSP boot animation black screen issue.
Bug: 197740038
Test: Force stock android animation on a pixel phone in
BootAnimation.cpp. (Remember to disable dynamic coloring.) Check stock android animation.

Change-Id: I3c3979c344a351ec261bb12127cff971d6050367
2021-09-09 23:19:04 +00:00
TreeHugger Robot
580ae422b6 Merge "Fixes boot animation not appearing issue on Oriole." into sc-qpr1-dev am: 3a986bb956
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779528

Change-Id: I55a4a8d71a6271122e011d59a2da9194bf5d6dfb
2021-09-09 20:54:25 +00:00
Shan Huang
81846bad1a Fixes boot animation not appearing issue on Oriole.
Test: Flash the updated animation to device. Reboot and check if the
animation shows up.
Bug:199179989
Fixes:199179989

Change-Id: Ic2a2496efcaca4b6ae90c167498b8cd794b46bea
2021-09-07 19:27:41 +00:00
Shan Huang
5c7503cb06 Merge "Support rendering white pixels." into sc-qpr1-dev am: e2f4ad3e7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676845

Change-Id: I1904a3c032bf442a6a3c1f1032edb2604d159ce3
2021-08-26 22:23:52 +00:00
Shan Huang
488ff7459c Support rendering white pixels.
This CL allows dynamic color boot animations to render graphics in shades of white.

Bug: 190093578
Test: adb shell stop; adb shell start. Complete reboot to see the full
sequence (including the loader part)

Change-Id: I672a49aff90fa04daa4bdd6fd3c0b5497cc1a115
2021-08-26 20:28:08 +00:00
Shan Huang
28c7d63d16 Merge "Move boot color sysprop parsing to after loading zips." into sc-qpr1-dev am: a1c0f6dd41
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600978

Change-Id: I5869b4e53f9023a60f7af87a8b5afae03389eda4
2021-08-19 21:33:15 +00:00
Shan Huang
a1c0f6dd41 Merge "Move boot color sysprop parsing to after loading zips." into sc-qpr1-dev 2021-08-19 21:14:56 +00:00
TreeHugger Robot
97395479cb Merge "Update boot animation owners" into sc-qpr1-dev 2021-08-19 20:21:21 +00:00
Shan Huang
a1f7a71c2d Move boot color sysprop parsing to after loading zips.
Otherwise the sysprops would not be loaded yet and accessing them would
return empty strings.

Though unlikely, this is not 100% safe because boot color sysprops
are not guaranteed to be loaded by the time zips are loaded. A TODO
here is to understand boot steps and their timing implications so
that we can fully avoid the race condition.

Bug: 190093578
Test: adb shell setprop persist.bootanim.color(1-4), then reboot phone.
Change-Id: I603da080b1732a436a10dbaca6f2be9f158124dc
2021-08-19 18:50:25 +00:00
Shan Huang
9d7c1b7163 Merge "Revert "Revert "Revert "Revert "Implement dynamic colors for boot animation.""""" into sc-qpr1-dev am: 813c29b9a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600806

Change-Id: I1bf4b275ef8a195b71e18c2eb19c2979f4c4000f
2021-08-19 00:58:12 +00:00
Colin Cross
304793a811 Rename ProcResult stdout and stderr fields
stdout and stderr are macros in musl, which causes build failures
when they are used as field names.  Rename the fields to stdout_str
and stderr_str.

Test: builds
Merged-In: I04770d2d6e82ca8393308ab12a304838a80f0ae5
Change-Id: I04770d2d6e82ca8393308ab12a304838a80f0ae5
2021-08-18 23:01:24 +00:00
Lucas Dupin
7d4f45d464 Update boot animation owners
Test: none
Bug: 190093578
Change-Id: Id83d1ff6bbec63ec94402260a29c3ddcbf0ae414
(cherry picked from commit 273227d1acdd9901664d7536adbd1826844c728d)
2021-08-18 21:47:20 +00:00
TreeHugger Robot
222a127f2b Merge "Rename ProcResult stdout and stderr fields" into stage-aosp-master am: bde914ea74 am: 56d3a6d2da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600955

Change-Id: I04f5a9fc247c45ab37aa558ff905339fddb070af
2021-08-18 20:56:33 +00:00
Shan Huang
89965006af Revert "Revert "Revert "Revert "Implement dynamic colors for boot animation.""""
This reverts commit ad9cf52df959489b615f30cbf072415b3352063b.

Reason for revert: Fixing broken atv test
Test: atv atp test tv/platform/simple_boot_test
Bug: 190093578

Change-Id: I9d6ecb6024ce49eef8007458b0d9bf0ff24906c7
2021-08-18 17:20:45 +00:00
Colin Cross
faa5e27652 Rename ProcResult stdout and stderr fields
stdout and stderr are macros in musl, which causes build failures
when they are used as field names.  Rename the fields to stdout_str
and stderr_str.

Test: builds
Change-Id: I04770d2d6e82ca8393308ab12a304838a80f0ae5
2021-08-17 15:01:14 -07:00
Lucas Dupin
3fc58c5c78 Merge "Revert "Revert "Migrate boot animation from GLES 1.0 to GLES2.0.""" into sc-qpr1-dev am: 185741e47d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15585669

Change-Id: Iadf102c6741ded5fc054368b2c018bb51a9ae0ca
2021-08-17 21:04:39 +00:00
Lucas Dupin
dd7ed60de0 Revert "Revert "Migrate boot animation from GLES 1.0 to GLES2.0.""
This reverts commit 2ded80094ee534cfbf360e89562f9d6f1cee33e0.

Reason for revert: Working on fixing the regression that happened on Wembly, so we can resume feature work.

Change-Id: I9a624beffdaf97f131046fd4441a251ed3a448ad
Test: adb shell /system/bin/bootanimation
Bug: 190093578
(cherry picked from commit 8eedc0293d53d31f96c2f9cd2f773149aaf5d63f)
2021-08-16 20:17:48 +00:00
Chih-hung Hsieh
df6f18e77a Merge "Remove system-headers, minimize unwanted warnings." am: 4e6598eef7 am: 6c423b166c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1778852

Change-Id: I068d9de923165a4799645c81399309b1c1dcf1d1
2021-08-03 01:35:40 +00:00
Chih-hung Hsieh
4e6598eef7 Merge "Remove system-headers, minimize unwanted warnings." 2021-08-03 01:02:45 +00:00
Chih-Hung Hsieh
69df09d4d0 Remove system-headers, minimize unwanted warnings.
* If necessary, use --header-filter to select warnings
  in owned header files for each module.

Change-Id: I5a2a52a4f78661b60a8375fbcc46bd5bad92ae60
Test: make with WITH_TIDY=1
2021-07-27 11:49:11 -07:00
Lucas Dupin
f12ebb8dd1 Merge "Update boot animation owners" am: 103308ad5d am: dbb3825a04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1766280

Change-Id: I99145db80f468a41f479667aedae1057f67805a3
2021-07-26 22:32:47 +00:00
Lucas Dupin
103308ad5d Merge "Update boot animation owners" 2021-07-26 22:05:17 +00:00
Lucas Dupin
273227d1ac Update boot animation owners
Test: none
Bug: 190093578
Change-Id: Id83d1ff6bbec63ec94402260a29c3ddcbf0ae414
2021-07-26 18:59:27 +00:00
TreeHugger Robot
fbb8676b2b Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: If9c7c5521ee2844ff8049e3bbd95461af406a9fa
2021-07-19 22:07:49 +00:00
Ryan Mitchell
b887f68ad1 Use binder-based iterator to retrieve FRROs
If for some reason there are a lot of fabricated overlays in the
resources cache, the binder limit of the list of fabricated overlay
infos could exceed the maximum binder transaction size. Rather than
return all of the frro infos in one transactions, register an iterator
with the native idmap2d service and use multiple binder transactions
to iterate through all of the frros.

Bug: 192948522
Test: Toggle device theme colors several times and observe frro cache
      Reboot device and observe old frros are deleted
Change-Id: I5e9cf3ae9d1d45eda683c24141a0cd4e4301e02f
2021-07-19 16:53:27 +00:00
Yabin Cui
c0e80b3048 Merge "idmap2: fix for compiler update." am: 0cb190e889 am: 951a22e80e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768613

Change-Id: I6a43049b33454a9fe615325d7812935de6eaea41
2021-07-16 22:15:48 +00:00
Yabin Cui
5fa57f6afc idmap2: fix for compiler update.
Suppress below errors:

include/idmap2/Idmap.h:126:12: error: avoid repeating the return type
from the declaration; use a braced initializer list instead
[modernize-return-braced-init-list,-warnings-as-errors]
    return StringPiece(target_path_);
           ^~~~~~~~~~~~            ~
           {                       }

gen/aidl/android/os/BnIdmap2.h:6:1: error: nested namespaces can be concatenated
[modernize-concat-nested-namespaces,-warnings-as-errors]
namespace android {
^~~~~~~~~~~~~~~~~~~
namespace android::os

Bug: 193712493
Test: build with the next compiler
Change-Id: I14297355dd92c2bbf4bd24da95cfa868b427739e
2021-07-15 14:03:24 -07:00
Ryan Prichard
f3c96b232c Merge "Stop exporting symbols from app_process" am: c6bd7008f8 am: 8dd59dbacf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727416

Change-Id: I92f7607c39944f62e94f09ddd6c891a7aa25ed88
2021-06-15 21:22:16 +00:00
Ryan Prichard
8bc1c3484c Stop exporting symbols from app_process
Any symbols exported from the executable override everything else in
every linker namespace. Previously, app_process exported the
signal/sigchain API, but that interposition is now handled by
libsigchain.so.

Bug: http://b/190100879
Test: `nm -D --defined-only app_process{32,64}` shows no symbols
Change-Id: I1ab1fc700c34e91535c3e679a471debbb4eb71e3
(cherry picked from commit 6b86dfb159bd26bff4aa74895221e09dce7b0718)
2021-06-15 13:14:41 -07:00