Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
626,473 Commits 3 Branches 0 Tags
074cc33c40843d99f97bdd652bb97e88ea56ab8a
Commit Graph

626473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suren Baghdasaryan
074cc33c40 [automerger skipped] Merge "Fix total memtrack Graphics and GL calculations" am: d061730dae am: 355bd7d9b8 am: 44c20b347f -s ours 
am skip reason: Change-Id I77f06322fbb06ffa33115c1469aba80e59247904 with SHA-1 1c5d763107 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I416729c9918336989fd4d065a991b606ede3c63e
 2021-03-01 08:13:48 +00:00
Treehugger Robot
699b52d0a8 [automerger skipped] Merge "Rename the font file with PostScript name based file name" am: 5cc4c3ff91 am: b05555721c am: 763ecd2ae7 -s ours 
am skip reason: Change-Id I829840299b5d138cfec8924ce8f77e1371524a70 with SHA-1 2f0674a7fa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a39247697ca0f323df2ad56777e90635dc4ed69
 2021-03-01 08:13:24 +00:00
Hunter Knepshield
0da42ef255 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c am: b79c80ba78 am: 0f5e18a9f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09da5ada79dc0417e9f40769b924d1834fed3250
 2021-03-01 08:12:58 +00:00
Winson Chiu
6b57f8489d Merge "Add OWNERS for pm.verify.domain" am: 1736ad8bfe am: b87d41ab87 am: 472f02851f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib249a8b692299bbe86922b17be39469de4960a33
 2021-03-01 08:12:27 +00:00
Andrei-Valentin Onea
b8037bb49a Merge "Fix deadlock on CompatConfig.mChanges" am: eaf3fd59ff am: 0f53ddc205 am: 75c6b35d4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31110ae5c28a48ea91c4ef8e56678edfb3c7b250
 2021-03-01 08:12:06 +00:00
Vladimir Marko
cde7c9f16f Merge "Change dirty-image-objects file format." am: 523e3b9b79 am: e70dab7633 am: 87cb8b5efe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606454

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68d174ca59fea49ce1828f0c828b32fbb5d2c214
 2021-03-01 08:10:53 +00:00
Junyu Lai
68a5c01ccf Merge "[FUI08] Create NeworkStateSnapshot" am: 702ca13a66 am: 32e8e9eb24 am: b23e201f01 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5f3cfbdd6f3b23007ea7a2581a75088ed96714f
 2021-03-01 08:10:22 +00:00
James Lin
dcba4e14a9 Merge "Update the UCE OPTIONS API" am: a2d03f9eec am: 2f9c50d50a am: ee8b27d293 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad21c56bb2e50433e026ad4abf14427e236b91a3
 2021-03-01 08:09:58 +00:00
Zoey Chen
6794dbe262 [automerger skipped] Merge "[Telephony] Implement onDataEnabled callback" am: c8057ecd1c am: ce04917626 am: 4d942da6f9 -s ours 
am skip reason: Change-Id I1b9fe50e4b805f5117fb6e03438dd0a09fbcfebc with SHA-1 4ad5f0a7c7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04a1b91748fa0fd6669d5f1b6abcfcda0c5e9bfb
 2021-03-01 08:09:34 +00:00
Almaz Mingaleev
4d562f64fd Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26 am: 08f03dc59c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5c9d8adbe377432df0710d8ab473683f6866bd7
 2021-03-01 08:08:35 +00:00
Dmitry Dementyev
7d21d719a5 Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd am: 26085ee2ff am: 25de7c49b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603470

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c23d408e34d6305784e54b7ef00a258b4ea6fab
 2021-03-01 08:07:59 +00:00
Junyu Lai
69b8cbd32e Merge "Fix copyright license of VpnTransportInfo" am: 594e8def4c am: 9044d1e472 am: bc88904010 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf6ba342dfbc92fc4852b96d1c3f3b3f34cc3322
 2021-03-01 08:07:27 +00:00
Janis Danisevskis
fdfc090a98 Merge "Keystore 2.0: Clear Uid/Namesapce" am: a51a74a8c5 am: 6413a11508 am: 36dfffbdbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604089

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6556ce399ddf4444e7655f05d92861073580c2cf
 2021-03-01 08:06:58 +00:00
