Thiebaud Weksteen
2a32ff7e14
Merge "Enable clock only when supported by product"
2021-12-13 00:56:44 +00:00
Thiébaud Weksteen
08de4439ac
Enable clock only when supported by product
...
In 9748086 , a detection for clock drifting was implemented. It relies on
2 files that must be provided by the product
(/data/system/time/last_time_change and
/data/system/time/time_is_accurate). Generally, these files are not
available which triggers an SELinux denial error message.
Introduce a new property ("persist.sys.bootanim.clock.enabled") which
can be set by a product to enable this feature (default is false). For
future reference, it is not sufficient to only enable this property, the
product must also provide the files described above (see
BootAnimation::updateIsTimeAccurate).
Bug: 62954877
Test: lunch r11-userdebug && m
Change-Id: Ia27e69547e3d898925029dc0c2be4ad717891c57
2021-11-23 10:49:49 +11:00
Keith Mok
6704dc46f0
Merge "Fix nanosleep in BootAnimation" am: 45e281ef2b am: 73357c61d0 am: fd42131e14 am: c42a8a0793
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891586
Change-Id: Iebc79f0ba23152c05de1f456fec984e225c1ea03
2021-11-19 23:38:37 +00:00
Keith Mok
fd42131e14
Merge "Fix nanosleep in BootAnimation" am: 45e281ef2b am: 73357c61d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891586
Change-Id: Ie6a3997d2b2595e408fc32cee45f419db793b616
2021-11-19 23:12:50 +00: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
b14671ef58
Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e am: 2512fc7380 am: 187863655c am: 2999ac25fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705
Change-Id: Ib8678bba4656240da3298446d8c8b7359536d7ff
2021-11-09 18:32:23 +00:00
Treehugger Robot
187863655c
Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e am: 2512fc7380
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705
Change-Id: Icc99c2717305e6a17f04e1ca9651973491cb907b
2021-11-09 18:07:18 +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
2438ebe2df
Merge "Explicitly exit from the am instrument after test completes" am: 7e76d37fdb am: e13662e50f am: 1ec0427058 am: cdb9983b70 am: d43dd57779
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1877024
Change-Id: I10a967e28dd66a60ce83f203d5400a1b640976f2
2021-11-03 18:09:04 +00:00
Jing Ji
cdb9983b70
Merge "Explicitly exit from the am instrument after test completes" am: 7e76d37fdb am: e13662e50f am: 1ec0427058
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1877024
Change-Id: I0fb1a383bb5faed5a47dd23cb0eb8ac044cd6bbb
2021-11-03 17:53:48 +00: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
Treehugger Robot
c912d07961
Merge "Fix: crash when running am.jar without parameters" am: 3bec47724f am: 23f93b8cf3 am: cfd38b49d4 am: 2a56521b5c am: d4e82f152d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850984
Change-Id: Ifb14a2669d9484012ba409a7b1f096fe11303a9e
2021-10-29 11:00:02 +00:00
Treehugger Robot
2a56521b5c
Merge "Fix: crash when running am.jar without parameters" am: 3bec47724f am: 23f93b8cf3 am: cfd38b49d4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850984
Change-Id: Idb9495274e7e1cedae8f24db8335c8cbfdc3b97c
2021-10-29 10:27:08 +00: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
81d4f343cd
Merge "Allow readability-identifier-length warnings" am: 8cc0f40cf2 am: 75c39b2515 am: be3d5337e6 am: c5f75d374d am: 421cfbcb6e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1844656
Change-Id: Iabf27c136ab6c91ab30b904e635f3c9b3694bf70
2021-10-07 18:02:30 +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
6b822a265a
Merge "Fix idmap2 compiling against musl" into stage-aosp-master am: 5f9fe6e37c am: 866e277bc6 am: 4f4ef93a8e am: 734e3fa58e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15839888
Change-Id: I5d96fee54242751b39220802b7716ca6d991658d
2021-09-16 17:21:03 +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
a254195dc4
Merge "Fix AOSP boot animation black screen issue." into sc-qpr1-dev am: 6d673f1f9a am: e277f0ded5 am: 1b45e9c5fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15799420
Change-Id: I77b788dea2058df0109ee9e38c924416bf230500
2021-09-10 20:51:57 +00:00
TreeHugger Robot
1b45e9c5fc
Merge "Fix AOSP boot animation black screen issue." into sc-qpr1-dev am: 6d673f1f9a am: e277f0ded5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15799420
Change-Id: Ifd2e5955fd9d4b2c790db69d36840c8b52cb8f95
2021-09-10 19:43:34 +00: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
03c3759126
Merge "Fixes boot animation not appearing issue on Oriole." into sc-qpr1-dev am: 3a986bb956 am: 580ae422b6 am: 8dbf247294
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779528
Change-Id: I4501403e20e0a3b50af1629a3d01b8a20d0cefaa
2021-09-09 21:34:16 +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
05701b8eb5
Merge "Support rendering white pixels." into sc-qpr1-dev am: e2f4ad3e7b am: cfb0fe05a5 am: fbe437bd10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676845
Change-Id: I2f98a90333e19cda3b22229a90a8112dc0e999a2
2021-08-27 04:19:08 +00:00
Shan Huang
fbe437bd10
Merge "Support rendering white pixels." into sc-qpr1-dev am: e2f4ad3e7b am: cfb0fe05a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676845
Change-Id: I01c05670625bef928a16212649dc881ca9e31c98
2021-08-27 03:57:50 +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
George Burgess IV
0f8e8110b1
BootAnimation: remove superfluous null check for mAnimation
...
The null check added in I603da080b1732a436a10dbaca6f2be9f158124dc makes
our static analyzer suspect that the call to
`playAnimation(*mAnimation)` dereferences null. The beginning of this
function establishes a non-null value for `mAnimation`, which is used
unconditionally throughout the function. Hence, this condition seems
unnecessary.
Bug: None
Test: TreeHugger
Change-Id: I0575df17df7f7e3018d99cafd9dcfcd3c10e5fbc
2021-08-23 17:32:23 -07:00
Shan Huang
7bd03e61aa
Merge "Move boot color sysprop parsing to after loading zips." into sc-qpr1-dev am: a1c0f6dd41 am: 28c7d63d16 am: a332213f93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600978
Change-Id: I5ad79c95f2098d4876f691d74541948468647ed3
2021-08-19 22:04:43 +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
4a14527fb8
Merge "Revert "Revert "Revert "Revert "Implement dynamic colors for boot animation.""""" into sc-qpr1-dev am: 813c29b9a5 am: 9d7c1b7163 am: ba48d5a0f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600806
Change-Id: I8478388303170a00c288e37274e9560c817d52f6
2021-08-19 01:24:43 +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
TreeHugger Robot
d118ede98b
Merge "Rename ProcResult stdout and stderr fields" into stage-aosp-master am: bde914ea74 am: 56d3a6d2da am: 222a127f2b am: 4c8797841d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600955
Change-Id: I14fc5bee1f821863f6ed5a32bbf85127ddbd1a5e
2021-08-18 23:35:57 +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 273227d1ac )
2021-08-18 21:47:20 +00:00