Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
629,981 Commits 3 Branches 0 Tags
ed601a2eed18652e833fc2caae30fd699cddabb5
Commit Graph

629981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi NGUYEN VAN
ed601a2eed Merge "Move LocationPermissionChecker to libs/net" am: a89a2ae676 am: eb7e0ad2c1 am: 0eae8ebfd9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618840

Change-Id: Ia9beda02a8183eda4fe195404980d4d9012afb3f
 2021-03-17 22:09:51 +00:00
Shuo Qian
062202dcaa [automerger skipped] Merge "Add Emergency callback mode shell command" into rvc-qpr-dev am: e1e036661c -s ours am: 8caf65dc2c -s ours 
am skip reason: skip tag Change-Id If6ca01283a02a4c1f762eaa0f4cd798d48781761 with SHA-1 b201f9b1e6 is already in history

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

Change-Id: I357436ba40a385c783c99f9329da3a95a07c6c4c
 2021-03-17 22:09:23 +00:00
Junyu Lai
d3d088c551 Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4 am: 07f3bc9d6e am: 71bc2b560d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635047

Change-Id: Ic0cb87f3ac4e9df7b0b6e2d0344c43e66499900e
 2021-03-17 22:08:56 +00:00
Hall Liu
9e53260ddb Merge "Add carrier config keys for RTT-VT compat" am: 2ab1cc0fac am: 4b4f0e38a1 am: 0c9184f87e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636900

Change-Id: I6e6c51d5a6d98f524e37a61000f974afe269e6b1
 2021-03-17 22:08:20 +00:00
Christian Wailes
66ac77752d Merge "Adds tests for Install Scenarios to DexManagerTests" am: 98432e96b0 am: 719599d844 am: adbdbbf168 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634484

Change-Id: I22de66447460d04825473222ece93416cd4f5ab8
 2021-03-17 22:07:53 +00:00
Andy Hung
dac1d0a8e6 [automerger skipped] Merge "SoundPool: Improve single stream SoundPool handling" am: 0f8c08544a am: 4140a29ad5 am: d7ebcd20f9 -s ours 
am skip reason: skip tag Change-Id Iec777d6319d5ed76000d4c5b12336b106dacede4 with SHA-1 fe4d13843a is already in history

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

Change-Id: Id87baf0d718e4e6a79c4f48616b9c35516cc9978
 2021-03-17 22:07:21 +00:00
Yan Wang
bf218d6a5e Merge "Rename enum in ArtDexMetadataType with appropriate prefix." am: 59437812ad am: 637ebffc04 am: ed0d068f0c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639439

Change-Id: If06606170950d475f076c37c901eae866c894426
 2021-03-17 22:06:10 +00:00
Jean-Michel Trivi
f06d4de3f7 Merge "MediaFormat: new MIME types for MPEG-H audio" into sc-dev 2021-03-17 22:04:42 +00:00
Ying Xu
a8e0f31571 Merge changes I55b21a32,I4188007a into sc-dev 
* changes:
  Explicitly opt-in to get location data from WifiInfo
  Fix the QS Tile issue
 2021-03-17 21:34:25 +00:00
Chris Li
51755dc698 Merge "Reparent child surface layers when TDA migrate to new surface control" into sc-dev 2021-03-17 20:36:44 +00:00
Winson Chiu
a0ac8d3a31 Merge changes I8d5a10c3,I3d629722,I35072d6e,I6cc270fb,I19b88fb5, ... into sc-dev 
* changes:
  Remove app links caller BROWSABLE requirement
  Fix DomainVerificationShell user/allowed bugs
  Remove pending/restored domain state when attaching
  Check user ID for domain verification setters
  Expose error codes for domain verification setters
  Move domain state ints to DomainVerificationInfo
  Migrate approved/denied domain states and add tests
 2021-03-17 20:03:45 +00:00
Brad Ebinger
a481a433d7 Merge "Create new UCE shell commands for modifying PUBLISH for testing" into sc-dev 2021-03-17 19:38:30 +00:00
TreeHugger Robot
883f474ea8 Merge "Expand try/catch for DeviceConfig in AppOpsManager" into sc-dev 2021-03-17 19:29:56 +00:00
TreeHugger Robot
d5cf5ab4a8 Merge "Fixed broken HTML tag." into sc-dev 2021-03-17 18:40:02 +00:00
Nate Myren
e1add58118 Merge "Remove R QPR attribution hacks" into sc-dev 2021-03-17 18:26:54 +00:00
Thierry Strudel
491112e291 Merge "rename power_stats service to powerstats" into sc-dev 2021-03-17 18:25:59 +00:00
Yu-Han Yang
1bdbcffaa1 Merge "Update Javadoc of getData() for IRNSS" into sc-dev 2021-03-17 17:47:47 +00:00
TreeHugger Robot
046c050aa6 Merge "Fix bug in EdgeEffect with glow" into sc-dev 2021-03-17 17:47:22 +00:00
Dmitri Plotnikov
fa304e1f71 Merge "Fix certain BatteryStatsTests and enable presubmit" into sc-dev 2021-03-17 17:38:59 +00:00
Eran Messeri
7472c4449e Merge "Remove unused "vendor allowed apps on org-owned device" resource" into sc-dev 2021-03-17 17:26:33 +00:00
Yohei Yukawa
9ab188a70a Merge "Rename #updateInputMethodWindowStatus() to #setDismissImeOnBackKeyPressed()" into sc-dev 2021-03-17 17:14:43 +00:00
Jean-Michel Trivi
bb9e2099fe MediaFormat: new MIME types for MPEG-H audio 
Add new MIME types for MPEG-H audio