Daniel Bright
d3cfb31078 [automerger skipped] Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5 am: 9c4102e2a1 am: b50587319e -s ours 
am skip reason: Change-Id Ie31d32a08b10b8c125f27832e81a3e65b6d8767a with SHA-1 e177c09787 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3effe377205a2a1b37eceb2ec978af31d98f23f
 2021-03-01 08:03:08 +00:00
Remi NGUYEN VAN
60891de142 Merge "Fix CaptivePortalDataTest on R" am: fada307ddf am: 04dd0eb01a am: b6f07bbf46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd6711e5caafd92bba9f251742fd3c53efeea672
 2021-03-01 08:02:39 +00:00
Remi NGUYEN VAN
7cf726658c Merge "Add public alternative for protectFromVpn" am: 2c49d21ce1 am: 25a7767cc7 am: e456ac2061 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0c46c990def1b6884a6008841f3d5bd912b8650
 2021-03-01 08:01:51 +00:00
Louis Chang
71f07b4ed5 [automerger skipped] Merge "Stop keeping freeform activities visible." into rvc-qpr-dev am: f0bd7906d0 -s ours am: 0492435ea2 -s ours 
am skip reason: Change-Id Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037 with SHA-1 3f74b33211 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e46fa035a8cb540396df36fbd5995251b8ee98e
 2021-03-01 08:01:23 +00:00
Calin Juravle
6eddd02cf3 [automerger skipped] Merge "Migrate deleteOdex functionality to DexManager" am: 41207e284c am: 5383d7a776 am: 6c05b32085 -s ours 
am skip reason: Change-Id I265f0c60be4f871d09c9513166723e31051ac1a3 with SHA-1 72e090b8df is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I362aad77519ade67f5e8b20a7cd918517957cbb4
 2021-03-01 08:00:53 +00:00
Tianjie Xu
75ec9ede9b Merge "Fix a typo for the server blob timeout" am: 5c9ebe31ab am: afb76f685c am: 1ff02233c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607353

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4dba6c64bf9107600bbe6a8935357b2791431bb
 2021-03-01 08:00:30 +00:00
Chris Weir
86591e9bbe Merge "Update tests for PANS network usage metrics" am: b1cba34bfd am: 3d6031160f am: d7b355bf4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I212c317f744d88bc97b34195e4f86f447fb7bd52
 2021-03-01 08:00:07 +00:00
Chris Weir
9a4f2d55e7 Merge "Add support for tracking PANS data usage" am: 90261da202 am: eebeb725a8 am: e30a010ca3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d586ff455baccbf87f0ffb835af83c90735ba56
 2021-03-01 07:59:54 +00:00
Collin Fijalkovich
59c6ca2b2d [automerger skipped] Merge "Avoid TransferPipe for local dumpCacheInfo calls" am: d43c415293 am: cbeda8a777 am: 93b0c8574e -s ours 
am skip reason: Change-Id I1e4ab8e1d09b98b379d81079fd26ff2129b5b65a with SHA-1 bde9bc3635 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12b89985cfc77b2efeb5993242e1fba413f4573d
 2021-03-01 07:59:29 +00:00
Brian Stack
d4bcdb9668 [automerger skipped] Merge "Remove unnecessary UWB functions" am: 752aee7e04 am: ce702151e8 am: a4c042dc10 -s ours 
am skip reason: Change-Id I81675429d73486f0b002e76acabaa4883990ab11 with SHA-1 bd03c96317 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6cc07fb0481fa2a4587d6ed165a0e36bdfad921
 2021-03-01 07:59:08 +00:00
Danny Epstein
2004833c4d [automerger skipped] Merge "Configure privapp perms for car activity resolver" into rvc-qpr-dev am: ad312a6c1d am: eed3786c2c -s ours 
am skip reason: Change-Id If7e5d48ce5d897a2cd90a02eaeda59e71d164520 with SHA-1 8d9eacea3a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b843fbd3e025f4372e30c4d503886cb611b69cf
 2021-03-01 07:58:47 +00:00
