Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
415,968 Commits 3 Branches 0 Tags
ddb5cf9e2a382e4e15bd2ac98cbd3aa0161c56a1
Commit Graph

415968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathew Inwood
ddb5cf9e2a Merge "Move some telephony methods to max-sdk-p list." into qt-dev 
am: 33ff97d7f6

Change-Id: Idff38b84f152c6c231a2f34a13dff9458ca051b1
 2019-04-23 02:14:53 -07:00
TreeHugger Robot
33ff97d7f6 Merge "Move some telephony methods to max-sdk-p list." into qt-dev 2019-04-23 08:58:36 +00:00
Lorenzo Colitti
9b89cdaaf4 Merge "Freeze the networkstack-aidl-interfaces interface" am: 950767f9f9 
am: 6c88bf9bd7

Change-Id: I0bc827a6c7995eb7b50b4afeed11317ad8e29666
 2019-04-23 01:55:01 -07:00
Lorenzo Colitti
6c88bf9bd7 Merge "Freeze the networkstack-aidl-interfaces interface" 
am: 950767f9f9

Change-Id: I32e335756927110e3200f002d32f9e1e8acfd779
 2019-04-23 01:45:40 -07:00
Lorenzo Colitti
950767f9f9 Merge "Freeze the networkstack-aidl-interfaces interface" 2019-04-23 08:33:41 +00:00
Junyu Lai
df9591a4dc Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am: fb36d44462 
am: 91dab790e7

Change-Id: I410acc19ceb13e32c65cbdf3095da9db0802470c
 2019-04-23 01:18:54 -07:00
Junyu Lai
91dab790e7 Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" 
am: fb36d44462

Change-Id: I2f5e0e11494866b054668c9224a8732cd8c035f9
 2019-04-23 01:08:39 -07:00
Junyu Lai
fb36d44462 Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" 2019-04-23 07:48:08 +00:00
Chalard Jean
58d9ece0d3 [automerger skipped] Merge "Fix an argument to the legacy broadcast" into qt-dev 
am: 27f23459d2 -s ours
am skip reason: change_id I0fc408d546ae9d72b7dd9415e502252b484d4329 with SHA1 807983b976 is in history

Change-Id: I5ebe636715e8cf1ea5e42d12236c1f5fa07c38d0
 2019-04-23 00:27:22 -07:00
Chalard Jean
243b5c104c [automerger skipped] Merge "Fix a bug where + before % is ignored" into qt-dev 
am: 55a1d5bd5f -s ours
am skip reason: change_id Ibe73a33264569b08cac4c00b4dda838f1e5551fc with SHA1 76c76902a6 is in history

Change-Id: I1cb91f0b62492eb0c1ffa9112d7a3d94164852e0
 2019-04-23 00:22:24 -07:00
Chalard Jean
27f23459d2 Merge "Fix an argument to the legacy broadcast" into qt-dev 2019-04-23 07:04:26 +00:00
Chalard Jean
55a1d5bd5f Merge "Fix a bug where + before % is ignored" into qt-dev 2019-04-23 07:03:24 +00:00
Remi NGUYEN VAN
1232fe37be Freeze the networkstack-aidl-interfaces interface 
This freezes the interface as of the latest beta build, not the tip of
tree. IIpClient#setL2KeyAndGroupHint is not in the frozen definition in
particular.

Generated with:
m networkstack-aidl-interfaces-freeze-api \
    ipmemorystore-aidl-interfaces-freeze-api

Test: flashed, booted, WiFi and captive portal working
Bug: 128803828
Change-Id: Ideabe73fc93bbefca2d624ee9ca190cf31419424
 2019-04-23 06:49:58 +00:00
Mingguang Xu
4f25136892 Merge "Wifi usability: Add timestamp in WifiUsabilityStats" into qt-dev 
am: b09eed2309

Change-Id: I4ad447892ab421fa99908214de86e95e96fc001a
 2019-04-22 23:17:39 -07:00
Mingguang Xu
b09eed2309 Merge "Wifi usability: Add timestamp in WifiUsabilityStats" into qt-dev 2019-04-23 06:00:22 +00:00
Jean-Michel Trivi
1e0b25bcd8 Merge "AudioService: manage hearing aid volume for calls" into qt-dev 
am: 0591251363

Change-Id: Ibeec03cb9e0ee4accc736e3f833e8ef425b57137
 2019-04-22 22:29:37 -07:00