Bug: 178619392
Test: atest android.media.cts.MediaFormatTest
Change-Id: I6b0026e6b5b979b6c3e3ca0b1c675e890662c0df
 2021-03-17 10:07:39 -07:00
Nate Myren
add3f1bdf1 Expand try/catch for DeviceConfig in AppOpsManager 
Some apps, such as the shell, do not seem to be able to always access
the DeviceConfig, and get an NPE. Fail gracefully when this happens.

Test: manual
Fixes: 182907280
Change-Id: If4de34f2022c165ad8bf5a950c8a04cfd5abacc9
 2021-03-17 10:03:59 -07:00
Anthony Stange
fc619353b8 Merge "Maintain map of nanoapps that are permanently denied" into sc-dev 2021-03-17 16:54:08 +00:00
TreeHugger Robot
51bf47cccf Merge "Correct recycling to take setViewId into account." into sc-dev 2021-03-17 16:47:08 +00:00
Jay Aliomer
41f253e6b1 Merge "Implment local color extraction for image wallpapers" into sc-dev 2021-03-17 16:37:14 +00:00
TreeHugger Robot
56a4ea5684 Merge "BatteryStats measured energy for Wifi & Bluetooth" into sc-dev 2021-03-17 16:32:53 +00:00
Hangyu Kuang
6989c4d019 Merge "transcoding: Address API council comments Part1" into sc-dev 2021-03-17 16:17:43 +00:00
Andy Hung
95a83adc9c Merge "SoundPool: Avoid busy waiting during stream restart" into sc-dev 2021-03-17 16:10:46 +00:00
Henry Fang
d4e7d78f40 [automerger skipped] Merge "Tuner FW: clean up Dvr/Filter message-queue resources upon close" am: e42498a501 am: c86d34a950 am: bd07cdc90b -s ours 
am skip reason: skip tag Change-Id Iea28f07a0800cbab88a1348fa7ae21ac17e1cfd8 with SHA-1 bc30a4b182 is already in history

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

Change-Id: I5e8ec35e8091813d188f2ccd039d6185849b4741
 2021-03-17 16:09:37 +00:00
Treehugger Robot
83a6070d12 Merge "Use ro.boot.qemu to check if the device is an emulator" am: 62d82e0b33 am: 4ba8fde9ba am: de535f6eb2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625662

Change-Id: Ia613c23fb779697882f9928b15684fb1ff97e9cd
 2021-03-17 16:09:12 +00:00
Junyu Lai
dc8f8d8b69 Merge "[VCN13] Implement tracking best matching network" am: f98037abb3 am: a2a3640aab am: 14865c4e07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633519

Change-Id: Ie252014cd9047c27fad3e451b80047493935dc3d
 2021-03-17 16:08:50 +00:00
Nader Jawad
e5395838ce Merge "Update owners for EdgeEffect" am: 0ebddf5fdc am: 1693ebd5d5 am: 783410679c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636081

Change-Id: I53e9562d40883a57de7d7c0265e4793e69ae9b3d
 2021-03-17 16:08:24 +00:00
Michele Berionne
ea591f8914 Merge "Clarification for PREPARE_UNATTENDED_REBOOT_ERROR" am: 11773facb7 am: 8e7f7303cf am: a3e52d2724 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613109

Change-Id: I9fde6ebeeb2dd5ad38847317198cd05a8b29c0f1
 2021-03-17 16:07:58 +00:00
Paul Hu
38ea30a5a4 Merge "Replace interal okhttp APIs" am: 96a89d8f43 am: 2989d99072 am: 542786989d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669

Change-Id: Ida687a8987385ef4525e41e609d7c8fedda9f1da
 2021-03-17 16:07:31 +00:00
Lucas Lin
1e206c6a67 Merge "Remove NETWORK_STACK_UID check" am: 7044a8f3c7 am: 9b45108b82 am: e64e4d52e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323