Remi NGUYEN VAN
a3ddd8f9c6 Merge "Configure privapp perms for car activity resolver" into sc-dev 2021-03-01 07:28:30 +00:00
Bob Badour
b894bba32a Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev 2021-03-01 05:45:18 +00:00
Dmitri Plotnikov
1a0e70c7bd Merge "Add battery history to BatteryStatsUsage" into sc-dev 2021-03-01 04:45:20 +00:00
Bob Badour
354603079c [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  services/api/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I823e093d400903202e5535188639dddd1a1f78a9
Merged-in: I823e093d400903202e5535188639dddd1a1f78a9
 2021-02-28 20:27:51 -08:00
Felipe Leme
c3459a6e4e Merge "Minor adjustements on UserManager.isUserForeground()." into sc-dev 2021-03-01 03:52:48 +00:00
Dmitri Plotnikov
20720fa188 Add battery history to BatteryStatsUsage 
Bug: 173745486
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryUsageStatsProviderTest
Change-Id: Icfd9e49b68f1be99312c88ac889b06aa669367ef
 2021-02-28 17:05:39 -08:00
Dmitri Plotnikov
cda90b4cf5 Merge "Break out battery history reading into a separate class" into sc-dev 2021-03-01 01:05:03 +00:00
Santos Cordon
c7f1d37c19 Clean up LogicalDisplayMapper 
Organize the code so that it is easier to read.
Add lots of display-related tests.

Test: atest com.android.server.display
Bug: 168208162
Change-Id: I72a4eb6677e346f615e4730f4888d56333645844
 2021-02-28 19:29:39 +00:00
TreeHugger Robot
55908812e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-28 18:48:11 +00:00
TreeHugger Robot
f092812a77 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-28 18:47:08 +00:00
Dmitri Plotnikov
5ab97fffe0 Break out battery history reading into a separate class 
This class will be used by BatteryUsageStats

Bug: 180765532
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsHistoryTest
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsHistoryIteratorTest

Change-Id: Ic392bcdb6eb815afcc3cd882aa32dd4c78b6484f
 2021-02-28 10:34:01 -08:00
Bill Yi
ae51d27373 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2af514c149a94ba3ef3c5682fae73b302ac6557c
 2021-02-28 15:43:01 +00:00
Yuncheol Heo
0c1a6ec3f2 Merge "Fix NPE in DisplayPowerController." into sc-dev 2021-02-28 15:08:22 +00:00
Bill Yi
799f7b0dfa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I249b3406ae15ce8bd599b583305bd987190da49a
 2021-02-28 06:44:55 -08:00
Sudheer Shanka
3a68193737 Merge "Update the order in which we apply new proc_state/oom_adj values." into sc-dev 2021-02-28 11:28:57 +00:00
Yohei Yukawa
9e028b322a Merge "Make "adb shell cmd input_method tracing" official" into sc-dev 2021-02-28 07:36:02 +00:00
Dmitri Plotnikov
7fa1f6129e Merge "Remove support for OLD_HISTORY" into sc-dev 2021-02-28 06:01:04 +00:00
TreeHugger Robot
0bfe15b58c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-28 01:06:40 +00:00
Bill Yi
a3a856be3e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0037b34f5a76e9fa74a25b4db58a5deed5ce174c
 2021-02-27 20:16:22 +00:00
TreeHugger Robot
f98091f2e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-27 16:47:34 +00:00
Jeff DeCew
1c05dbcd2b Merge "Fixes Copyright date & incorrect a11y announcement" into sc-dev 2021-02-27 16:37:30 +00:00
Julia Reynolds
5db5a6ae40 Merge "Adds an NLS api for telling the OS what notifs types they bridge" into sc-dev 2021-02-27 15:34:34 +00:00
Bill Yi
a7d6179c19 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6ed49146882593db8b8982a5e34e92efaf5e9ebb
 2021-02-27 06:02:56 -08:00
Kyunglyul Hyun
b8407d691c Merge "[Media ML] Let MCS manage MediaSession2" into sc-dev 2021-02-27 06:43:58 +00:00
TreeHugger Robot
7d4e773f18 Merge changes from topic "presubmit-am-eaa6dc71b50c4c6fa8ae3801f2e77aeb" into sc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b27f4465bd
  Import translations. DO NOT MERGE ANYWHERE
 2021-02-27 04:53:13 +00:00
Chris Li
dfb9bb76fe Merge "Don't launch orientation-matching unresizable apps in freeform" into sc-dev 2021-02-27 04:23:57 +00:00