Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
451,766 Commits 3 Branches 0 Tags
b2edb53b7ddb9a4885ff560a8dc0bbddbb2c05ca
Commit Graph

451766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Chin
b2edb53b7d Add NR to CellInfo 
Add HAL 1.4 to CellInfo, CellInfoNr, CellIdentityNr

Test: atest RILTest
Bug: 144874741
Change-Id: I9a34b57cebddb3be810b86080aff1022557c4c24
 2019-11-21 17:41:38 -08:00
Satakshi Rana
fc10659ad8 [automerger skipped] Merge "Passing feedback for screenshots in SysUI" into qt-qpr1-dev am: a681b9d205 
am: b3f8e32d6a -s ours
am skip reason: change_id Ief6400549b30cf1c0c8a374aa443cf6347f84875 with SHA1 aaf695366e is in history

Change-Id: I4f3bac73997ffad27c355cfce472a713a5dce015
 2019-11-20 11:08:51 -08:00
Satakshi Rana
b3f8e32d6a Merge "Passing feedback for screenshots in SysUI" into qt-qpr1-dev 
am: a681b9d205

Change-Id: I1134f387c1659f495562dc036ea58943537aa695
 2019-11-20 10:58:27 -08:00
David Su
d9e13e7990 Merge changes from topic "scanreuslt-wifiinfo-systemapi" 
* changes:
  Expose ScanResult/WifiInfo @hide APIs as @SystemApi
  SettingsLib: convert raw fields to getters
  NetworkKey: migrate from ScanResult.wifiSsid to SSID
 2019-11-20 18:57:28 +00:00
James Mattis
474bf68c0a [automerger skipped] Merge "Swap param order in registerSoftApCallback" am: 1dcfd69218 am: fa968e9691 
am: ed6fe63662 -s ours
am skip reason: change_id I7074278d16beac422ce7b29d4471b2794fa97825 with SHA1 cb157e8a33 is in history

Change-Id: Id22d9c37829a49c089a954bd137d50b6a0564773
 2019-11-20 10:51:16 -08:00
Rahul Sabnis
53ed21a49c [automerger skipped] Merge "DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b66"" into qt-qpr1-dev-plus-aosp 
am: 35505f61a4 -s ours
am skip reason: subject contains skip directive

Change-Id: I16996eced1fb1be735c2ed83fc518a5ddca3742c
 2019-11-20 10:44:17 -08:00
Satakshi Rana
a681b9d205 Merge "Passing feedback for screenshots in SysUI" into qt-qpr1-dev 2019-11-20 18:40:06 +00:00
James Mattis
ed6fe63662 Merge "Swap param order in registerSoftApCallback" am: 1dcfd69218 
am: fa968e9691

Change-Id: I0efdc1f3fd35fe059747b6ba2c6b0dc1731b3388
 2019-11-20 10:40:05 -08:00
Yinglei Wang
0b60fc71e3 Merge "change CompoundButton button to use the accessibility state API" 2019-11-20 18:37:31 +00:00
James Mattis
fa968e9691 Merge "Swap param order in registerSoftApCallback" 
am: 1dcfd69218

Change-Id: Icfb927efccdab7adda38ca71c30564a29cad785f
 2019-11-20 10:32:33 -08:00
TreeHugger Robot
35505f61a4 Merge "DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b66"" into qt-qpr1-dev-plus-aosp 2019-11-20 18:29:09 +00:00
Android Build Merger (Role)
7fbc5bbcb1 Merge "[automerger skipped] Merge "Expose IMSI encryption info APIs as system API" am: 0209217e33 am: 910d4e982a am: 1fa4a358f3 -s ours am skip reason: change_id I7bd15f225ac7774ac6e31c766ee0f11302aae3d8 with SHA1 178267d26b is in history" 2019-11-20 18:22:11 +00:00
Meng Wang
c96b8c197b [automerger skipped] Merge "Expose IMSI encryption info APIs as system API" am: 0209217e33 am: 910d4e982a 
am: 1fa4a358f3 -s ours
am skip reason: change_id I7bd15f225ac7774ac6e31c766ee0f11302aae3d8 with SHA1 178267d26b is in history

Change-Id: Iaf5b9a4a9f86ac3a4fc7f90ee81d5735e457b670
 2019-11-20 10:21:17 -08:00
