drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
624,331 Commits 1 Branch 0 Tags
Commit Graph

624331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Li
1514f39e8d Merge "Invoke organizer events when a display is added / removed." into sc-dev 2021-02-14 03:09:15 +00:00
Tianjie Xu
190bdb1970 Merge "Fix format of helper msg" am: 6e87192cef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98e496df5538ad78cd2daa3b2dff887ee47ce557
 2021-02-14 03:05:19 +00:00
Marco Ballesio
178939357c Merge "ActivityManager: create process group in behalf of app zygote" into sc-dev 2021-02-14 02:58:52 +00:00
Tianjie Xu
6e87192cef Merge "Fix format of helper msg" 2021-02-14 02:27:41 +00:00
Seigo Nonaka
5dd6dd5507 Keep source ID into native object 
To avoid static field and synchronization for the mapping, keep source
identifier into native font instance.

Bug: 179113771
Test: minikin_tests
Test: hwui_unit_tests
Test: atest CtsTextTestCases CtsGraphicsTestCases
Change-Id: I238e7b8090ee89101937ec22cbe7c68aea97bcfd
 2021-02-13 18:23:47 -08:00
TreeHugger Robot
55799d74c9 Merge "Fix updated privileged app with shared UID loses privileged permission when request in manifest." into sc-dev 2021-02-14 02:15:43 +00:00
TreeHugger Robot
4c417f3bde Merge "Preload Roboto-Regualr.ttf" into sc-dev 2021-02-14 01:37:16 +00:00
Chris Li
bb62a307c0 Merge "Don't trigger DisplayAreaOrganizer events for untrusted display" into sc-dev 2021-02-14 00:27:34 +00:00
TreeHugger Robot
a0a67801f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-13 22:17:59 +00:00
Seigo Nonaka
1dbb19432e Preload Roboto-Regualr.ttf 
Bug: 179026427
Test: N/A
Change-Id: I47cf1f0d86ca93cfef429ed2f3af8e60d68d385b
 2021-02-13 14:03:09 -08:00
TreeHugger Robot
7a063e67e9 Merge "Register native allocation for Font" into sc-dev 2021-02-13 22:00:03 +00:00
James Mattis
6c16aeadfb Merge changes from topics "pans", "pans-permission" am: 601d16a336 am: d11f866ee6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8afdee99c0b0813d3e3a61df053f9cdef966949c
 2021-02-13 21:51:49 +00:00
Chris Li
2c133360a4 Invoke organizer events when a display is added / removed. 
Before, when a display is added, we don't attach existing organizer to
it. Now, we checked if there is an existing one by checking the feature
id.

At ag/13237565, we tried to do it at onParentChanged(), but
mDisplayContent is not set for DAs when DAs are first attached. Change
to do it from DisplayContent when it is ready.

Fix: 179102157
Test: atest WmTests:DisplayAreaTest
Change-Id: Ic2bb7447e9a1408ccdc17f79271b2cf58b2878c1
 2021-02-13 13:43:52 -08:00
Chris Li
8e2edf69bf Don't trigger DisplayAreaOrganizer events for untrusted display 
Fix: 179743121
Test: atest WmTests:DisplayAreaOrganizerTest
Change-Id: I0164db447340cb4c3217bb7c51bbaa079f34422b
 2021-02-13 13:38:37 -08:00
James Mattis
d11f866ee6 Merge changes from topics "pans", "pans-permission" am: 601d16a336 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72035b6d5d6504cece1df472ae317e865ceb7882
 2021-02-13 21:14:48 +00:00
James Mattis
601d16a336 Merge changes from topics "pans", "pans-permission" 
* changes:
  Marking setOemNetworkPreference as @SystemApi
  Adding permission for OEM managed preferences
  Implementation of setOemNetworkPreference
 2021-02-13 20:54:57 +00:00