Jean-Michel Trivi
0591251363 Merge "AudioService: manage hearing aid volume for calls" into qt-dev 2019-04-23 05:07:11 +00:00
junyulai
cecd4a3d64 [KA11] Verify fd ownership and allocate resource for NattKeepalive 
Since socket keepalive APIs for UDP encapsulation sockets are
public to generic app. In order to ensure the given fd is valid,
this change verifies the resource id inside the UDP
encapsulation socket by using methods provided by IpSecService.

Bug: 125517194
Fix: 123968920
Test: 1. atest FrameworksNetTests --generate-new-metrics 10
      2. atestcom.android.server.ConnectivityServiceTest \
         #testNattSocketKeepalives --generate-new-metrics 100
Change-Id: I408aacc19b364683854d15a095c34e72389a6e5b
 2019-04-23 10:47:19 +08:00
Chalard Jean
98c59fafc2 Fix an argument to the legacy broadcast 
Test: new test for this
Fixes: 62650382
Change-Id: I918b8271d3c3c058553ca888cb54cd36a6efba66
Merged-In: I0fc408d546ae9d72b7dd9415e502252b484d4329
Merged-In: I9282930106d1eee3274d9e5c4e89de60e929a0e6
 2019-04-23 02:36:32 +00:00
Yiwei Zhang
568781e4da Merge "Vulkan Doc: update descriptions for Vulkan feature flags" into qt-dev 
am: 606f1c9ffb

Change-Id: I7dcd205ea53ff81eadb701b074d07591d4b35a95
 2019-04-22 19:26:57 -07:00
Sara Kato
ddd0ab8333 Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev 
am: 9498153dfd

Change-Id: I5ff7a8c6e5130c6e5c38cfb181c17a2093eef5a3
 2019-04-22 19:17:05 -07:00
Jeff Chang
28b2b70180 Merge "Adjust toast window parameters to support FLAG_SHOW_WHEN_LOCKED" into qt-dev 
am: 77e2b7b4ca

Change-Id: I12371d35dc82745a458ba92a8a6a69e49e9dd882
 2019-04-22 19:10:45 -07:00
Rob Carr
f7d9056c5b Merge "DimLayer: More release fixes." into qt-dev 
am: 0d168340d1

Change-Id: Iac648c69e352050d7aa84595b9a72c5defae8705
 2019-04-22 19:04:39 -07:00
TreeHugger Robot
606f1c9ffb Merge "Vulkan Doc: update descriptions for Vulkan feature flags" into qt-dev 2019-04-23 02:04:05 +00:00
Android Build Merger (Role)
0d1fec58c0 Merge "Merge "Update dark mode custom accent colors." into qt-dev am: 79760f0745" into qt-dev-plus-aosp 2019-04-23 01:53:26 +00:00
Amin Shaikh
e904614402 Merge "Update dark mode custom accent colors." into qt-dev 
am: 79760f0745

Change-Id: I8190b01fee17bc67d38310c97149fa725b4d83aa
 2019-04-22 18:52:46 -07:00
sqian
4e9dde6737 Merge "Fix urn compare in EmergencyNumber" am: 1f55cbf416 
am: c85174ba3d

Change-Id: Ic7c6db0747d594f54212c81da008cca20b471b71
 2019-04-22 18:49:35 -07:00
Priyank Singh
51fe5f6367 Merge "Handle NPE when the notification shade is opened via click on button." into qt-dev 
am: 62ad8b9ccc

Change-Id: I6d985834d3da90e91c54f144aaa8108fffce9c38
 2019-04-22 18:42:53 -07:00
sqian
c85174ba3d Merge "Fix urn compare in EmergencyNumber" 
am: 1f55cbf416

Change-Id: I722e0b9093a569aa609ed9b239dc517442e74a2f
 2019-04-22 18:39:09 -07:00
Pengquan Meng
ecd1f78937 Add carrier display name related CarrierConfig 
am: 057b94f43b

Change-Id: Ifcf272fa5f0a5c56c58d6124883296d171bc9266
 2019-04-22 18:37:06 -07:00
Sunny Goyal
f0c2178c1a Merge "Adding null check when unregistering slice relay handler" into qt-dev 
am: 29fe1106dd

Change-Id: Ic406c2e0b8e07e1812713e1b4e5b7b5a7b7ac17f
 2019-04-22 18:34:28 -07:00
