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

627960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Baligh Uddin
9261bed60b Merge "Migrate apex/permission to packages/modules/Permission" into mainline-prod 2021-03-06 22:36:33 +00:00
TreeHugger Robot
7ed1579ba0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-06 20:58:21 +00:00
Bill Yi
7689c25f5f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib01bdeb8917b331fdd3811332f30bb8b35205f50
 2021-03-06 19:27:56 +00:00
TreeHugger Robot
10c0b8a7ae Merge "Pass InlineSuggestionsRequest via autofill auth intent extras" into sc-dev 2021-03-06 18:46:41 +00:00
lifr
c7028a41f0 [CS10]Remove the hidden API usage of BitUtils 
The connection service will become the main line module.
It is difficult to include BitUtils in the module. and so
Move the hidden API needed in BitUtils to NetworkCapabilitiesUtils.

Bug: 170598012
Test: atest ConnectivityServiceTest
      atest NetworkCapabilitiesTest
      atest DnsUtilsTest
Change-Id: Ibc81827e25a54fc3ff94f78d810fe4f5073e3a98
 2021-03-06 16:21:16 +00:00
Baligh Uddin
be2534a428 Migrate apex/permission to packages/modules/Permission 
BUG: 167963264
Test: TH
Merged-In: I1a6aac95deabeee6d301ad83a2ad31ed2663c02e
Change-Id: I2db4fd75fe696b29f4e84d03fd0e88fc66e999a7
 2021-03-06 14:40:40 +00:00
JW Wang
13c2342861 Merge "Add tests for device config changes" into sc-dev 2021-03-06 14:34:36 +00:00
Jeff DeCew
008be953fc Merge "Use the accent color for the hairline stroke of smart actions" into sc-dev 2021-03-06 13:58:42 +00:00
TreeHugger Robot
0a5bec679f Merge "Refine the onTouch logic and log touch speed" into sc-dev 2021-03-06 13:17:56 +00:00
Pavel Grafov
af9181a67d Merge changes from topics "wifi-dpm-grant", "wifi-keychain" into sc-dev 
* changes:
  Allow WiFi module to request grants from KeyChain
  DPM API to grant keys to Wifi
 2021-03-06 12:12:14 +00:00
Ilya Matyukhin
5bb0f5a1f6 Refine the onTouch logic and log touch speed 
Bug: 180668977
Test: atest UdfpsControllerTest
Test: on device
Change-Id: I097eaf6f627adfc4c916672dd034d0a63a57b32b
 2021-03-06 03:15:39 -08:00
TreeHugger Robot
93997dd20c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e954e6a5b5 -s ours am: 6ef5bdca5c -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66a929106ff1633ef18bbe6bfd928163b2dec416
 2021-03-06 09:10:14 +00:00
Bill Yi
c1cccd8e2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d2443bf5 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fbc38ec152060ebaefb08765d71ab3d95b40e9a
 2021-03-06 08:29:50 +00:00
TreeHugger Robot
6ef5bdca5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e954e6a5b5 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icce1796f91732a9974761910a559b862afffb21c
 2021-03-06 08:26:06 +00:00
Jason Chang
90f3cd927a Merge "Refactor to use WindowManager#getCurrentWindowMetrics() instead of using Display#getRealSize()" into sc-dev 2021-03-06 08:04:52 +00:00
TreeHugger Robot
e954e6a5b5 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-06 07:56:37 +00:00
Tim Van Patten
3c4b8d977b Merge "GameManager: Add Public API" into sc-dev 2021-03-06 07:17:14 +00:00
Junyu Lai
6a61660729 Merge changes I6512d3f7,I99bca71c am: eccbfe4b72 am: 26d42f094a am: 50a13c982f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57c4dffd22338d850beaff7b2575204ee2a42cd9
 2021-03-06 06:25:54 +00:00