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

415954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
55a1d5bd5f Merge "Fix a bug where + before % is ignored" into qt-dev 2019-04-23 07:03:24 +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
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
TreeHugger Robot
55bf4fd6b6 Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev 2019-04-22 23:30:57 +00:00
Colin Cross
696a644fab Merge "Remove framework.aidl rules" into qt-dev 2019-04-22 23:26:55 +00:00
Felipe Leme
2d137edf28 Merge "Fixed content capture whitelist for specific activities." into qt-dev 
am: 845d5ee587

Change-Id: I7b4817d097067667e518ad8e58bd2ed5f17c2b8d
 2019-04-22 16:24:14 -07:00
TreeHugger Robot
845d5ee587 Merge "Fixed content capture whitelist for specific activities." into qt-dev 2019-04-22 22:34:09 +00:00
Fan Zhang
d448910f18 Merge "Add logging enums for 3 new SIM related pages." into qt-dev 
am: 7feb1a1f7d

Change-Id: I620189316adfff96ba305427d30e0eee02e15a6f
 2019-04-22 15:22:20 -07:00
Howard Ro
d2209bbab5 Merge "Add apex packages to uid_mapping" into qt-dev 
am: 330a3d89fa

Change-Id: I7fe7037887e22cde409ef8a2177e5974fcfe7633
 2019-04-22 15:11:06 -07:00
Robert Snoeberger
a7de96305d Merge "Add doc for system health guidelines for AOD clock faces." into qt-dev 
am: c7c2a50e7d

Change-Id: I6cc454c8739bb4393457c4ce4a3a0651899af4d4
 2019-04-22 14:50:51 -07:00
TreeHugger Robot
7feb1a1f7d Merge "Add logging enums for 3 new SIM related pages." into qt-dev 2019-04-22 21:37:29 +00:00
TreeHugger Robot
330a3d89fa Merge "Add apex packages to uid_mapping" into qt-dev 2019-04-22 21:37:08 +00:00
Chenbo Feng
2c8ffbcc5a [automerger skipped] Merge "Add smoke test for jni library" into qt-dev 
am: 47159d969f -s ours
am skip reason: change_id Id24e7f0558b5643e4ad7393e85f1f0a2bd875615 with SHA1 5f8a630da7 is in history

Change-Id: Ib3f66d33a54be4216c098e2cde2023ece3fbf41e
 2019-04-22 14:33:35 -07:00
Beverly
4d22832cb1 Merge "Set min width of checkbox to 48dp" into qt-dev 
am: f49ca51851

Change-Id: I03c6c1280d956594913ecbcfe787ff6b838cccd2
 2019-04-22 14:27:23 -07:00
Chris Tate
6f6e0afb01 Merge "Remove spurious Slog.wtf()" into qt-dev 
am: ef4c181a05

Change-Id: I9922562a664747ee6e16c10e045ccc16443cf6cf
 2019-04-22 14:18:15 -07:00
Mathieu Chartier
fcfbc9c584 [automerger skipped] Merge "Disable iorap test mapping" am: 46b3d6d05d 
am: 27ee83dca3 -s ours
am skip reason: change_id I17befa52ebad92413122253f692168cf93cbab6e with SHA1 6565a34d7f is in history

Change-Id: Id9ed8d34572fc3614337df49cfaaad8037351223
 2019-04-22 14:10:59 -07:00