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

640846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi NGUYEN VAN
5f7ffd4136 Merge "Move net unit tests to packages/Connectivity" into sc-dev 2021-05-13 09:09:35 +00:00
Corina Grigoras
094d6c52f1 Merge "Add gif mime type" into sc-dev 2021-05-13 08:25:03 +00:00
Corina
506eae3745 Add gif mime type 
Bug: 168001592
Test: atest MimeMapTest
Change-Id: I0413381fd94f61e96d29eb4f139743c197c99040
 2021-05-13 08:24:32 +00:00
PETER LIANG
0e78306403 Merge "Fix the animation is not smooth when moving the a11y fab to the edge." into sc-dev 2021-05-13 08:21:25 +00:00
Pierre Barbier de Reuille
d8b2952bb9 Merge "Check colors actually change for App Widget" into sc-dev 2021-05-13 08:08:08 +00:00
TreeHugger Robot
cf8809f809 Merge "[pm] add uid in PackageInstallerV2 metrics" into sc-dev 2021-05-13 06:42:59 +00:00
Paul Hu
64cdd91b6e Merge "Add RESTRICTED_ALLOWED_APPS setting" am: e6d2b4663e am: fe7e35ea07 am: 67909cbb05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689208

Change-Id: I59c9ff9a64eac6b3367169450ca2c063ef34ff3c
 2021-05-13 06:36:18 +00:00
Paul Hu
67909cbb05 Merge "Add RESTRICTED_ALLOWED_APPS setting" am: e6d2b4663e am: fe7e35ea07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689208

Change-Id: I9a30162499954c4ec3bcd97233256f973662f7ab
 2021-05-13 06:19:25 +00:00
Remi NGUYEN VAN
007a886baf Move net unit tests to packages/Connectivity 
Move the tests together with packages/Connectivity code, so both can be
moved to packages/modules/Connectivity together.

Also reorganize unit tests in a unit/ directory, as other tests
(integration/, common/ etc.) have been added in tests/net since they
were created. This makes the directory structure consistent.

Test: atest FrameworksNetTests
Bug: 187814163
Ignore-AOSP-First: needs per-branch move for merge conflicts
Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc
 2021-05-13 05:55:44 +00:00
Paul Hu
fe7e35ea07 Merge "Add RESTRICTED_ALLOWED_APPS setting" am: e6d2b4663e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689208

Change-Id: I93c004e7356559436c7dbd95716e52db8fc1ba0d
 2021-05-13 05:54:31 +00:00
Linzhao Ye
8bee21a405 Merge changes Id9a9451a,Idf113709 am: 03a24f50cc am: 0e751cd213 am: f47925ad3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702072

Change-Id: I483cfc93af04830ff50dfec5bfadf71c7578fd90
 2021-05-13 05:48:25 +00:00
Alexander Dorokhine
332dd22ff9 Merge "Refactor VisibilityStore's docs and maps to separate objects." into sc-dev 2021-05-13 05:33:54 +00:00
Paul Hu
e6d2b4663e Merge "Add RESTRICTED_ALLOWED_APPS setting" 2021-05-13 05:32:19 +00:00
Linzhao Ye
f47925ad3e Merge changes Id9a9451a,Idf113709 am: 03a24f50cc am: 0e751cd213 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702072

Change-Id: I7f50f681febf76724eac83508af6101a412deacd
 2021-05-13 05:16:00 +00:00
Linzhao Ye
0e751cd213 Merge changes Id9a9451a,Idf113709 am: 03a24f50cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702072

Change-Id: Ie027778a90deb5a3956f0e1dc9cbf462c9a4b50e
 2021-05-13 04:53:17 +00:00
Linzhao Ye
03a24f50cc Merge changes Id9a9451a,Idf113709 
* changes:
  Change the brackets in Persian keyboard layout.
  Change the brackets in Hebrew keyboard layout.
 2021-05-13 04:33:11 +00:00
Treehugger Robot
5ac4488fec Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 am: ad73e362f0 am: 41d04381e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447

Change-Id: I3247db1b8db8691705a3a7856d696a84f0fd1413
 2021-05-13 03:00:40 +00:00
Ken Chen
92bc335785 Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: 3ae939569e am: 233682e675 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: I53d58c5b2277ba2d88a848ed3e6d6269b4b886b3
 2021-05-13 03:00:17 +00:00
Ken Chen
523019423b Merge "Better log in createNativeNetwork" am: bd0ba5d94b am: d0ab30add0 am: 4be8e66448 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925

Change-Id: I963967771fff102b25ce102c56789904d5e3c342
 2021-05-13 02:59:56 +00:00
Ken Chen
2216da85aa Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc am: 62258932ff am: a4d53bfa6d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: I3475e674c3914c4c61fd0a4246c9ee3e7e02c4fb
 2021-05-13 02:59:30 +00:00
Treehugger Robot
41d04381e9 Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 am: ad73e362f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447

Change-Id: I13644c975e38ef52635c9e55cc4ccca2b96902fd
 2021-05-13 02:45:15 +00:00
Ken Chen
233682e675 Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: 3ae939569e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: Id2e9d16c88088ef5d3ffe6f698af5ee8201c7716
 2021-05-13 02:45:06 +00:00
