Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
414,712 Commits 3 Branches 0 Tags
52d8fd98aaa5e5562caa43fb3834c00b8f018997
Commit Graph

414712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
52d8fd98aa Merge "Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev am: 472893443d" into qt-dev-plus-aosp 2019-04-15 21:28:10 +00:00
Adam Powell
3d83ec9640 Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev 
am: 472893443d

Change-Id: I22f0968e01cdd8ab20a7abaecc1050f4a1dbbab4
 2019-04-15 14:27:12 -07:00
Android Build Merger (Role)
9a50fa5ceb Merge "Merge "Fix set_buffers_damage in VulkanSurface" into qt-dev am: 8d8d704cf7" into qt-dev-plus-aosp 2019-04-15 21:20:02 +00:00
John Reck
a4c39fc2d1 Merge "Fix set_buffers_damage in VulkanSurface" into qt-dev 
am: 8d8d704cf7

Change-Id: Ib81492cd9f86c7a76eb20144ac26170af33eb9c6
 2019-04-15 14:19:37 -07:00
Android Build Merger (Role)
c14e98906a Merge "Merge "End button fade animation when its visiblity changes" into qt-dev am: ab662fe8a5" into qt-dev-plus-aosp 2019-04-15 21:14:54 +00:00
Matthew Ng
f829d58845 Merge "End button fade animation when its visiblity changes" into qt-dev 
am: ab662fe8a5

Change-Id: Ib89d68724cc8d1c57304f3cae257b96e6b73dbbc
 2019-04-15 14:14:29 -07:00
Ugo Yu
54ff9b2ab4 [automerger skipped] Merge "Refine Bluetooth Metadata API" am: e5cf74326d 
am: 4359aa933f -s ours
am skip reason: change_id I79460071c7693f648e92cf849738c24f8bc269d9 with SHA1 4741a8bd53 is in history

Change-Id: Ibc44e25bbc5a2c0d920f64bb39ac36b4455d2377
 2019-04-15 14:13:35 -07:00
TreeHugger Robot
472893443d Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev 2019-04-15 21:02:19 +00:00
Ugo Yu
4359aa933f Merge "Refine Bluetooth Metadata API" 
am: e5cf74326d

Change-Id: I8b7e9137f67dfa27dd1556f49bdd4cc702015150
 2019-04-15 14:01:00 -07:00
TreeHugger Robot
8d8d704cf7 Merge "Fix set_buffers_damage in VulkanSurface" into qt-dev 2019-04-15 21:00:08 +00:00
TreeHugger Robot
ab662fe8a5 Merge "End button fade animation when its visiblity changes" into qt-dev 2019-04-15 20:56:29 +00:00
Treehugger Robot
e5cf74326d Merge "Refine Bluetooth Metadata API" 2019-04-15 20:37:28 +00:00
Android Build Merger (Role)
c687e2c1a3 Merge "Merge "Revert "Make notification effects for automotive configurable."" into qt-dev am: 094171bccc" into qt-dev-plus-aosp 2019-04-15 20:23:48 +00:00
Qiao (Adora) Zhang
995eebc314 Merge "Revert "Make notification effects for automotive configurable."" into qt-dev 
am: 094171bccc

Change-Id: Iba84f539a8d2de805c5c8f82fc78933eec6cd7fd
 2019-04-15 13:23:24 -07:00
Android Build Merger (Role)
4a19a94b67 Merge "Merge "Add NonNull in Carriers constant" am: 40c918b924 am: 2c9b7a4a2f" into qt-dev-plus-aosp 2019-04-15 20:20:59 +00:00
calvinpan
769276f554 Merge "Add NonNull in Carriers constant" am: 40c918b924 
am: 2c9b7a4a2f

Change-Id: I06136ab9434fbc89fbbaaf99995469dcf34050e0
 2019-04-15 13:20:28 -07:00
