Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
621,242 Commits 3 Branches 0 Tags
136109f1cf1cbc61d07d47745c3287bc6ffdb27a
Commit Graph

621242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
136109f1cf Merge "Start VcnManagementService after ConnectivityService" into sc-dev 2021-01-28 23:08:07 +00:00
Suprabh Shukla
7c98c28f7f Merge "Turn off device_idle_alarms logging" into sc-dev 2021-01-28 23:01:24 +00:00
Hall Liu
0fdcbb8cfb Merge changes from topic "composer-final-integration" into sc-dev 
* changes:
  Rename TelecomManager.EXTRA_INCOMING_PICTURE
  Add support for integrating call composer
 2021-01-28 22:49:22 +00:00
Treehugger Robot
e6a05d7167 Merge "Create owners" am: 008819a578 am: 595c08e82e am: ab29544623 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1da5a046182d9b6903934db709daf4e30459c610
 2021-01-28 22:46:47 +00:00
Treehugger Robot
468a665964 Merge "Keystore 2.0 SPI: Add back-off hint to BackendBusyException." am: 9aba68730c am: b03763fb58 am: 1f8a1b854d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9b14285a83ca6b8c9b603c47e33382b10335161
 2021-01-28 22:46:18 +00:00
Treehugger Robot
8b756e725e [automerger skipped] Merge "Fix race condition in linearblock release between TIS and MediaCodec" am: 49467f1cdf am: 409784587c am: b4624bfd76 -s ours 
am skip reason: Change-Id I13f924adc3586607eb3a60d184e7786536c7b788 with SHA-1 7bff9d579a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5d9a261504099f5f08a6daa20e93b6d233ef3d0
 2021-01-28 22:45:53 +00:00
Jiashen Wang
f11798a036 [automerger skipped] Merge changes from topics "downloadable_init_change_1", "downloadable_init_change_2" am: f2193be3f0 am: 7556b81f80 am: 06bca1be6c -s ours 
am skip reason: Change-Id Ia8fd0ab98c33d1e30b4fce1bad53b1c628364725 with SHA-1 ff5672ff43 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75926889dd5ae2835b5b85c53515444044a813db
 2021-01-28 22:45:08 +00:00
Jiashen Wang
0435fa7940 [automerger skipped] Init DownloadableSubscription with Confirmation Code am: 738abf603a am: bff8fecf85 am: d27f188913 -s ours 
am skip reason: Change-Id Icfa8b0f5b1699d24d8e39c3297ed25c7d1607739 with SHA-1 117f353a0b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf66a5b2f42b6d7dd4d5ec33ce56e58a40b73dbf
 2021-01-28 22:44:57 +00:00
TreeHugger Robot
620f53fe30 Merge "Enabling plugins on Launcher debug builds" into sc-dev 2021-01-28 22:37:06 +00:00
Treehugger Robot
ab29544623 Merge "Create owners" am: 008819a578 am: 595c08e82e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69a741cea68ed63bd6a601bf6beea1a604adbbd5
 2021-01-28 22:34:32 +00:00
Treehugger Robot
1f8a1b854d Merge "Keystore 2.0 SPI: Add back-off hint to BackendBusyException." am: 9aba68730c am: b03763fb58 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ed15403c3202db7da8ac232a574e8f09770d73b
 2021-01-28 22:34:15 +00:00
TreeHugger Robot
e07bbc9889 Merge "Implements initial long screenshot preview UI" into sc-dev 2021-01-28 22:17:59 +00:00
Treehugger Robot
595c08e82e Merge "Create owners" am: 008819a578 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dd6a0d8c327490c1a6360187a9aa36ba8b1c176
 2021-01-28 22:08:32 +00:00
Treehugger Robot
008819a578 Merge "Create owners" 2021-01-28 22:04:48 +00:00
Treehugger Robot
b03763fb58 Merge "Keystore 2.0 SPI: Add back-off hint to BackendBusyException." am: 9aba68730c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29cfffa57e6545573062c631e8e6767eff23f83d
 2021-01-28 21:56:05 +00:00
