Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
619,848 Commits 3 Branches 0 Tags
6411a21a401eefbaf650ff1113dff0bdff7bbd63
Commit Graph

619848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cassie Wang
6411a21a40 Merge "Add a platform version of VisibilityStore." 2021-01-21 16:33:05 +00:00
satayev
15f17656fd [automerger skipped] Merge "Enable @TestApi access for instrumentation." am: f1d5754c10 am: e0ef4a9aab am: 7c54084978 -s ours 
am skip reason: Change-Id I8dd3bbacdb263a3e30539f43d8081f6d78e80155 with SHA-1 6609105eb5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a6de6d964b892f492ee70998b09ab6eb9cef326
 2021-01-21 15:59:13 +00:00
Bill Yi
0a5c88486a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-21 15:53:00 +00:00
Bill Yi
2be19edbff Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-21 15:52:50 +00:00
Bill Yi
7fd62f8e9f Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-21 15:52:44 +00:00
Bill Yi
514d73ad09 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-21 15:52:38 +00:00
Bill Yi
a2f3192765 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-21 15:52:31 +00:00
satayev
7c54084978 Merge "Enable @TestApi access for instrumentation." am: f1d5754c10 am: e0ef4a9aab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibaba3d4287cb970703f1f071f6373d5205ba94e1
 2021-01-21 15:36:37 +00:00
Etan Cohen
3df00e17f7 Merge "[Provider Model] Check against race condition" 2021-01-21 14:55:49 +00:00
Cassie Wang
2a966f890a Add a platform version of VisibilityStore. 
Integrates all the logic from ag/13312040 that was submitted upstream in
androidx-platform-dev. Since ag/13373289 will make the localstorage
VisibilityStore a no-op upstream, the logic will now live in platform
itself.

Bug: 169883602
Test: presubmit
Change-Id: Ice433f27cf585c1a3c4dce6c7a57bbbdddb2a821
 2021-01-21 06:50:55 -08:00
satayev
e0ef4a9aab Merge "Enable @TestApi access for instrumentation." am: f1d5754c10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85cd5a81c98aa96629f0e2cad9e7a45ec3e5faac
 2021-01-21 14:32:51 +00:00
satayev
f1d5754c10 Merge "Enable @TestApi access for instrumentation." 2021-01-21 14:13:44 +00:00
Fabian Kozynski
126edfe890 Merge "Hold privacy indicators for 5 sec" 2021-01-21 14:06:07 +00:00
Anton Hansson
0fadc9488c Merge "Update framework/base/apex OWNERS" am: 8c03d3c0d8 am: 7e79bdede8 am: d3b2fdc7d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555175

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ccf36066af05277ce1ea50686cadd76fd48537b
 2021-01-21 14:03:21 +00:00
Anton Hansson
f118549ef7 Merge "Dist more API txt files" am: 45b39d81c4 am: d787b0501a am: 5e4e7ceca9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5b9c0e91e49db2edf2706616667a9e681fed649
 2021-01-21 14:02:57 +00:00
Anton Hansson
d3b2fdc7d1 Merge "Update framework/base/apex OWNERS" am: 8c03d3c0d8 am: 7e79bdede8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555175

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89f46cdea0f9d2b9a8ec869800b5697a6812fd92
 2021-01-21 13:49:11 +00:00
Anton Hansson
5e4e7ceca9 Merge "Dist more API txt files" am: 45b39d81c4 am: d787b0501a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib39b2203f51671a315c978d949a1d7dc51e1305b
 2021-01-21 13:48:49 +00:00
Wale Ogunwale
17d13191a1 Merge "Add support for ActivityOptions#setLaunchRootTask" 2021-01-21 13:42:32 +00:00
Anton Hansson
7e79bdede8 Merge "Update framework/base/apex OWNERS" am: 8c03d3c0d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555175

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43270fe0ac74e475f5419dc780ec2151685de0da
 2021-01-21 13:30:55 +00:00
Anton Hansson
d787b0501a Merge "Dist more API txt files" am: 45b39d81c4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e4c654503a6fda7a8ccbdf7459d75c4f445a7ba
 2021-01-21 13:26:26 +00:00
Artur Satayev
f7e2d64c48 Merge "Enable @TestApi access for instrumentation." 2021-01-21 12:47:54 +00:00
Anton Hansson
8c03d3c0d8 Merge "Update framework/base/apex OWNERS" 2021-01-21 12:25:27 +00:00
Anton Hansson
45b39d81c4 Merge "Dist more API txt files" 2021-01-21 12:23:36 +00:00
Chiachang Wang
b4dc1539ea Merge "[IT4.4] Host network activity related logic into a new class" am: 14cb00fd50 am: b2cf9573bd am: d386a2a2b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a11342e5659222113955ab0d5b713aecac03707
 2021-01-21 10:29:03 +00:00
Riddle Hsu
298006d255 Merge "Clear fixed rotation for app no longer changes rotation" 2021-01-21 10:21:01 +00:00
Chiachang Wang
d386a2a2b9 Merge "[IT4.4] Host network activity related logic into a new class" am: 14cb00fd50 am: b2cf9573bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9d356627445c81993ba4ed2048d621e70ebca0e
 2021-01-21 10:01:05 +00:00