George Hodulik
84f39b7ef0 Merge "Add AppPredictionServiceExists check." into qt-dev 
am: bd8c161d8d

Change-Id: Id7c20e1e1baa970eec5727f2d41216d91e57d954
 2019-04-15 13:17:40 -07:00
Rob Carr
5314f79bd9 Merge "More SurfaceAnimator lifetime fixes." into qt-dev 
am: ed5d40cf26

Change-Id: Iea26915848f87f0c905491abb6aaa5968c84ca94
 2019-04-15 13:11:40 -07:00
calvinpan
2c9b7a4a2f Merge "Add NonNull in Carriers constant" 
am: 40c918b924

Change-Id: Ia7cc8c0bdd2c513d969ea29c2de55797f9c7e035
 2019-04-15 13:10:13 -07:00
Treehugger Robot
40c918b924 Merge "Add NonNull in Carriers constant" 2019-04-15 19:53:50 +00:00
TreeHugger Robot
094171bccc Merge "Revert "Make notification effects for automotive configurable."" into qt-dev 2019-04-15 19:49:28 +00:00
TreeHugger Robot
bd8c161d8d Merge "Add AppPredictionServiceExists check." into qt-dev 2019-04-15 19:49:19 +00:00
Rob Carr
ed5d40cf26 Merge "More SurfaceAnimator lifetime fixes." into qt-dev 2019-04-15 19:44:08 +00:00
Jorim Jaggi
b73f0f5b8a Merge "Revert "Fix issue in attached layouting"" into qt-dev 
am: 0a510f8bbf

Change-Id: If31e0ec393905ba24e26af0d7e1f035b4fd813ab
 2019-04-15 12:37:10 -07:00