Jean-Michel Trivi
10891d7809 Merge "AudioDeviceAddress: new class to store audio device information" 2019-11-20 18:20:17 +00:00
James Mattis
1dcfd69218 Merge "Swap param order in registerSoftApCallback" 2019-11-20 18:16:53 +00:00
Artur Satayev
9f41cc03a6 [automerger skipped] Merge "Move resource IDs to greylist-max-q." am: c6d4f0dd69 am: 37a33f67a0 
am: 73bf807a9a -s ours
am skip reason: change_id I851236a8060e05724833d9dbcd4c5a79763d4c40 with SHA1 d52aef7c11 is in history

Change-Id: Ifbb26d0536b638801e05bec1751a6d83672fd265
 2019-11-20 10:14:33 -08:00
Meng Wang
1fa4a358f3 Merge "Expose IMSI encryption info APIs as system API" am: 0209217e33 
am: 910d4e982a

Change-Id: I80e52cfd16d533ccf30587d952040791e37e6263
 2019-11-20 10:14:24 -08:00
Mark Tabry
7a168f0714 [automerger skipped] Merge "Define new atoms for Vehicle Maps Service." into qt-qpr1-dev-plus-aosp 
am: 34af7a8d01 -s ours
am skip reason: change_id I6bf37ed236e81fbcca50046b5a9b649685affb4a with SHA1 a824a64be1 is in history

Change-Id: Ief31d7fa4ba2bcce1908711789f80f4b6591f50b
 2019-11-20 10:12:55 -08:00
TreeHugger Robot
2cb49a0f76 Merge "Remove Dependency.get(MAIN_HANDLER) from NavigationBarFragment" 2019-11-20 18:11:05 +00:00
TreeHugger Robot
56e2bd284f Merge "Remove Dependency.get(MAIN_HANDLER) from NotificationListener" 2019-11-20 18:10:35 +00:00
TreeHugger Robot
e83eb253b1 Merge "Remove Dependency.get(MAIN_HANDLER) from SystemUIService" 2019-11-20 18:10:04 +00:00
TreeHugger Robot
7c8b275096 Merge "Remove Dependency.get(MAIN_HANDLER) from NotificationLockscreenUserManagerImpl" 2019-11-20 18:09:35 +00:00
Artur Satayev
73bf807a9a Merge "Move resource IDs to greylist-max-q." am: c6d4f0dd69 
am: 37a33f67a0

Change-Id: I6010fda23167695d88f7a66738f5d45122e33738
 2019-11-20 10:08:26 -08:00
Bill Yi
122eed5d5d Merge "Import translations. DO NOT MERGE" 2019-11-20 18:07:10 +00:00
Meng Wang
910d4e982a Merge "Expose IMSI encryption info APIs as system API" 
am: 0209217e33

Change-Id: Iafce568b8ea8cfc5d499dc21b5bbdc738cbfd3fd
 2019-11-20 10:07:06 -08:00
Artur Satayev
37a33f67a0 Merge "Move resource IDs to greylist-max-q." 
am: c6d4f0dd69

Change-Id: I489fdbe0b6b7ec1a3096b6170645e4227343ce7b
 2019-11-20 10:04:24 -08:00
Mark Tabry
34af7a8d01 Merge "Define new atoms for Vehicle Maps Service." into qt-qpr1-dev-plus-aosp 2019-11-20 18:02:11 +00:00
Charles Munger
9c743482fc Merge "Include androidx stubs in framework docs" am: acd388baf2 am: 5c239c7e95 
am: ecf64ba3c4

Change-Id: I8b7f2e1e303b7add21e8eee9fa16f29a14177d55
 2019-11-20 09:58:51 -08:00
Meng Wang
0209217e33 Merge "Expose IMSI encryption info APIs as system API" 2019-11-20 17:57:08 +00:00
Treehugger Robot
c6d4f0dd69 Merge "Move resource IDs to greylist-max-q." 2019-11-20 17:51:55 +00:00
Satakshi
da07b0eec5 Passing feedback for screenshots in SysUI 
(cherry picked from commit aaf695366e)

Test: Took a screenshot and verified that AiAi gets notified for
share/edit/delete/smart action clicked and exceptions thrown.
Ran tests-
'atest ScreenshotNotificationSmartActionsTest'
'atest ScreenshotNotificationSmartActionsGoogleTest'
Bug: 141634285
Change-Id: Ief6400549b30cf1c0c8a374aa443cf6347f84875
Merged-In: Ief6400549b30cf1c0c8a374aa443cf6347f84875
 2019-11-20 09:51:00 -08:00