Rubin Xu
5ea7cd28fb [automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa8e am: a9f241bb43 -s ours 
am skip reason: skipped by user rubinxu

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcd777eb7f52719d447333a2fa1710f3338c01af
 2021-02-13 20:28:51 +00:00
Rubin Xu
a9f241bb43 Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa8e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41e5c8a1d3a6ba5902515ffc89da200d7e9cd8a0
 2021-02-13 19:26:53 +00:00
TreeHugger Robot
e142517c82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ff04eafad2 -s ours am: 3313688ba5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13566727

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia62e14b6bec674675f8e719aa507cabd90c6d22b
 2021-02-13 18:35:30 +00:00
TreeHugger Robot
a45619c69a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d2b9f5cade -s ours am: 48ba58238a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13564152

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bccbe574e38a4f643bf19d4524db3d64dc866ed
 2021-02-13 18:35:17 +00:00
TreeHugger Robot
780c96016b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a8d6cf63e -s ours am: e522f0563f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554663

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id489851572b3c8c74167d949b064d72ef888f7b2
 2021-02-13 18:35:02 +00:00
TreeHugger Robot
6cdc0ab176 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c9b82c65e -s ours am: bccf5f80ed -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13561193

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3225f2a8b1226ee260a2d382e27135bc487df2b
 2021-02-13 18:34:46 +00:00
TreeHugger Robot
2a327ba678 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b7261fe436 -s ours am: b9e31ab8ae -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13566559

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I952f427911884144df5af4946ca08e89dc98b0ec
 2021-02-13 18:34:21 +00:00
TreeHugger Robot
42f363cf2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b73f3efce0 -s ours am: af253df862 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13566726

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4478a76160c7bf849c3e9bdff770cb0dbfa3cbf
 2021-02-13 18:33:50 +00:00
Rubin Xu
c9a8b2fa8e Merge "add MANAGE_CREDENTIALS appop" 2021-02-13 18:32:16 +00:00
TreeHugger Robot
3313688ba5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ff04eafad2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13566727

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b98c22c63b09ecda587cb148b46c715922affdf
 2021-02-13 18:16:45 +00:00
TreeHugger Robot
48ba58238a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d2b9f5cade -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13564152

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ff151817522bf9fc03e7d036e810e2a4654bc22
 2021-02-13 18:16:33 +00:00
TreeHugger Robot
e522f0563f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a8d6cf63e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554663

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iecca2cba3b1e2eecb01dcc8cebfd7df9cec7333d
 2021-02-13 18:15:39 +00:00
TreeHugger Robot
bccf5f80ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c9b82c65e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13561193

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5f6af485fab3d10a884c1696206dcee85e1515a
 2021-02-13 18:15:04 +00:00
TreeHugger Robot
ff04eafad2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 18:15:00 +00:00
TreeHugger Robot
b9e31ab8ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b7261fe436 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13566559

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3f559d1db04dd8d384a5b6b4225585bdd674f59
 2021-02-13 18:14:14 +00:00
TreeHugger Robot
af253df862 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b73f3efce0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13566726

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib82e4512c350fd44e3415da4dccb10accdc23bce
 2021-02-13 18:13:32 +00:00
TreeHugger Robot
d2b9f5cade Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 18:05:44 +00:00
TreeHugger Robot
9a8d6cf63e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 17:58:54 +00:00
TreeHugger Robot
2c9b82c65e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 17:49:38 +00:00
TreeHugger Robot
b7261fe436 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 17:49:18 +00:00
TreeHugger Robot
b73f3efce0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 17:49:12 +00:00
Ryan Mitchell
97d5ea4b35 Merge changes I6d84d3d1,Idd304f56 into sc-dev 
* changes:
  Revert enable exclusive in category atomic API
  Revert "Fix enable-exclusive atomic api"
 2021-02-13 15:37:17 +00:00
Bill Yi
a6d7c030de Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5dbcafcca06381b60c05cfdb2ee0b745c88a8b57
 2021-02-13 03:48:46 -08:00
Bill Yi
de10e13450 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id49401c227b5707affd6b07b90f79690e4384ea4
 2021-02-13 03:16:31 -08:00
Kalesh Singh
1e307f9a02 [automerger skipped] Merge "Eliminate memtrack variability from the lost RAM calculation" am: 599b4e4ac4 am: 06a5b4de17 am: 2c80f89444 -s ours 
am skip reason: Change-Id I631488d95cfd91d5428c877b3a004215031dd223 with SHA-1 9785b9a84b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78745624a4f4a595e5a006ec62553a0e6328b622
 2021-02-13 09:46:58 +00:00
Bill Yi
c26eaefeda Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a5b6676a580376ae20dc1713886f56d830760bd
 2021-02-13 01:40:28 -08:00
Kalesh Singh
2c80f89444 Merge "Eliminate memtrack variability from the lost RAM calculation" am: 599b4e4ac4 am: 06a5b4de17 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03ebf873223a08069d9753f7d8ce41423f58ee02
 2021-02-13 09:20:41 +00:00
Hai Zhang
f82f7a77b6 Fix updated privileged app with shared UID loses privileged permission 
when request in manifest.

If two privileged apps share the same UID, one of them requested and
got a privileged permission granted while another didn't, both will be
granted the privileged permission. However when an update is installed
for the factory version of the system app that didn't request the
permission, and that updated app starts to request the privileged
permission, that request itself can't grant the permission because we
don't allow updated system apps to get new privileged permissions and
we only trust the factory version. However, the original permission
request from the other factory app is still valid. As a result of
this, in the refactored logic in S the permission has a chance to stop
being granted to both apps depending on the order of the two apps
being examined for permission grants.

The proper fix to this issue is to reconcile permission not by
packages, but by UIDs. However, given where we are in the S timeline,
such change will require a lot of refactoring to this critical piece
of logic, and may lead to performance regression even if it's okay
security-wise. So we should defer the proper refactoring to the next
release, either in this existing implementation, or in a new
permission subsystem.

The pre-S implementation had the logic that if a privileged permission
was granted to the factory version of a privileged app, it will
unconditionally keep the permission granted. And in the case of shared
UID, where the permission state of the factory app is the shared user
permission state, this helped resolving this issue. That piece of
logic was deemed unnecessary and simplified during S refactoring, but
this specific case shows that we actually still need it.

So we should bring back that logic in S. However due to the split of
permission and package locks, we can not call into package when we are
holding the permission lock. This is exactly the case in this piece of
logic because it needs both the disabled system package (guarded by
package lock), as well as the existing permission state (guarded by
permission lock). So we have to split the logic into two parts, that
is to store the information from package first, and then after
grabbing the permission lock, get the existing permissions state and
combine the two to reach a conclusion.

Another issue that existed before S was that the logic above was
broken by privapp permission allowlisting in O, which returns directly
without giving the logic handling updated system apps a chance to
run. So we need to fix this as well.

Test: Manual
Test: Install an updated system app that requests a privileged
      permission not in the allowlist but granted due to another
      shared UID app, and make sure that dumpsys package shows that
      the updated app has the permission both requested and granted
Fixes: 177926928
Change-Id: I667a9c2e1b87a15c22046e839b248ec6d4e55ca0
 2021-02-13 00:45:27 -08:00
Kalesh Singh
06a5b4de17 Merge "Eliminate memtrack variability from the lost RAM calculation" am: 599b4e4ac4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a8f78264c5398430740368874c924db36967e04
 2021-02-13 07:35:55 +00:00
Ryan Mitchell
b22b87eec7 Merge "Remove duplicate idmap classes from services.jar" into sc-dev 2021-02-13 07:08:53 +00:00
Lucas Dupin
d7b2e72520 Merge "Catch remote exception" into sc-dev 2021-02-13 06:50:17 +00:00
Lucas Dupin
c086c04c44 Catch remote exception 
Fixes: 180112740
Test: make
Change-Id: Ic4a5e571a3f5d4d89fb2e34e18682d2cee98195b
 2021-02-12 22:15:38 -08:00
Kalesh Singh
599b4e4ac4 Merge "Eliminate memtrack variability from the lost RAM calculation" 2021-02-13 05:11:28 +00:00
Kalesh Singh
c146b5b3b2 [automerger skipped] Merge "Provide an interface to query dmabuf GPU allocations" am: f403b56267 am: b79232ceb0 am: 8ca81eef5b -s ours 
am skip reason: Change-Id Ie72f46c8de026b143629406714f413677ce6693b with SHA-1 f30df7e62e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575583

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice556d1f973b3a13930cfd7452352c94d8d0962f
 2021-02-13 04:55:43 +00:00