Commit Graph

6991 Commits

Author SHA1 Message Date
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
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
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 ad9cf52df9.

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 2ded80094e.

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 8eedc0293d)
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 6b86dfb159)
2021-06-15 13:14:41 -07:00
Ryan Prichard
6b86dfb159 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
2021-06-11 16:27:32 -07:00
Ryan Mitchell
dc628e77a1 Merge changes I6da18cdb,I9de6ba64,I1af88c6d,I154783ff into sc-dev
* changes:
  idmap2: fix cpplint warnings
  OMS: include idmap data in dump
  idmap2: create in-memory FRRO before creating file
  OMS: update shell command --help
2021-06-03 15:02:22 +00:00
Mårten Kongstad
1195a6bd46 idmap2: fix cpplint warnings
Bug: 189963636
Test: frameworks/base/cmds/idmap2/static-checks.sh
Change-Id: I6da18cdbbd2fc33db711696445230a9f316dc143
2021-06-02 21:55:28 +00:00
Mårten Kongstad
99ae898d3c OMS: include idmap data in dump
Teach the overlay manager to ask the idmap service to pretty print the
contents of each idmap file as part of OMS dump. This creates a single
entry point for dumping both OMS and idmap data, and circumvents the
problem of accessing the idmap service if it has been killed due to
inactivity.

Example idmap section:

---- 8< ----
IDMAP OF com.android.theme.color.sand
Paths:
    target path  : /system/framework/framework-res.apk
    overlay path : /product/overlay/AccentColorSand/AccentColorSandOverlay.apk
Debug info:
    W failed to find resource 'string/accent_color_overlay'
Mapping:
    0x0106006e -> 0x7f010000 (color/accent_device_default_dark -> color/accent_device_default_dark)
    0x01060070 -> 0x7f010001 (color/accent_device_default_light -> color/accent_device_default_light)
---- >8 ----

Bug: 189963636
Test: adb exec-out dumpsys
Test: adb exec-out cmd overlay dump
Test: adb exec-out cmd overlay dump <overlay-identifier>
Change-Id: I9de6ba646ad4714c9d0f0d8081fbf632577107e7
2021-06-02 21:54:40 +00:00
Mårten Kongstad
a384fb7637 idmap2: create in-memory FRRO before creating file
Re-order the serialization of an FRRO and creation of the backing file.
This prevents a dangling (empty) file if the serialization fails.

Bug: 189963636
Test: manual: cmd overlay fabricate <bad parameters>, verify no file created in /data/resource-cache
Change-Id: I1af88c6d2d1c3a881beecfb50ccaf541a249f39b
2021-06-02 19:33:50 +00:00
Ryan Mitchell
c0416698db Disable incremental hardening on own resources
When an application is incrementally installed, and a resources
operation fails due to the resources not being fully present,
the app should crash instead of swallowing the error and
returning default values to not alter the experience of
using the application.

Disable IncFsFileMap protections on ApkAssets that are a part of the
application that is running (base and splits).

Bug: 187220960
Test: atest ResourcesHardeningTest
Change-Id: Ibc67aca688720f983c7c656f404593285a54999b
2021-05-27 09:50:36 -07:00
Patrick Baumann
43628ca24c Updates OWNERS files
Bug: 186864416
Test: Builds
Change-Id: I04dfc5c2c7143825334ebc62742e335b8c889492
2021-05-21 14:13:18 -07:00
Patrick Baumann
e6c0a4f8ce Updates OWNERS files
Bug: 186864416
Test: Builds
Change-Id: I04dfc5c2c7143825334ebc62742e335b8c889492
2021-05-14 15:45:42 +00:00
Ricky Wai
1d42095ddb Merge "Revert "Change mounting storage data and obb flag to on by default"" into sc-dev 2021-05-14 13:32:11 +00:00
Wale Ogunwale
6f5423bb8c Revert "Change mounting storage data and obb flag to on by default"
Revert "Remove storage app data isolation checking in CTS"

Revert submission 14325408-enable_storage_iso_2

Reason for revert: b/187939590
Reverted Changes:
I6391b7381:Change mounting storage data and obb flag to on by...
Ic2f3d1be2:Remove storage app data isolation checking in CTS
Iffa8339b1:Change mounting storage data and obb flag to on by...

Bug: 187939590
Bug: 148049767
Change-Id: I7fa2947593d0fe743def804bf4f7b57920978e40
2021-05-14 10:30:54 +00:00
Jing Ji
fa42613b96 Fix the argument list to logcat from am instrument
Bug: 186570682
Test: am instrument
Change-Id: I3290022c865ca16150c3392657f1fe9d31834fc5
2021-05-07 21:11:24 -07:00
Ricky Wai
b11309b1fc Change mounting storage data and obb flag to on by default
Change mounting storage data and obb flag to on by default

Test: unbundled/launcher/nexus_unit_test_multi_device_platform
Test: atest android.appsecurity.cts.ExternalStorageHostTest
Test: atest AdoptableHostTest
Test: pass cts/cts_postsubmit_cf_stable-cloud-tf

Bug: 148049767
Change-Id: Iffa8339b10427bea96aa90030463ed18c96eafce
2021-04-29 15:59:00 +00:00
Kholoud Mohamed
da3d4e8608 Merge "Revert "Revert "Changed dpm shell commands to use 'cmd device_policy'""" into sc-dev 2021-04-28 08:59:23 +00:00
Kholoud Mohamed
4b2ce108a8 Revert "Revert "Changed dpm shell commands to use 'cmd device_policy'""
This reverts commit dc70c57eaf.

Reason for revert: Fixed failing test

Change-Id: Ib434365f441d69853ea3af6da7f3c663c16e5e1e
2021-04-27 12:54:46 +00:00
Jooyung Han
ed4e70f537 resolve merge conflicts of 2028343503 to sc-dev
Change-Id: I2c9c8597a967a3af3b9bf07df562c6e0f51ca3dd
2021-04-27 04:15:41 +00:00
Jooyung Han
2028343503 Merge "Make OverlayablePolicy as enum type" am: 8e87bfb4fb am: 7e9f9ed9f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686174

Change-Id: I0127ff53eec8c1e8d9847574a097160fc3e84be6
2021-04-27 03:14:42 +00:00
Robert Horvath
79ff669777 Merge "Conditionally show bootanimation for quiescent boots" into sc-dev 2021-04-26 10:59:51 +00:00
Jooyung Han
274b7bbfbd Make OverlayablePolicy as enum type
It's been used as a container of constants. "enum" suits better.

Fixes: 179836191
Test: m
Change-Id: Icbcda5707c0d2528dcbfad7e5add8d50bc4ec5b9
2021-04-26 13:52:40 +09:00