Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
618,220 Commits 3 Branches 0 Tags
daea39f8a21c1900f45e652df2fa10ffe3e3d5bf
Commit Graph

618220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Buynytskyy
daea39f8a2 Merge "Per package read timeouts." 2021-01-12 16:53:11 +00:00
Benjamin Franz
a633741730 Merge "Add new overridable annotation to platform compat" am: 458515e464 am: 899cd8920b am: 9f7867cee2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If74ec1464e1a52a14ab1aeb81ca676622a52a72d
 2021-01-12 16:48:26 +00:00
TreeHugger Robot
eedea4c824 Merge "Adding Battery saver policy to alarms" 2021-01-12 16:44:09 +00:00
Benjamin Franz
9f7867cee2 Merge "Add new overridable annotation to platform compat" am: 458515e464 am: 899cd8920b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8c48feb66285ec4153d61eb83ff8967dae28adf
 2021-01-12 16:41:53 +00:00
Dave Mankoff
44859f7117 [automerger skipped] Merge "Pass interaction type to FalsingManager.isFalse" into rvc-qpr-dev am: 37bba85895 am: 23dbba641c -s ours 
am skip reason: Change-Id I176f54a768622dec3e758a7f01ed8aec26223648 with SHA-1 96c4746453 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id48451bf273a58869cfb715c3a16cd33e479f098
 2021-01-12 16:40:30 +00:00
Benjamin Franz
899cd8920b Merge "Add new overridable annotation to platform compat" am: 458515e464 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdb84460fab8ec12e185a6f78afa0efd8de2d3b5
 2021-01-12 16:22:18 +00:00
Dave Mankoff
23dbba641c Merge "Pass interaction type to FalsingManager.isFalse" into rvc-qpr-dev am: 37bba85895 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13317667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3404cfdb3f3411d88d49cbfcd8eaa9455a620eb8
 2021-01-12 16:22:09 +00:00
Alex Florescu
f44439cde8 Merge "Add Feature Flag for guarding development of two-column notification shade" 2021-01-12 16:17:50 +00:00
Joanne Chung
d47c351b8d Merge "Initial layout of translation related APIs." 2021-01-12 16:00:23 +00:00
Dave Mankoff
37bba85895 Merge "Pass interaction type to FalsingManager.isFalse" into rvc-qpr-dev 2021-01-12 15:54:09 +00:00
Benjamin Franz
458515e464 Merge "Add new overridable annotation to platform compat" 2021-01-12 15:38:01 +00:00
Linus Tufvesson
560845ef67 Merge "Remove preinstalled from SYSTEM_ALERT_WINDOW" 2021-01-12 14:59:37 +00:00
Adam He
2653f23d47 Initial layout of translation related APIs. 
The initial translation related APIs. The APIs and the implementation
will be revised in the follow up changes. The service register will
on the next changes.

Bug: 173243538
Bug: 176208267
Test: manual verification (build)

Change-Id: Ib7b39e1b548bc6663a81482fa335632e8da18d6a
 2021-01-12 21:08:05 +08:00
Alex Johnston
23c36e41d1 Merge "On uninstall cred mng app" 2021-01-12 12:59:13 +00:00
Ryan Lin
2f500c6f49 Merge "Temporarily disable WindowMagnificationAnimationControllerTest" 2021-01-12 12:50:47 +00:00
TreeHugger Robot
d52f765a7f Merge "Consolidate waiting list of visible and launched activity" 2021-01-12 12:14:56 +00:00
Lorenzo Colitti
5d1694b3ae Merge "Remove Vpn#isBlockingUid." am: 2982364969 am: 88f04b79bd am: 316966eb7e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I141c6e1d0585f81e2ab14ad96499beb112eebdb5
 2021-01-12 11:26:08 +00:00
Paul Hu
aab0bf5483 Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 158e8ae1f1 am: 42a2d40519 am: 9425733cd6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id78638ca2a5384accb7b1b92d70a779fda561b98
 2021-01-12 11:25:28 +00:00
TreeHugger Robot
966bc27a70 Merge "NetworkWatchlistServiceTests: update IIpConnectivityMetrics." 2021-01-12 11:20:43 +00:00
Lorenzo Colitti
316966eb7e Merge "Remove Vpn#isBlockingUid." am: 2982364969 am: 88f04b79bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic509770103b1538cdb5a16e8ba0753029c0863b9
 2021-01-12 11:12:11 +00:00
Paul Hu
9425733cd6 Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 158e8ae1f1 am: 42a2d40519 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I623a01c29978908b213e888ffebc06f38d5ee085
 2021-01-12 11:11:08 +00:00
Treehugger Robot
02986329e4 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 46c82c2739 am: ce706fe852 am: 3854c7ac43 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99aa6ba209a6e051d9c2c9ebf9f2635effaa450b
 2021-01-12 11:03:01 +00:00
Alex Johnston
141652b464 On uninstall cred mng app 
Changes
* when ACTION_PACKAGE_REMOVE is received
  in the DPMS broadcast receiver, remove
  the cred mng app if the removed package
  is the cred mng app.

Manual testing steps:
* Request to manage credentials in TestDPC
* Check Settings > encryption & credentials
  and verify the cred mng app is set successfully
