Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,939 Commits 3 Branches 0 Tags
7c0f16970c291f6077eabedf79049900a298c4ee
Commit Graph

640939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7c0f16970c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e1d39cf041 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib052fb6e5a3eaacaf27787f1c84fc631e5c20ba9
 2021-05-13 18:29:12 +00:00
Bill Yi
111f20eaa2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fa9c78563 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5b794805f0bfe964e0bf1456728a8fe9a29c4a9
 2021-05-13 18:28:57 +00:00
TreeHugger Robot
e1d39cf041 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-13 18:26:56 +00:00
TreeHugger Robot
c0f1de7c5c Merge "API review : use a range of numbers for OEM errors" into sc-dev 2021-05-13 18:17:52 +00:00
TreeHugger Robot
56e09ed0d9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-13 18:14:19 +00:00
TreeHugger Robot
f1cacbbe3a Merge "Un-hide passthrough flag" into sc-dev 2021-05-13 18:11:27 +00:00
Joe Bolinger
9f43567a93 Merge "Add extra flags to biometrics proto for tests." into sc-dev 2021-05-13 18:04:56 +00:00
TreeHugger Robot
dbdfbda7ee Merge "Only dump necessary info when specifying a package" into sc-dev 2021-05-13 18:04:30 +00:00
Ken Chen
8f3939938f [automerger skipped] Merge "Reference unreachable netId from INetd" am: db64a7da1d am: 2543a4d376 am: 814c1d3f44 -s ours 
am skip reason: skipped by user cken

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

Change-Id: I0e16151c72075f90790ffea71c02cbf0bc5c4690
 2021-05-13 18:03:36 +00:00
Beverly Tai
2fa8f9b305 Merge "GPay activity can use passive biometric auth" into sc-dev 2021-05-13 18:02:54 +00:00
Jeff Sharkey
14f4fe4d01 Merge "Emergency workaround to patch over ID shuffling." into sc-dev 2021-05-13 17:51:38 +00:00
Jeff Sharkey
62c5678f62 Emergency workaround to patch over ID shuffling. 
Bug: 188050150, 188011554
Test: manual
Change-Id: If865def2961b28d45b50a055272d8b24af7bbd32
 2021-05-13 11:48:56 -06:00
Soonil Nagarkar
eb7fc637a7 Merge "Fix bugs in AppOp restrictions" into sc-dev 2021-05-13 17:47:44 +00:00
Ameer Armaly
39f4c5967c Un-hide passthrough flag 
We added a flag to restore the passthrough for multifinger gestures, but left it hidden for the QPR. It should be made public for S so TalkBack doesn't continue to use non-public APIs.
Fix: 187458811
Test: manual
Change-Id: I02fa6b9e4dacec131aac86adc54386ad7b6249ad
 2021-05-13 17:40:49 +00:00
Edgar Wang
15dd765424 Merge "Update RadioButtonPreference widget layout" into sc-dev 2021-05-13 17:18:14 +00:00
Remi NGUYEN VAN
c15af1085c [automerger skipped] Merge "[NS04] Introduce Network Offers and their callbacks" am: daffcf97ef am: f3249af8c7 am: f2888021b8 -s ours 
am skip reason: Merged-In Idec1fe8eb4ac6f562bf098e3dd470f11024d04f2 with SHA-1 40a95a5ab7 is already in history

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

Change-Id: Idf45cf2f62c4ba2182f00ae2f05c150e0fdb6d21
 2021-05-13 17:02:34 +00:00
Lorenzo Colitti
c8968846bd [automerger skipped] Merge changes Ia5bc896c,I0c9406f4,I3108ee94 am: de0eb903cb am: 836ffee197 am: 3d8f2da2d7 -s ours 
am skip reason: skipped by user lorenzo

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

Change-Id: Icc5d80d32409711650384577150e9d309788b001
 2021-05-13 17:01:54 +00:00
Ken Chen
814c1d3f44 Merge "Reference unreachable netId from INetd" am: db64a7da1d am: 2543a4d376 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705386

Change-Id: Ia69ccfce2eec9bc5c71c10cf30b925cdecee1aac
 2021-05-13 16:52:29 +00:00
Ken Chen
2543a4d376 Merge "Reference unreachable netId from INetd" am: db64a7da1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705386

Change-Id: I522103bab137e3c1c8941d3611ccd968fdfdd781
 2021-05-13 16:30:10 +00:00
