Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
627,984 Commits 3 Branches 0 Tags
facfd3bede8425df2042e4a4d72696071695b1ff
Commit Graph

627984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi NGUYEN VAN
facfd3bede Merge "Move OemNetworkPreferences to Connectivity" am: 23cca12865 am: 819f20feea am: 8ad13e49a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60a24c0fc878737e120414fe85786faacb425b09
 2021-03-08 10:42:05 +00:00
Remi NGUYEN VAN
8ad13e49a0 Merge "Move OemNetworkPreferences to Connectivity" am: 23cca12865 am: 819f20feea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f0c36460103552d1c1f21a8a5f8486274d282e2
 2021-03-08 09:51:57 +00:00
Paul Hu
22a93daf9f Merge "Replace Inet[4|6]Address#ANY" am: ab70e79307 am: 046574ec9c am: b248125d2a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615184

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33cb758506a4b2626de368c6537688245ac554e2
 2021-03-08 09:16:20 +00:00
David Coffin
d68e92249b Merge "Add feature flag for settings security hub" into sc-dev 2021-03-08 09:12:46 +00:00
Remi NGUYEN VAN
819f20feea Merge "Move OemNetworkPreferences to Connectivity" am: 23cca12865 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9adc394b0c203cdb1045f50e83487ea0c2000632
 2021-03-08 09:12:05 +00:00
Flavio Fiszman
e3494c7e72 Merge "Cancel notification on tile click" into sc-dev 2021-03-08 09:11:36 +00:00
Linus Tufvesson
4d67c4060f Merge "Fix javadoc links to permissions" into sc-dev 2021-03-08 09:06:47 +00:00
TreeHugger Robot
b6d634df79 Merge "Add a way to set the View ID of the top-level view on a RemoteViews." into sc-dev 2021-03-08 08:53:12 +00:00
Paul Hu
b248125d2a Merge "Replace Inet[4|6]Address#ANY" am: ab70e79307 am: 046574ec9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615184

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ee00807430cd27ed1632a0a6f7c78ab0ae4a99f
 2021-03-08 08:51:15 +00:00
Remi NGUYEN VAN
23cca12865 Merge "Move OemNetworkPreferences to Connectivity" 2021-03-08 08:41:04 +00:00
Eric Laurent
1fd211144b Merge "AudioManager: address API review comments" into sc-dev 2021-03-08 08:07:57 +00:00
Paul Hu
046574ec9c Merge "Replace Inet[4|6]Address#ANY" am: ab70e79307 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615184

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45cf2b37c775da158cdec2d3b7f50ac491d2fca8
 2021-03-08 08:05:59 +00:00
TreeHugger Robot
ae618f67ca Merge "Remove updateFontFile API" into sc-dev 2021-03-08 07:34:51 +00:00
Paul Hu
ab70e79307 Merge "Replace Inet[4|6]Address#ANY" 2021-03-08 07:20:21 +00:00
paulhu
b8c6a56292 Replace Inet[4|6]Address#ANY 
Connectivity is becoming a mainline module in S but mainline
modules are not allowed to use non-formal APIs. Thus, replace
non-formal API Inet[4|6]Address#ANY to
NetworkStackConstants#IPV[4|6]_ADDR_ANY.

Bug: 181756157
Test: FrameworksNetTests
Change-Id: Id4d2fc551c1384f549a586e87ab68356ba05b995
 2021-03-08 07:18:31 +00:00
Joanne Chung
944e6eb7fc Merge "Add TEST_MAPPING for translation." into sc-dev 2021-03-08 06:34:41 +00:00
Seigo Nonaka
3de07491d3 Remove updateFontFile API 
Bug: 181124737
Test: atest FontManagerTest
Change-Id: I37f145e09902d29e59ed8f8d4a28467d612185da
 2021-03-07 21:24:49 -08:00
Joanne Chung
779ea7feb3 Merge "Allow translation cts can add itself into allowlist for content capture" into sc-dev 2021-03-08 04:08:19 +00:00
Wei Sheng Shih
39baa852c6 Merge "Let Launcher able to receive task launching callback(3/N)" into sc-dev 2021-03-08 04:06:56 +00:00
Edwin Tung
3bf57f62ce Merge "Make Psds server configurable from carrier config" into sc-dev 2021-03-08 04:06:50 +00:00
Frank Li
c0f874a7f8 Merge "[CS10]Remove the hidden API usage of BitUtils" am: 02d57fc2ae am: 29a9a54b31 am: 8067a74a3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615192

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad812431b5855e78596f861bd3b2c3ef091e3189
 2021-03-08 03:34:25 +00:00
Treehugger Robot
56df0b4c2f [automerger skipped] Merge "Update package of DataConnectionStats" am: 580dd34fa9 am: d009928e07 am: 987436928b -s ours 
am skip reason: Change-Id I61c28599a03a66bf0d83d78076a0791ff63f48cc with SHA-1 1ad833e5fe is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02ddc7e976f8f984ad7a7b8123548e4091fa2739
 2021-03-08 03:33:54 +00:00