Bernardo Rufino
5cf5c3fe63 Merge "[Roll Forward] Block background custom toasts" 2019-11-20 17:50:40 +00:00
Charles Munger
ecf64ba3c4 Merge "Include androidx stubs in framework docs" am: acd388baf2 
am: 5c239c7e95

Change-Id: Icf49180ddeaf3372dd360f22ba3c9471ca18f02e
 2019-11-20 09:49:35 -08:00
Charles Munger
5c239c7e95 Merge "Include androidx stubs in framework docs" 
am: acd388baf2

Change-Id: I0977797502e1a4223463a524beda8c035dbdc69f
 2019-11-20 09:42:01 -08:00
Treehugger Robot
acd388baf2 Merge "Include androidx stubs in framework docs" 2019-11-20 17:32:09 +00:00
Adrian Roos
3de7422716 Merge "DeviceConfig: Split android:window_manager into android and window_manager" 2019-11-20 17:23:31 +00:00
Steven Moreland
e998094441 Merge changes from topic "rm-vibrator-1.4-pass-2" am: 8fee0722bd am: ee46efcad7 
am: 4b8eed0b8c

Change-Id: I424ebdb6a6cb0d7549ca0a9658c1c59d099addc1
 2019-11-20 09:09:43 -08:00
Steven Moreland
4b8eed0b8c Merge changes from topic "rm-vibrator-1.4-pass-2" am: 8fee0722bd 
am: ee46efcad7

Change-Id: Ief89e8846c9a20411b0c7ad9e1a81ed4da1c8fd3
 2019-11-20 09:05:00 -08:00
Steven Moreland
ee46efcad7 Merge changes from topic "rm-vibrator-1.4-pass-2" 
am: 8fee0722bd

Change-Id: I9fe10c243fc615208a6250fed6c9f33c9c54ec02
 2019-11-20 08:57:22 -08:00
Artur Satayev
45628328b0 Move resource IDs to greylist-max-q. 
go/cleanup-greylist-txt

Bug: 137350495
Test: m, manual inspection of out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I851236a8060e05724833d9dbcd4c5a79763d4c40
Merged-In: I851236a8060e05724833d9dbcd4c5a79763d4c40
 2019-11-20 16:56:22 +00:00
Steven Moreland
8fee0722bd Merge changes from topic "rm-vibrator-1.4-pass-2" 
* changes:
  Remove vibrator@1.4
  VibratorService: avoid shim
 2019-11-20 16:46:33 +00:00
TreeHugger Robot
62121f1e3e Merge "Use the orientation from the top fullscreen window." 2019-11-20 16:45:30 +00:00
Wale Ogunwale
f189acd023 Add 3, 4, & 5 Predicate arg types to PooledLamdba 
Bug: N/A
Test: They pass!
Change-Id: Ib3cd168c00899097ce4340ba10b34041f91bc32d
 2019-11-20 16:44:06 +00:00
TreeHugger Robot
aa26bed5c8 Merge "Remove legacy idmap binary" 2019-11-20 16:41:38 +00:00
Jay Aliomer
9d2c933544 Merge "Dark theme twilight mode backend and tile" 2019-11-20 16:41:22 +00:00
TreeHugger Robot
d88edf9147 Merge "Remove Dependency.get(MAIN_HANDLER) from NotificationGutsManager" 2019-11-20 16:31:38 +00:00
Dario Freni
923506270e [automerger skipped] Merge changes from topic "apks_in_apex" am: a8ce56e23f am: 62637979e4 
am: 26c9531a07 -s ours
am skip reason: change_id I060f2d1395886a9eebce703bd80149559f9c39bb with SHA1 745f948efe is in history

Change-Id: Ie99c48ca206d4efd5aafdc02669e4ccf6df1e197
 2019-11-20 08:29:02 -08:00
Artur Satayev
5082c1a955 Merge "Move resource IDs to greylist-max-q." 2019-11-20 16:25:16 +00:00
Dario Freni
26c9531a07 Merge changes from topic "apks_in_apex" am: a8ce56e23f 
am: 62637979e4

Change-Id: If7e4d5408af91a6c0976568c9625622b4432a71c
 2019-11-20 08:17:39 -08:00
Dario Freni
62637979e4 Merge changes from topic "apks_in_apex" 
am: a8ce56e23f

Change-Id: I0373f86833f35ed61c3138d8f26d63667db03d7f
 2019-11-20 08:07:42 -08:00