TreeHugger Robot
5722117dcb Merge "Apply window crop on entering PiP transition" into sc-dev 2021-01-28 21:40:15 +00:00
TreeHugger Robot
b87b87cf75 Merge "Add subsystem name field to Channel" into sc-dev 2021-01-28 21:36:10 +00:00
TreeHugger Robot
018d654a1f Merge "Migrate apex/permission to packages/modules/Permission" into sc-dev 2021-01-28 21:34:41 +00:00
Treehugger Robot
b4624bfd76 Merge "Fix race condition in linearblock release between TIS and MediaCodec" am: 49467f1cdf am: 409784587c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I275c220f840dd3683ecdc8f59c8eae05e24295e0
 2021-01-28 21:32:58 +00:00
Jiashen Wang
06bca1be6c Merge changes from topics "downloadable_init_change_1", "downloadable_init_change_2" am: f2193be3f0 am: 7556b81f80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16864675dc1a3bfa6b257bf5ba52ea3fe2f86658
 2021-01-28 21:32:34 +00:00
Jiashen Wang
d27f188913 Init DownloadableSubscription with Confirmation Code am: 738abf603a am: bff8fecf85 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562762

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I109155dfb8d744804a20ace7cb6a64e5f95faa53
 2021-01-28 21:32:31 +00:00
Jing Ji
4e4056702c Merge "Adapt the cgroup v2 in PhantomProcessList" into sc-dev 2021-01-28 21:30:15 +00:00
Treehugger Robot
409784587c Merge "Fix race condition in linearblock release between TIS and MediaCodec" am: 49467f1cdf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefea6f557e924385c557fb7154a6db00f2081986
 2021-01-28 21:18:04 +00:00
James Lin
a8053430ae Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." am: 4548fab7d6 am: 795855ec7b am: 108a1933ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6be307948ed6bc4600294ec628585018be3cccde
 2021-01-28 21:14:08 +00:00
James Lin
108a1933ca Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." am: 4548fab7d6 am: 795855ec7b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If010dd634828edb03ecb115c7cdc42f3faade053
 2021-01-28 21:06:35 +00:00
Jiashen Wang
7556b81f80 Merge changes from topics "downloadable_init_change_1", "downloadable_init_change_2" am: f2193be3f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c3db4f27432f9bdc5433a23c1f60d951fb32836
 2021-01-28 21:04:20 +00:00
Jiashen Wang
bff8fecf85 Init DownloadableSubscription with Confirmation Code am: 738abf603a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562762

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I173c211b77821f0f807287c44ebfdf2aa626f653
 2021-01-28 20:58:49 +00:00
James Lin
795855ec7b Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." am: 4548fab7d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4c985d452729228d7e9aa69c16d4b49506e967b
 2021-01-28 20:45:06 +00:00
Benedict Wong
292aa4a173 Merge "Implement ConnectingState" am: 026b277911 am: 51bdc6991a am: d9197e9b5b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550524

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12aa4fcd0b859f1b250b969aa7ba129e0abea71c
 2021-01-28 20:43:47 +00:00
Andy Hung
a341f8c711 [automerger skipped] Merge "audio: add implementation for TV related API" am: f57ff9e7e5 am: 3caa10c625 am: 218993465a -s ours 
am skip reason: Change-Id I47b022154983283aeeac41cf506818009e88995b with SHA-1 f50ac2e32b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bfcbc243b2e097831ff3e342f5bd06dcf02b3cd
 2021-01-28 20:43:09 +00:00
Treehugger Robot
4c0229d58e Merge "Keystore 2.0: Add human readable strings to Keystore exceptions." am: 4844c2065b am: 8fa4c0f37e am: 62b031351a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1beb7bbd7fcfa50428e0c6e1bde9e7485261a50f
 2021-01-28 20:42:42 +00:00
Jeff Sharkey
7ca8108311 Merge "Add owners" am: 033aefcb06 am: 8098a5fa5d am: 8121f93bac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie654042f25cf29395f0891d701f574bde8ecddc2
 2021-01-28 20:42:22 +00:00
TreeHugger Robot
8f15e41d76 Merge "ScreenPowerCalculator is responsible for smearing" into sc-dev 2021-01-28 20:39:30 +00:00
Treehugger Robot
9aba68730c Merge "Keystore 2.0 SPI: Add back-off hint to BackendBusyException." 2021-01-28 20:39:01 +00:00
Hall Liu
8fee7eaa81 Rename TelecomManager.EXTRA_INCOMING_PICTURE 
Rename to EXTRA_PICTURE_URI, since we also need to set it for outgoing
calls in order to write to the call log correctly.