Frank Li
8067a74a3e Merge "[CS10]Remove the hidden API usage of BitUtils" am: 02d57fc2ae am: 29a9a54b31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615192

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f8fe5b886c49a1c52fb4bf27d29347899e0dd21
 2021-03-08 02:55:05 +00:00
Treehugger Robot
987436928b Merge "Update package of DataConnectionStats" am: 580dd34fa9 am: d009928e07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id19840a4c1e8252aa3780ff0f95a6a0a1a846e24
 2021-03-08 02:54:46 +00:00
Frank Li
29a9a54b31 Merge "[CS10]Remove the hidden API usage of BitUtils" am: 02d57fc2ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615192

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0dcd92a896a759e65ada070f16394db216b07b8
 2021-03-08 02:14:44 +00:00
Treehugger Robot
d009928e07 Merge "Update package of DataConnectionStats" am: 580dd34fa9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic85514ed6ad77f816a8099342b92240ec2c8f204
 2021-03-08 02:12:00 +00:00
Frank Li
02d57fc2ae Merge "[CS10]Remove the hidden API usage of BitUtils" 2021-03-08 02:05:40 +00:00
Treehugger Robot
580dd34fa9 Merge "Update package of DataConnectionStats" 2021-03-08 01:36:37 +00:00
Calvin Pan
ca5181f90a Merge "Add a comment for VoIMS opt-in config" into sc-dev 2021-03-08 01:09:21 +00:00
Remi NGUYEN VAN
f9a30cfa4c Move OemNetworkPreferences to Connectivity 
The data class supports a ConnectivityManager API, so it should be
together with the ConnectivityManager API surface.

Bug: 181512874
Test: m
Change-Id: I5642486ea0febcb08cadcbd4cd3f0c6056deae0e
 2021-03-08 09:26:41 +09:00
TreeHugger Robot
f72cf3cd48 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1a3bc30fcd -s ours am: 16c3e05cba -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cce026c0a7f8113cf7f6c204f321891d3b3b023
 2021-03-07 19:54:39 +00:00
TreeHugger Robot
fda699140c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e6ce1e90e9 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1c330b9db6b799d85db9d05e83416b4c2db290d
 2021-03-07 19:32:15 +00:00
TreeHugger Robot
e8e0c0474d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-07 19:24:55 +00:00
TreeHugger Robot
16c3e05cba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1a3bc30fcd -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36eff8dde1a1aa4ff800dd277da8fc37e1bb0da7
 2021-03-07 19:14:49 +00:00
TreeHugger Robot
c15af37c44 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-07 19:13:35 +00:00
Jeff Sharkey
6595eabb43 Merge "Support for a Context to "renounce" permissions." into sc-dev 2021-03-07 19:05:26 +00:00
TreeHugger Robot
e6ce1e90e9 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-07 19:00:47 +00:00
TreeHugger Robot
fe23230929 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-07 18:49:04 +00:00
TreeHugger Robot
9c2d354785 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-07 18:47:26 +00:00
TreeHugger Robot
1a3bc30fcd Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-07 18:43:24 +00:00
Bill Yi
29746221f8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I75acc80cab48e5831ad83c66b2e6d3668c34b76a
 2021-03-07 07:27:01 -08:00
Bill Yi
6bb8ceaa0d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7c0f44ead80ca177135dca855bc3b682af9015c0
 2021-03-07 15:04:33 +00:00
Bill Yi
00a59e27cd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7fef91b6575f26e635bdcfa0eeef688cf64ac04c
 2021-03-07 14:26:31 +00:00
Bill Yi
30f7021cfd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaad6d833f97bb6d76f48f682f72305466aaa7177
 2021-03-07 14:07:06 +00:00
TreeHugger Robot
8b72f15aad Merge "Remove dispatchMediaKeyEvent API" into sc-dev 2021-03-07 13:23:56 +00:00
Bill Yi
653dec3aa3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7a7a8a67d0e27ec6209ea1b984dc49d216a7d187
 2021-03-07 00:34:14 -08:00
Robert Shih
5d1fad30ce Merge "MediaDrm: add ERROR_PROVISIONING_REQUEST_REJECTED" into sc-dev 2021-03-07 06:01:18 +00:00
Yiwei Zhang
83c17c18b8 Merge "Nudge SurfaceControlFpsListener api to use task ID" into sc-dev 2021-03-07 03:44:19 +00:00
Bill Yi
bd4304b71c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1c510b3c97daf3f77149f213c38f9f146159ad59
 2021-03-06 19:18:44 -08:00
Baligh Uddin
50575cd126 [automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into mainline-prod am: 9261bed60b -s ours 
am skip reason: Change-Id I1a6aac95deabeee6d301ad83a2ad31ed2663c02e with SHA-1 dbcf3a1e56 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7211cfdc87d61636653fe6b46033842c695a4669
 2021-03-06 23:14:07 +00:00