Julia Reynolds
68bec471f7 Merge "Make notif control padding match" into sc-dev 2021-05-13 16:28:27 +00:00
Matt Pietal
f476d931ac Merge "Keyguard - Fix clock in occluded state" into sc-dev 2021-05-13 16:18:21 +00:00
Ken Chen
db64a7da1d Merge "Reference unreachable netId from INetd" 2021-05-13 16:10:49 +00:00
Bill Yi
5fa9c78563 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6003b1a736755ec1aec3bff4c82844c6a1cca309
 2021-05-13 16:09:51 +00:00
Bill Yi
de447927b4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I682a43f38f5f5f68d1ce54e1d85647a1f0b8a325
 2021-05-13 16:07:45 +00:00
Bill Yi
509d20e4c9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1fe6be300e6b3433258347eb5d2d4675dc933c0d
 2021-05-13 16:03:11 +00:00
Soonil Nagarkar
a88a8477af Fix bugs in AppOp restrictions 
1) Ensure restrictions are refreshed when provider identities change.
2) Only calculate exempt packages when restrictions are applied.

Bug: 187421886
Test: manual
Change-Id: I6f639d24944e1350215969835875d2d227cb6cb6
 2021-05-13 09:02:31 -07:00
Ady Abraham
c49b886d73 Merge changes from topic "preferredDisplayModeId60120" into sc-dev 
* changes:
  Enable preferredDisplayModeId for frame rate override
  Add preferredMaxDisplayRefreshRate
 2021-05-13 15:59:00 +00:00
Remi NGUYEN VAN
f2888021b8 Merge "[NS04] Introduce Network Offers and their callbacks" am: daffcf97ef am: f3249af8c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556102

Change-Id: Ifc7c32e77a4aa7c183b0d074a8d04fe95a54d288
 2021-05-13 15:52:52 +00:00
Lorenzo Colitti
3d8f2da2d7 Merge changes Ia5bc896c,I0c9406f4,I3108ee94 am: de0eb903cb am: 836ffee197 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705389

Change-Id: Ie2c28214c2158f49b6282d398ac41038014972bf
 2021-05-13 15:51:59 +00:00
Remi NGUYEN VAN
f3249af8c7 Merge "[NS04] Introduce Network Offers and their callbacks" am: daffcf97ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556102

Change-Id: Ifcdc55f7b202b9fe1ea10c9546c07d4563e9988c
 2021-05-13 15:35:10 +00:00
Lorenzo Colitti
836ffee197 Merge changes Ia5bc896c,I0c9406f4,I3108ee94 am: de0eb903cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705389

Change-Id: I30c22bae1e2df6497483fd863396f2abb6def278
 2021-05-13 15:30:59 +00:00
Ahaan Ugale
cc4fa5f3b6 Merge "Pipe UiTranslationSpec through to the UiTranslationController." into sc-dev 2021-05-13 15:24:12 +00:00
Treehugger Robot
29d875d690 Merge changes If663677b,I387d90ea am: ea4a93a946 am: da769ac79d am: 574db828e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706425

Change-Id: I261fe4c6a0d926486052fdd2a812f709c419f78f
 2021-05-13 15:23:50 +00:00
Remi NGUYEN VAN
92e25f7743 Merge "Move connectivity sources to packages/Connectivity" into sc-dev 2021-05-13 15:22:20 +00:00
Remi NGUYEN VAN
daffcf97ef Merge "[NS04] Introduce Network Offers and their callbacks" 2021-05-13 15:11:45 +00:00
Lorenzo Colitti
de0eb903cb Merge changes Ia5bc896c,I0c9406f4,I3108ee94 
* changes:
  Make VcnTransportInfoTest pass on AOSP.
  Immediately redact VcnTransportInfo.
  Do not automatically redact TransportInfo objects.
 2021-05-13 15:11:01 +00:00
Treehugger Robot
574db828e3 Merge changes If663677b,I387d90ea am: ea4a93a946 am: da769ac79d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706425

Change-Id: I7c94b556ea2b459f763ee0dacd81e41c367e9e88
 2021-05-13 14:59:23 +00:00
Julia Reynolds
631504d209 Make notif control padding match 
Between convos and non-convos

Test: visual with a ruler
Fixes: 160016286
Change-Id: Ie5588a657174007a4fb02d1aa27bb7f62e24786d
 2021-05-13 10:55:27 -04:00
Paul Hu
1e29090f3c Merge "Update mobile data preference getter/setter" am: 5a986ca45d am: 04d9298d48 am: b137dcbdb3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702486