Ken Chen
4be8e66448 Merge "Better log in createNativeNetwork" am: bd0ba5d94b am: d0ab30add0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925

Change-Id: If8c106b8d0f2f71e47942a151de49daf1b65b852
 2021-05-13 02:44:48 +00:00
Ken Chen
a4d53bfa6d Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc am: 62258932ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: Iec819a213f8c0daf50cdfdd5d580234ee5f8de68
 2021-05-13 02:44:30 +00:00
Minche Li
cf75811945 Merge "Adjusts measurement for magnification switch and drag handle" into sc-dev 2021-05-13 02:38:33 +00:00
Jeff Chang
5c62d1f9d6 Merge "Make no-history activity be finished with different tasks" into sc-dev 2021-05-13 02:35:37 +00:00
Treehugger Robot
ad73e362f0 Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." am: fa8d51d5a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706447

Change-Id: I1e18b1b6c51ea0bb4c9db9623259161a75781f29
 2021-05-13 02:11:32 +00:00
paulhu
5ee5670cc1 Add RESTRICTED_ALLOWED_APPS setting 
This setting is OEM upstream requirement for third party apps
using restricted networks.

Bug: 185149952
Test: atests FrameworksNetTests
Change-Id: I5e16b46cf2935f38ee1e516bb8b85fa487cf9f61
 2021-05-13 10:09:31 +08:00
Ken Chen
3ae939569e Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: I18b5716252efc4f7c33ec8263c09df1f9396d1fe
 2021-05-13 02:05:37 +00:00
Ken Chen
d0ab30add0 Merge "Better log in createNativeNetwork" am: bd0ba5d94b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925

Change-Id: Ic8afb71d7ac099f6c492dda8f9f54a5da3c79649
 2021-05-13 02:01:21 +00:00
Joe Hsu
c73c098665 Merge "Check FontFamily null before adding it." into sc-dev 2021-05-13 01:59:02 +00:00
Treehugger Robot
fa8d51d5a6 Merge "Keystore 2.0 SPI: Silence warning about blocking calls to Keystore." 2021-05-13 01:57:26 +00:00
Wei Sheng Shih
a9cbf391e0 Merge "Enable app reveal animation after splash screen." into sc-dev 2021-05-13 01:40:49 +00:00
Wei Sheng Shih
0287fee40f Merge "Fix ActivityRecord leak if starting window was transferred." into sc-dev 2021-05-13 01:37:10 +00:00
Ken Chen
62258932ff Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: Ia7b8d56ee75194cfe289dbb3e73667f43344cda3
 2021-05-13 01:34:23 +00:00
Ken Chen
785dc4871c Merge "Add testVpnTypesEqual to verify consistency" 2021-05-13 01:22:08 +00:00
Dmitri Plotnikov
b5d43c6b71 Merge "Do realistic data mocking in BluetoothPowerCalculatorTest" into sc-dev 2021-05-13 01:22:04 +00:00
Ken Chen
bd0ba5d94b Merge "Better log in createNativeNetwork" 2021-05-13 01:21:47 +00:00
Ken Chen
c9d5cd9fbc Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" 2021-05-13 01:20:39 +00:00
TreeHugger Robot
1e1c864bc1 Merge "Fix BatteryStats Screen On timer reset" into sc-dev 2021-05-13 00:55:43 +00:00
TreeHugger Robot
5c681088e4 Merge "More benchmark tweaks" into sc-dev 2021-05-13 00:53:03 +00:00
TreeHugger Robot
ef36e9f960 Merge "Move boot test to postsubmit" into sc-dev 2021-05-13 00:13:07 +00:00
Joe Bolinger
7f40c4b4ef Merge "Respond to lockout reset requests from the HAL." into sc-dev 2021-05-13 00:12:53 +00:00
Janis Danisevskis
04d5622233 Keystore 2.0 SPI: Silence warning about blocking calls to Keystore. 
Test: N/A
Bug: 184108046
Change-Id: I7401b88e5055cb781113656021f3ec274d1951a4
 2021-05-12 16:53:14 -07:00
Cody Kesting
be6088d11c Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6 am: 5cdc27d2ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: I7d636497dbc26008e659495e4236f161c90599ab
 2021-05-12 23:40:05 +00:00
Linzhao Ye
5423b6dfc2 Merge "Change the '[]' and '<>' brackets in Arabic keyboard layout." am: 5c1879cb60 am: 27095d7536 am: c985b4066c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702070

Change-Id: I72dbe8a141f29c4621bc6036a8aff39eb04e79a8
 2021-05-12 23:39:30 +00:00
TreeHugger Robot
bf25b68828 Merge "mLocalDeviceIdleController could be null." into sc-dev 2021-05-12 23:33:51 +00:00
Jeff DeCew
cd86f38402 Merge "Allow populating left_icon independently of right_icon." into sc-dev 2021-05-12 23:32:35 +00:00
John Reck
3920768c72 More benchmark tweaks 
Bug: 187718492
Test: this
Change-Id: Ie0cad91e1c7d1a02704fc4b1007ba2c28cb2b3e7
 2021-05-12 19:29:03 -04:00
TreeHugger Robot
85dda65c28 Merge "Clarify the semantics of ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" into sc-dev 2021-05-12 23:28:51 +00:00