Bug: 177613111
Test: atest CallComposerTest
Change-Id: Ie171c8f978db7de30e81800c464b2bd68aff73f8
Merged-In: Ie171c8f978db7de30e81800c464b2bd68aff73f8
 2021-01-28 12:28:29 -08:00
Hall Liu
a749abcead Add support for integrating call composer 
* Minor bugfix in call log to handle USER_CURRENT
* add TelephonyLocalConnection that allows frameworks/opt/telephony to
call code (indirectly) in packages/services/Telephony

Bug: 177613111
Test: atest CallComposerTest

Merged-In: I602b51da6009c884364a026781ca3c160978fbd1
Change-Id: I61af7553b4b3d71fe87c86fca62941747d43ef55
 2021-01-28 12:28:25 -08:00
Baligh Uddin
dbcf3a1e56 Migrate apex/permission to packages/modules/Permission 
Refactor import in core/proto/android/os/incident.proto

BUG: 167963264
Test: TH
Change-Id: I1a6aac95deabeee6d301ad83a2ad31ed2663c02e
Merged-In: Ib7c32ba3037c534e9ab8c144716d68e46c908a39
 2021-01-28 20:04:24 +00:00
Treehugger Robot
49467f1cdf Merge "Fix race condition in linearblock release between TIS and MediaCodec" 2021-01-28 20:01:11 +00:00
Jiashen Wang
f2193be3f0 Merge changes from topics "downloadable_init_change_1", "downloadable_init_change_2" 
* changes:
  Do now throw exception when activation code is empty
  Init DownloadableSubscription with Confirmation Code
 2021-01-28 19:53:49 +00:00
James Lin
4548fab7d6 Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." 2021-01-28 19:35:54 +00:00
Amy Zhang
cd347c4bd0 Merge "Rename configureMonitorEvent to setMonitorEventMask" into sc-dev 2021-01-28 19:23:18 +00:00
Kohsuke Yatoh
a36a2bc052 Merge "Check fs-verity status in app process." into sc-dev 2021-01-28 19:21:55 +00:00
Benedict Wong
d9197e9b5b Merge "Implement ConnectingState" am: 026b277911 am: 51bdc6991a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550524

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0413f3171875d53478bd65cb70d8905721fc4c13
 2021-01-28 19:02:53 +00:00
TreeHugger Robot
7142180435 Merge "Implement AnimatedImageDrawable#setBounds" into sc-dev 2021-01-28 18:50:25 +00:00
Mark Renouf
193b1f6b46 Implements initial long screenshot preview UI 
This integrates UI to preview and take action on long screenshots.

Bug: 170137878
Test: manual, take screenshot, invoke long screenshot feature
Change-Id: I820a3f34b6cd740786c7360382ac3f148bc126fd
 2021-01-28 13:45:23 -05:00
Henry Fang
64cd9d3cf9 Fix race condition in linearblock release between TIS and MediaCodec 
Bug: 177247275
Test: Manual
Change-Id: I13f924adc3586607eb3a60d184e7786536c7b788
Merged-In: I13f924adc3586607eb3a60d184e7786536c7b788
 2021-01-28 18:42:50 +00:00
Andy Hung
218993465a Merge "audio: add implementation for TV related API" am: f57ff9e7e5 am: 3caa10c625 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id188bab394314687a0ee320198a09e9e082769eb
 2021-01-28 18:33:50 +00:00
Treehugger Robot
62b031351a Merge "Keystore 2.0: Add human readable strings to Keystore exceptions." am: 4844c2065b am: 8fa4c0f37e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95d001d6b04e826b8d3242e47ed6f1c31cbc7c26
 2021-01-28 18:33:15 +00:00
Jeff Sharkey
8121f93bac Merge "Add owners" am: 033aefcb06 am: 8098a5fa5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad27ddb7bfdc20663a7ecdfabf0e45a5fef60e02
 2021-01-28 18:33:04 +00:00
Benedict Wong
51bdc6991a Merge "Implement ConnectingState" am: 026b277911 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550524

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I807c5f8302fbfc41ab9257d9414b9989c01ab30c
 2021-01-28 18:32:55 +00:00