Linus Tufvesson
076c0697ee Merge "Update system application overlay api" 2021-01-21 09:42:02 +00:00
Chiachang Wang
21985b42ac Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 39efdb2451 am: 2de3786907 am: c5698a5bc9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c873db971acd19cba9dd45a874e036587f88940
 2021-01-21 09:25:51 +00:00
Chiachang Wang
b2cf9573bd Merge "[IT4.4] Host network activity related logic into a new class" am: 14cb00fd50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6158f29302241703367b5392d2f0adcf6f6ccf57
 2021-01-21 09:21:33 +00:00
Chiachang Wang
c5698a5bc9 Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 39efdb2451 am: 2de3786907 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If57e12227a2735853911ca6271a211571ddb633b
 2021-01-21 09:19:46 +00:00
Paul Hu
df28bddbfd Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: e8bf3e902b am: 465b565d49 am: 892fa611ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf4d66456d3b3675d16a80b1538949c3807ddcbc
 2021-01-21 09:18:45 +00:00
Chiachang Wang
23f1ac8004 [automerger skipped] Merge "[IT4.3] Listen interface change in BSS" am: c95ab361c7 am: 97b07f5b2e am: a6b2596d7f -s ours 
am skip reason: Change-Id I9c1b2294905d3b59f6945c3f8acb91b2e419b492 with SHA-1 9a81afdca8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10c4b326dc0c653be43c34956177ea469f92f838
 2021-01-21 09:18:06 +00:00
Paul Hu
892fa611ea Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: e8bf3e902b am: 465b565d49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib68e5eb2ce60a616b25b6d0a45b2af143660865f
 2021-01-21 08:55:37 +00:00
Chiachang Wang
2de3786907 Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 39efdb2451 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b7818c5fc851a5b2a1406caec0db3dac3ff55c7
 2021-01-21 08:55:33 +00:00
Chiachang Wang
a6b2596d7f Merge "[IT4.3] Listen interface change in BSS" am: c95ab361c7 am: 97b07f5b2e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib51a30f6c2b7836df82e250c82194d73cb8caa80
 2021-01-21 08:55:15 +00:00
Chiachang Wang
14cb00fd50 Merge "[IT4.4] Host network activity related logic into a new class" 2021-01-21 08:41:15 +00:00
Chiachang Wang
39efdb2451 Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" 2021-01-21 08:40:53 +00:00
Chiachang Wang
92b94e1ec5 Use ParcelFileDescriptor instead of FileDescriptor in the aidl 
Using FileDescriptor in the aidl will refer to
Parcel.readRawFileDescriptor() and Parcel.writeRawFileDescriptor()
whilie trying to do parcel operations. Those two APIs are hidden
and not accessible for the incoming ConnectivityService mainline
module. For such use cases in a module, it should be replaced by
using ParcelFileDescriptor that is designed for such usages.

Bug: 170598012
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: Ia7e3a71ccb4b136cc55c9e90a384870c32cfd37b
 2021-01-21 08:40:12 +00:00
Minche Li
d9ce52ec07 Merge changes from topic "magnification_switch" 
* changes:
  Notifies updating magnification switch visibility when the magnification shortcut is triggered
  Notifies showing magnification switch when the touch interaction starts or ends
  Not need to show magnification switch UI when magnification scale is changed
 2021-01-21 08:12:03 +00:00
TreeHugger Robot
9096542e60 Merge "Mark Flicker IME tests as flaky" 2021-01-21 08:08:54 +00:00
Paul Hu
465b565d49 Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: e8bf3e902b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33f441fba920d6228be47b2025fcf7303e496da8
 2021-01-21 08:07:51 +00:00
Chiachang Wang
97b07f5b2e Merge "[IT4.3] Listen interface change in BSS" am: c95ab361c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33a02ef90a8e5a9699e94b34b6a3d82f20a4b505
 2021-01-21 07:57:06 +00:00
Paul Hu
e8bf3e902b Merge "Replace Context @hide API in MultinetworkPolicyTracker" 2021-01-21 07:53:19 +00:00
Chiachang Wang
c95ab361c7 Merge "[IT4.3] Listen interface change in BSS" 2021-01-21 07:41:54 +00:00
Treehugger Robot
77c32d839d [automerger skipped] Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d7d am: 6c75038336 am: e431563a7c -s ours 
am skip reason: Change-Id I9f41f888fbd4b7605d750110b345005a5cba85d1 with SHA-1 0d00aef643 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0fd240132b5acbe161ccf6cdae07c1d39109b8e
 2021-01-21 07:29:55 +00:00
Remi NGUYEN VAN
14d5c2eaa7 Merge "Mark TestNetworkManager as module API" am: 24ea1e0377 am: ae781e1b30 am: 0397559e6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a8aa17d6acdaed8ee7419990493b631c0eb6d1c
 2021-01-21 07:28:46 +00:00
Treehugger Robot
e431563a7c Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d7d am: 6c75038336 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9103e40a248ef3bbdd0f758aebe0b5e21e4372c
 2021-01-21 07:22:47 +00:00
TreeHugger Robot
d4e8a3b7e5 Merge "Fix ANR caused by VibrationThread" 2021-01-21 07:08:26 +00:00
Etan Cohen
ecde596d90 Merge "[Provider Model][SysUI] Mock global provider flag" 2021-01-21 07:04:36 +00:00
Treehugger Robot
6c75038336 Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23b6f3e472bd1408b9674e48f046e8cd6c64d8b2
 2021-01-21 07:01:13 +00:00