Treehugger Robot
1f55cbf416 Merge "Fix urn compare in EmergencyNumber" 2019-04-23 01:29:25 +00:00
Sara Kato
9498153dfd Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev 2019-04-23 01:28:23 +00:00
Hui Yu
848ed58bb3 Merge "No service timeout when debbuger is attached" into qt-dev 
am: 095ab6c3c7

Change-Id: Ic54c3c80063f670238c00a028d5aac55f142a4ec
 2019-04-22 18:27:47 -07:00
Jeff Chang
77e2b7b4ca Merge "Adjust toast window parameters to support FLAG_SHOW_WHEN_LOCKED" into qt-dev 2019-04-23 01:25:48 +00:00
Matt Pietal
0aa2c5ad5f Merge "Sharesheet - Dark theme tweaks" into qt-dev 
am: ef25fb621b

Change-Id: Iacefefd32d21cace3e739d4f8cc4d441cbae1cad
 2019-04-22 18:19:08 -07:00
Rob Carr
0d168340d1 Merge "DimLayer: More release fixes." into qt-dev 2019-04-23 01:15:20 +00:00
TreeHugger Robot
79760f0745 Merge "Update dark mode custom accent colors." into qt-dev 2019-04-23 01:13:59 +00:00
Chalard Jean
807983b976 Merge "Fix an argument to the legacy broadcast" am: b00786fe21 
am: b39b829601

Change-Id: I0fc408d546ae9d72b7dd9415e502252b484d4329
 2019-04-22 18:12:27 -07:00
Chalard Jean
b39b829601 Merge "Fix an argument to the legacy broadcast" 
am: b00786fe21

Change-Id: I76149167598a862a2cc519fbf0b08df0887b27f0
 2019-04-22 18:00:01 -07:00
Brad Stenning
5174fc8663 Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev 
am: 55bf4fd6b6

Change-Id: If39b55c2c62760ad8db0ba37cbfaefc94694a6a8
 2019-04-22 17:49:03 -07:00
TreeHugger Robot
62ad8b9ccc Merge "Handle NPE when the notification shade is opened via click on button." into qt-dev 2019-04-23 00:44:47 +00:00
Chalard Jean
b00786fe21 Merge "Fix an argument to the legacy broadcast" 2019-04-23 00:38:10 +00:00
Colin Cross
ee6a391abf [automerger skipped] Merge "Remove framework.aidl rules" into qt-dev 
am: 696a644fab -s ours
am skip reason: change_id I4e8ee725e660e52aa56c2a10b626dff517669869 with SHA1 b9cb74b048 is in history

Change-Id: Ibf11932dff9f955902ff7ff64f902d9a44b7c22b
 2019-04-22 17:29:55 -07:00
Colin Cross
bac6e6e98e [automerger skipped] Remove framework.aidl rules 
am: b9cb74b048 -s ours
am skip reason: change_id I4e8ee725e660e52aa56c2a10b626dff517669869 with SHA1 196fa2947e is in history

Change-Id: I5669d9c865041295c5f6134dd75d8d945cc056ab
 2019-04-22 17:17:49 -07:00
Pengquan Meng
057b94f43b Add carrier display name related CarrierConfig 
Bug: 122921456
Test: build
Change-Id: I79836b2912be5223a2269e660bfaadf4aa72b930
 2019-04-23 00:08:02 +00:00
TreeHugger Robot
29fe1106dd Merge "Adding null check when unregistering slice relay handler" into qt-dev 2019-04-23 00:04:28 +00:00
TreeHugger Robot
095ab6c3c7 Merge "No service timeout when debbuger is attached" into qt-dev 2019-04-22 23:58:26 +00:00
TreeHugger Robot
ef25fb621b Merge "Sharesheet - Dark theme tweaks" into qt-dev 2019-04-22 23:56:27 +00:00
Jean-Michel Trivi
b32faaa1cc AudioService: manage hearing aid volume for calls 
Add a mechanism to support audio devices that behave like "absolute
  volume" in AVRCP, but that support multiple use cases based on
  the audio mode.
Treat hearing aid as such a device:
  any change in audio mode will cause the volume of the corresponding
  dominent use case to be applied.
Fix a typo in SCO client death that caused a class cast issue.

Bug: 131091438
Bug: 129163231
Test: set hearing aid volume to X for media, take phone call and set volume to Y,
end call, verify volume is X for media.

Change-Id: Id778f69b98825c83b7137917bd81e973298ab8bb
 2019-04-22 16:35:42 -07:00