Change-Id: Ib55aaba8c8afc8a3152d83932bf345277bda35f9
 2021-05-13 14:53:21 +00:00
Siim Sammul
134b829e3a Merge "Change settings observer for other processes to not pass a userhandle." into sc-dev 2021-05-13 14:45:10 +00:00
Treehugger Robot
da769ac79d Merge changes If663677b,I387d90ea am: ea4a93a946 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706425

Change-Id: I59eb38410465eed276c5744d5373b4ef84656f37
 2021-05-13 14:36:47 +00:00
Paul Hu
b137dcbdb3 Merge "Update mobile data preference getter/setter" am: 5a986ca45d am: 04d9298d48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702486

Change-Id: I950d4f95759fe17e2164014ab016d39d46ad5539
 2021-05-13 14:29:43 +00:00
Beverly
e2ddaa2ee7 GPay activity can use passive biometric auth 
- User can face authenticate immediately after tapping the gpay icon on
the LS
- User can use rear fp sensor to authenticate while the GPay activity
from LS is showing
- Update udfps bouncer logic so that longpress on a notification works
with udfps
- Never listen for UDFPS on the keyguard if the device already has trust

Test: atest SystemUITests
Test: atest KeyguardUpdateMonitorTest
Test: manual (unlock with and withou biometric on notification, shade,
bouncer, gpay surfaces)
Fixes: 187020022
Fixes: 183112863
Bug: 183024921
Bug: 185433347

Change-Id: I47aa58505535267c56b88c021791066c36a6c717
 2021-05-13 10:24:37 -04:00
Treehugger Robot
ea4a93a946 Merge changes If663677b,I387d90ea 
* changes:
  Fixed KeyGenParameterSpecTest
  Keystore 2.0 SPI: Fix NPE in getUniqueAliases.
 2021-05-13 14:20:44 +00:00
TreeHugger Robot
ef6d7c0278 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-13 14:12:39 +00:00
Paul Hu
04d9298d48 Merge "Update mobile data preference getter/setter" am: 5a986ca45d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702486

Change-Id: Ieb72b4f0284d5439f62037b9d68da054f276120d
 2021-05-13 14:07:56 +00:00
Paul Hu
5a986ca45d Merge "Update mobile data preference getter/setter" 2021-05-13 13:42:05 +00:00
Chalard Jean
28562ef63b [NS04] Introduce Network Offers and their callbacks 
This patch introduces the concept of a network offer that
providers send to Connectivity to register for relevant
requests. This lets them see only requests that they can
hope to satisfy considering their capabilities and score
filters.

This is meant to replace the filtering mechanism currently
implemented by NetworkFactory. The reason for replacing
this mechanism is that the old mechanism does caps and
score filtering on the factory side, which requires these
two filters to be contextless and available system-wide,
including in separate processes from the system server.
These constraints severely limit and complexify in
particular what the score comparisons may look like. In
the past the score comparison was only integer-based,
making the code duplication not much of a problem, but as
this scheme is becoming unsustainable by spreading the
complexity of the selection across the entire stack, a
centralized mechanism is now necessary.

This patch only introduces the new objects and has CS
keep track of them, but does not actually use them yet.
Followup patches will implement the logic of calling
the offer callbacks.

Test: FrameworksNetTests NetworkStackTests FrameworksWifiTests
Bug: 167544279
Merged-In: Idec1fe8eb4ac6f562bf098e3dd470f11024d04f2
(clean cherry-pick)

Change-Id: Idec1fe8eb4ac6f562bf098e3dd470f11024d04f2
 2021-05-13 13:20:43 +00:00
Matt Pietal
8690be5bc9 Keyguard - Fix clock in occluded state 
The status area (clock, smartspace) was not being shown after exiting
an activity on the lockscreen. The y translation value was incorrect
for the branch it was taking. Add a new check for occlusion, and use
the correct transition when leaving this state.

Fixes: 184188027
Test: manual (use emergency call button)
Change-Id: I6fa34e55252ac8435031915a7e929711e7976fe2
 2021-05-13 12:54:34 +00:00
Matt Pietal
14e224d5f7 SIM PIN spacing issues 
For large display settings, text began overlapping with the limited
vertical space. Reduce spacing for SIM PIN views to fit everything in.

Fixes: 186857845
Test: largest font/display size with locked SIM
Change-Id: I678ced91dd55c84e194e37e22a3a56b53e78f2eb
 2021-05-13 12:54:17 +00:00