* Uninstall TestDPC
* Check Settings to and verify there is no
  cred mng app.

Bug: 165641221
Test: Manual testing
      atest com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: I6e8004da40c35c0dfe25540bf143f255d9f839d7
 2021-01-12 10:51:08 +00:00
Lorenzo Colitti
88f04b79bd Merge "Remove Vpn#isBlockingUid." am: 2982364969 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c3745aaf5822a75e4597d7ff326680f9d7c63d7
 2021-01-12 10:25:46 +00:00
Paul Hu
42a2d40519 Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 158e8ae1f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0936169def9a3ec1fe5895f948fc2a776a0deec
 2021-01-12 10:22:27 +00:00
Lorenzo Colitti
2982364969 Merge "Remove Vpn#isBlockingUid." 2021-01-12 10:20:33 +00:00
Neil Fuller
8f3eb8263f Merge "Fix shell commands to use "current" user" 2021-01-12 10:20:18 +00:00
Treehugger Robot
3854c7ac43 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 46c82c2739 am: ce706fe852 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1388064603ed3df9719997522e53ffb7b4903b25
 2021-01-12 10:05:35 +00:00
Paul Hu
158e8ae1f1 Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" 2021-01-12 09:53:05 +00:00
Gavin Corkery
3e99a4a68a Merge "Add reboot step to Rescue Party" 2021-01-12 09:52:14 +00:00
Treehugger Robot
ce706fe852 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 46c82c2739 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01c9c7e2b8022f2fbec610934e43245cda3483be
 2021-01-12 09:40:36 +00:00
Zimuzo Ezeozue
e2cdacf427 Merge "Fix StorageVolume Parcel parsing" 2021-01-12 09:31:16 +00:00
Lorenzo Colitti
9d678211d9 NetworkWatchlistServiceTests: update IIpConnectivityMetrics. 
IIpConnectivityMetrics is gaining two new methods. Update the
subclass of that class used in NetworkWatchlistServiceTests to
reflect the new methods.

Bug: 171540887
Test: m FrameworksServicesTests
Change-Id: I3eb82680b6b3dd6b457095a484cf55560ff1088b
 2021-01-12 09:22:16 +00:00
Eran Messeri
9868762e50 Merge "Implement Enrollment-Specific ID" 2021-01-12 09:10:24 +00:00
Rafal Slawik
ed647d463f Merge "Remove CpuTimePerFreq atom puller" 2021-01-12 08:59:38 +00:00
Treehugger Robot
46c82c2739 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" 2021-01-12 08:59:04 +00:00
TreeHugger Robot
6791bc1adc Merge "Make ScreenPinningRequest#getWindowLayoutParams protected" 2021-01-12 08:57:07 +00:00
TreeHugger Robot
37ff65366e Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-12 08:14:20 +00:00
TreeHugger Robot
68e55ddbad Merge "Move shell Transitions into a package" 2021-01-12 07:59:50 +00:00
TreeHugger Robot
66b509fa75 Merge "Revert "Change mounting storage data and obb to on by default"" 2021-01-12 07:52:41 +00:00
Vince Leung
7b2e3fe338 Merge "Add PRIMITIVE_LOW_TICK VibrationEffect" 2021-01-12 07:17:54 +00:00
TreeHugger Robot
adb7d3e4c2 Merge "Convert several PowerCalculators to use BatteryUsageStats" 2021-01-12 07:02:14 +00:00
TreeHugger Robot
d52221bc47 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-12 06:24:44 +00:00
TreeHugger Robot
dbbc28a849 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-12 06:02:42 +00:00
Treehugger Robot
9cf0b7392f Merge "Improve error message when testing network factory" am: e8cd6e4fef am: 324e0f161a am: 795ef23ed8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b421f7b2895a24912d37d73dc011fa440440cf2
 2021-01-12 05:31:18 +00:00
Winson Chung
8dd46b0ef1 Merge changes I3657efcc,Iabdf5ee9 
* changes:
  Re-implement TvPipController
  Refactor .tv.PipNotification
 2021-01-12 05:21:15 +00:00
Alex Buynytskyy
aa8e95ea33 Per package read timeouts. 
Bug: 162345970
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest

Change-Id: I2599db1ed8827fff16387c11254a5d607f27ea46
 2021-01-12 05:19:38 +00:00
TreeHugger Robot
55b6a818e0 Merge "Check updatable font dir in FontListParser." 2021-01-12 05:18:59 +00:00
Treehugger Robot
795ef23ed8 Merge "Improve error message when testing network factory" am: e8cd6e4fef am: 324e0f161a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b867dec65d458d248706b4118f8d23055eea3a8
 2021-01-12 05:13:18 +00:00
TreeHugger Robot
368efbc3db [automerger skipped] Merge "Fix renaming file and moving file issue in MTP" into rvc-qpr-dev am: d099321312 am: da4cb98b05 -s ours 
am skip reason: Change-Id Ia37be7a027bfe502e3f7c96babe5a5bbed5f942c with SHA-1 20079f1064 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e91e72ad6154cedd9f826ef6929260c75a386a9
 2021-01-12 05:03:12 +00:00