Change-Id: Icade0541f309622e39c9b02d86fbb6822c378fb1
 2021-03-17 16:06:56 +00:00
Automerger Merge Worker
597bef12ec Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." into rvc-qpr-dev am: 7874170373 -s ours" into rvc-qpr-dev-plus-aosp am: d29ed707b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7be07339caa5fc7411c5d530c3909f749b8ad870
 2021-03-17 16:06:33 +00:00
Lucas Lin
f659303e92 Merge "Add comments to describe the value of converting hex to decimal" am: 5b30e438de am: 9307980e95 am: 172cce09da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221

Change-Id: I0f978fd5fa0283a40db2897478483d680d44e9e9
 2021-03-17 16:05:47 +00:00
Lucas Lin
f8de58f992 [automerger skipped] Merge "Have a new API to get private DNS mode" am: 179ecda65f am: 114103eaf2 am: 3373b94c0d -s ours 
am skip reason: skip tag Change-Id I02a1e91b4eafb5f5df3eada1c07b99849a050c3c with SHA-1 b19b657309 is already in history

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

Change-Id: I45f348a3d0105f07441c8aabc226a12ee6a9e89c
 2021-03-17 16:05:23 +00:00
Chalard Jean
320315ac8c Merge "[NS01] Add NetworkScore" am: 1a645067e5 am: 8cde8bbe9a am: 2d07595731 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099

Change-Id: I953a773f8914152578a98d71b43d0a2e30a51aba
 2021-03-17 16:04:22 +00:00
Remi NGUYEN VAN
34868e5de3 Merge "Add ParseException constructors to API" am: 9deb79f959 am: 7fc99816ce am: a375a561a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044

Change-Id: I4e4b1f4a70fcfaa43fa9b612e7fbd151093fd8fe
 2021-03-17 16:03:23 +00:00
Youngjun Kwak
bcc2755295 [automerger skipped] Merge "DO NOT MERGE Delete superfluous call of mInsetsController.onControlsChanged." into rvc-qpr-dev am: 138fdb88cd am: f3dacb4e98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieecf116869ee837bdddbc45ddec1d31e1fb21365
 2021-03-17 16:03:02 +00:00
kwaky
8254f64259 [automerger skipped] DO NOT MERGE Delete superfluous call of mInsetsController.onControlsChanged. am: 1f2cb484f9 am: 4aa44211f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a64c4049cf995f46ffd32adc47fd229b7ca8b90
 2021-03-17 16:02:52 +00:00
Remi NGUYEN VAN
ed81edf21a [automerger skipped] Merge "Create ServiceConnectivityResources" am: 03aeadc030 am: 54c7dc1600 am: 1154393902 -s ours 
am skip reason: skip tag Change-Id I77ac6f4303c54acc96f16e18ef02add30298ff3d with SHA-1 9e8264dc32 is already in history

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

Change-Id: I95598f3c3fae16b5d2ec5dd314530649aee5e9b6
 2021-03-17 16:02:18 +00:00
Josh Gao
aa3594c724 Merge "fdtrack: emit the most common stack in the abort message." am: 3a95fb9b50 am: 5a762e7d9d am: 97805c051c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633025

Change-Id: Id226358f189792d861917817c7c6be49aaf52a9d
 2021-03-17 16:01:28 +00:00
Yan Wang
9836262d8b [automerger skipped] Merge "Add support to report ART metrics to statsd." am: 2d7f8bcdf4 am: 29d87fc490 am: f30c9c80c8 -s ours 
am skip reason: skip tag Change-Id Ic167e250a74e29dee0c8dc628d1cc731d778fa26 with SHA-1 57575ab883 is already in history

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

Change-Id: I7d18c0ae1388ab039777aa54c7b904cfd36352a7
 2021-03-17 15:59:47 +00:00
Treehugger Robot
d4e9242719 Merge "Emulator cleanup in ClipboardService.java" am: f97ab8c413 am: 3b0eafc236 am: 921af43bf8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634486

Change-Id: I19f4bd5a1c92009ca1531853fad1c07f729a03d6
 2021-03-17 15:59:23 +00:00
TreeHugger Robot
6efdd07be9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5a5aad0c5b -s ours am: 1968fecd2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcdf08b8e9881b2158fef10f4240dcfa912328be
 2021-03-17 15:59:07 +00:00
TreeHugger Robot
82b3a28f68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 788527c931 -s ours am: acb2a488fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d89afafed66c384a254455997e8cdae58385344
 2021-03-17 15:58:53 +00:00
Treehugger Robot
b45183758e Merge "Adds OWNERS file" am: fa31d37ac7 am: f690d62fa2 am: 25c0656b54 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635326

Change-Id: I497f2eff5c6f6d95345ba59e4e144fe9bd6d324a
 2021-03-17 15:58:34 +00:00