Commit Graph

6990 Commits

Author SHA1 Message Date
Ady Abraham
92aa9daa10 Revert "Implement dynamic colors for boot animation."
This reverts commit 79d079ea49.

Reason for revert: DroidMonitor: Potential culprit for Bug b/196456395 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I6130e75ae174f68ddfaa6e1010d7979538311020
2021-08-12 23:55:46 +00:00
Shan Huang
79d079ea49 Implement dynamic colors for boot animation.
This CL won't cause any visual change to the boot animation yet
because the asset zips are yet to be udated.

Next steps:
- Update format.md to include documentation for dynamic coloring.
- Update asset zip files.

Test: Manual
Bug: 190093578

Change-Id: I63fdb1983896f321288d595d06f46bcde7da1aab
2021-08-12 19:10:30 +00:00
Lucas Dupin
8eedc0293d 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
2021-08-04 15:44:53 -07:00
Chih-hung Hsieh
9c3888e39a Merge "Remove system-headers, minimize unwanted warnings." am: 4e6598eef7 am: 6c423b166c am: df6f18e77a am: 6bf41e2475
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1778852

Change-Id: I7ccfe53f41012e7f1c4c0be766f88619541dc19f
2021-08-03 02:05:11 +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
b92969e836 Merge "Update boot animation owners" am: 103308ad5d am: dbb3825a04 am: f12ebb8dd1 am: 01bb11144e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1766280

Change-Id: Iea1fec5173cb3a29a2d9f751c314704eeb79eade
2021-07-27 01:59:25 +00: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
ad333619f6 Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660 am: 62c2c75c41
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: I05f1654c7e291018c59e56eab302697f6cfe7095
2021-07-19 22:15:34 +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
TreeHugger Robot
a9018aca43 Merge "Revert "Migrate boot animation from GLES 1.0 to GLES2.0."" 2021-07-19 18:22:06 +00:00
Greg Kaiser
2ded80094e Revert "Migrate boot animation from GLES 1.0 to GLES2.0."
This reverts commit d711ac4858.

Reason for revert: Breaks boot animation on wembley device

Bug: 194074093
Change-Id: Id6143bfd1e35089a7df88470978cd064de2d839c
Test: wembley has boot animation again with this reverted
2021-07-19 17:03:27 +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
dda7142b1e Merge "idmap2: fix for compiler update." am: 0cb190e889 am: 951a22e80e am: c0e80b3048 am: 1d861c7292
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768613

Change-Id: Icefda6202f90e3b009b84b13636cb94f8321d26b
2021-07-16 22:45:54 +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
Shan Huang
d711ac4858 Migrate boot animation from GLES 1.0 to GLES2.0.
Main changes in how rendering is done:
- Texts and images are drawing using a textured quad instead of glDrawTexiOES.
- Shaders are introduced to draw with textures.
- Frame fading is also done with shaders now, instead of drawing background
colored transparent rectangles.

Test: Verified the main animation, clock text, progress text and stock
android animation all render correctly.
Bug: 190093578

Change-Id: Ie3f336d22bcc9e24f06a2bd62683d7a8c87a85f6
2021-07-13 18:50:46 +08:00
Ryan Prichard
4d713d73fe Merge "Stop exporting symbols from app_process" am: c6bd7008f8 am: 8dd59dbacf am: f3c96b232c am: 26b3515c57
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727416

Change-Id: I34219aa6a2042b2a427b64ebad5398314d69ed05
2021-06-15 21:40:44 +00: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
d2befedf9f Merge changes I6da18cdb,I9de6ba64,I1af88c6d,I154783ff into sc-dev am: dc628e77a1 am: 9246beb4bd am: fd8380f389
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14752601

Change-Id: I2a0ed41abe0c899184f1c34065a64d692b8eb584
2021-06-03 15:41:23 +00: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
e72a6bcfc3 Merge changes from topic "inc-dis" into sc-dev am: 488522c9c5 am: a1cb15f54e am: 1e7576afd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14505818

Change-Id: Ie2f775bf589806c4d4982f78d3acd2291cf6472b
2021-05-28 03:19:30 +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
fd55b563bb Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022 am: 4c56bac295 am: 62bf50bbd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705089

Change-Id: I78aa27d7521a981d3ef7494c3c2d20b44b048213
2021-05-20 00:22:15 +00:00
Patrick Baumann
62bf50bbd8 Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022 am: 4c56bac295
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705089

Change-Id: Ibea92e6623d660b0bcbc324c8f188642841160dd
2021-05-18 23:16:02 +00:00
Patrick Baumann
e6c0a4f8ce Updates OWNERS files
Bug: 186864416
Test: Builds
Change-Id: I04dfc5c2c7143825334ebc62742e335b8c889492
2021-05-14 15:45:42 +00:00
Ricky Wai
101f1624ce Merge "Revert "Change mounting storage data and obb flag to on by default"" into sc-dev am: 1d42095ddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14536504

Change-Id: I558b48ae6f982d430c85ae355f9b8695eb587a33
2021-05-14 13:42:24 +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
926b7808ff Merge "Fix the argument list to logcat from am instrument" into sc-dev am: 6dfd2c3105
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14475096

Change-Id: Idff05af0841dc4b797647bbd992e784dbababd11
2021-05-10 18:33:25 +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
Dominik Laskowski
7f76137fca Merge "screencap: Require display ID in -d switch" 2021-05-03 21:29:32 +00: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
Martin Stjernholm
8cf06f75a6 Merge "Revert "Changed dpm shell commands to use 'cmd device_policy'"" into sc-dev 2021-04-23 15:56:02 +00:00
Martin Stjernholm
dc70c57eaf Revert "Changed dpm shell commands to use 'cmd device_policy'"
This reverts commit e311f273d4.

Reason for revert: Suspected to break git_sc-dev: https://android-build.googleplex.com/builds/tests/view?invocationId=I95100008561539923&testResultId=TR98321419962361792

Bug: 186208038
Change-Id: I0dc3ee2d509f395677600590d0cbb42b4d9f1682
2021-04-23 13:54:54 +00:00