Jorim Jaggi
0a510f8bbf Merge "Revert "Fix issue in attached layouting"" into qt-dev 2019-04-15 19:14:41 +00:00
Android Build Merger (Role)
f97ba0e29c Merge "[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev am: 078d4d1475 -s ours am skip reason: change_id I1ae1df9d33229d3f3aba237d865ceb2373761af4 with SHA1 bbb8968e54 is in history" into qt-dev-plus-aosp 2019-04-15 19:09:49 +00:00
Nathan Harold
095678adb0 [automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev 
am: 078d4d1475 -s ours
am skip reason: change_id I1ae1df9d33229d3f3aba237d865ceb2373761af4 with SHA1 bbb8968e54 is in history

Change-Id: I10b999bd28d4625915e53ae3bedf7fcf74df4c6b
 2019-04-15 12:09:08 -07:00
Ryan Mitchell
9202886cbf Merge "qt-dev-plus-aosp designated for R. Update MAX_PLATFORM_VERSION, etc." into qt-dev-plus-aosp 2019-04-15 19:07:10 +00:00
Jean-Michel Trivi
5a2f0790ab AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY 
am: c1adecd66a

Change-Id: Ie2a7f82f97605c4e3684cecb128ad64bf14b9dc3
 2019-04-15 12:03:53 -07:00
Jakub Pawlowski
1e577c1ce5 [automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev 
am: f98ada2290 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 64307cc0b2 is in history

Change-Id: I40000c30cca0a169eb22fbd74ca3cff1f546bd05
 2019-04-15 11:55:42 -07:00
Nathan Harold
078d4d1475 Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev 2019-04-15 18:51:37 +00:00
Jean-Michel Trivi
c1adecd66a AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY 
Drop ACTION_AUDIO_BECOMING_NOISY only when there is no more audio
  focus users.

Bug: 129983099
Test: see bug
Change-Id: I899301754ba1506598b1be1cb5605bc3b53e3942
 2019-04-15 18:49:01 +00:00
David Anderson
da439d4abb Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev 
am: 9a73912aec

Change-Id: If816edbe0d27c107ae2ee7c42c4bea447ae43021
 2019-04-15 11:47:39 -07:00
John Reck
a2e9ec9f2e Merge "Support render-ahead in vulkan" into qt-dev 
am: 08ca2a2560

Change-Id: I51ce1419820a0f984b52f2bbee18604ef39aed7f
 2019-04-15 11:40:58 -07:00
TreeHugger Robot
f98ada2290 Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev 2019-04-15 18:38:14 +00:00
David Anderson
9a73912aec Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev 2019-04-15 18:28:38 +00:00
calvinpan
9f090e8a13 Add NonNull in Carriers constant 
Add NonNull in Carriers constant

Bug: 126699334
Test: build pass
Change-Id: Ifda6407092847e8863cba79360eba3df12f9c7e1
Merged-In: I428ff623d46d3891b05882df5774343bfe3234c0
 2019-04-15 18:23:45 +00:00
John Reck
08ca2a2560 Merge "Support render-ahead in vulkan" into qt-dev 2019-04-15 18:20:28 +00:00
Amy Zhang
7a7ebecb9b Merge "Resolve CEC related API requests from API Council" into qt-dev 
am: 64b51f91ff

Change-Id: I8c9f89d3bd8c4124e4d09115684a02156e19e1fb
 2019-04-15 11:05:06 -07:00
Jorim Jaggi
9acce42652 Revert "Fix issue in attached layouting" 
This reverts commit 36dcd2e34b.

Bug: 130553898
Reason for revert: Breaks other CTS (PopupWindowTests)

Change-Id: Ib3a0a189db25d72e85a52dcefa9e1f52a976f3fb
 2019-04-15 18:01:04 +00:00
Neil Fuller
d982160c6a Merge "Switch ByteStringUtils over to HexEncoding impl" am: 6150065560 
am: 42aacac8ad

Change-Id: Ic26eb802f39f1f86177a2de8e855573806e08998
 2019-04-15 10:57:36 -07:00
Qiao (Adora) Zhang
a9d0bffa06 Revert "Make notification effects for automotive configurable." 
This reverts commit 4dae2857df.

Reason for revert: b/130513450

Fix: 130513450

Change-Id: Ie2f7c5e66f1436c0a540fb86b1886978d72cb7c7
 2019-04-15 17:53:31 +00:00
Martijn Coenen
26b42aea01 Merge "Catch all exceptions when calling startCheckpoint()." into qt-dev 
am: ad6195dc40

Change-Id: I92509dde4d0e00f36f435b4f0bba616c44f42ff5
 2019-04-15 10:51:56 -07:00
Neil Fuller
42aacac8ad Merge "Switch ByteStringUtils over to HexEncoding impl" 
am: 6150065560

Change-Id: If57eb62d54b6c473051a560bf523819f0b971439
 2019-04-15 10:47:04 -07:00
Amy Zhang
64b51f91ff Merge "Resolve CEC related API requests from API Council" into qt-dev 2019-04-15 17:46:49 +00:00
Calvin Pan
d0ad497e6c Merge "Add NonNull in Carriers constant" into qt-dev 
am: c6a1bf1ac1

Change-Id: I6589938d50ca84c3d9eed43c358c791e5ed1cee2
 2019-04-15 10:44:46 -07:00
Martijn Coenen
ad6195dc40 Merge "Catch all exceptions when calling startCheckpoint()." into qt-dev 2019-04-15 17:38:08 +00:00
Kevin Chyn
d3eb0ab9b5 Merge "Ensure strings are consistent with HIDL documentation" into qt-dev 
am: 6e77293d29

Change-Id: I9152d80ede71656932830818d3f27b31dca931e3
 2019-04-15 10:34:35 -07:00
Calvin Pan
c6a1bf1ac1 Merge "Add NonNull in Carriers constant" into qt-dev 2019-04-15 17:33:37 +00:00
Neil Fuller
6150065560 Merge "Switch ByteStringUtils over to HexEncoding impl" 2019-04-15 17:30:35 +00:00